archive-gh-me/Espruino
1
0
Fork 0
mirror of https://github.com/espruino/Espruino.git synced 2025-12-08 19:06:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:espruino/Espruino

Browse Source
This commit is contained in:
Gordon Williams 2016-08-02 14:49:31 +01:00
commit 769a2a2e63
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -75,6 +75,7 @@
# # BLACKLIST=/home/mydir/myBlackList
# VARIABLES=1700 # Sets number of variables for project defined firmware. This parameter can be dangerous, be careful before changing.
# # used in build_platform_config.py
# NO_COMPILE=1 # skips compiling and linking part, used to echo WRAPPERSOURCES only
ifndef GENDIR
GENDIR=$(shell pwd)/gen
@ -2087,3 +2088,8 @@ clean:
$(Q)rm -f $(PROJ_NAME).bin
$(Q)rm -f $(PROJ_NAME).srec
$(Q)rm -f $(PROJ_NAME).lst
# start make like this "make varsonly" to get all variables created and used during make process without compiling
# this helps to better understand linking, or to find oddities
varsonly:
$(foreach v, $(.VARIABLES), $(info $(v) = $($(v))))

8
scripts/build_jswrapper.py
View File

@ -176,6 +176,14 @@ def removeBlacklistForWrapper(blacklistfile,datas):
if jsondata["class"] == black["class"]:
if jsondata["name"] == black["name"]:
toremove.append(idx)
# extension by jumjum
else:
if "name" in jsondata:
for black in blacklist:
if black["class"] == "__":
if jsondata["name"] == black["name"]:
toremove.append(idx)
# end extensioin by jumjum
return delete_by_indices( datas, toremove)
# ------------------------------------------------------------------------------------------------------
# ------------------------------------------------------------------------------------------------------

4
scripts/create_zip.sh
View File

@ -104,5 +104,5 @@ cp $DIR/dist_licences.txt $ZIPDIR/licences.txt
rm -f $ZIPFILE
cd zipcontents
echo zip $ZIPFILE *
zip $ZIPFILE *
echo zip -r $ZIPFILE *
zip -r $ZIPFILE *