X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=6bcc599be688b8bd6289fea6623000f592be77bd;hb=de55c6dedf5afefe3411eed9f7282d469db09906;hp=16e15b7b31b78ffcec3378392819572fcef5616c;hpb=7cdb6f2bc07df1e9d2eeeaea537bc33e7463f816;p=org.ibex.core.git diff --git a/Makefile b/Makefile index 16e15b7..6bcc599 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ # inputs jikes_java_sources := $(shell find src -name *.java) gcj_java_sources := $(shell find src -name *.java -not -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources) -xwar_sources := $(ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf) +xwar_sources := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf) cc_sources := src/org/xwt/plat/$(platform).cc # outputs @@ -147,13 +147,13 @@ PalmOS: false -## dist.xwt.org ############################################################################ +## master.dist.xwt.org ############################################################################ current_build := $(shell cat next.build) dist: # this will fail if we haven't checked-in since the comment is null; we want this. -# cvs commit -m '' > /dev/null + cvs commit -m '' > /dev/null echo "***********************************************************" echo "* This build is $(current_build)" @@ -184,16 +184,16 @@ dist-private: nice -n 19 make all echo - echo === dist.xwt.org ================================== + echo === master.dist.xwt.org ================================== echo "copying xwt.jar to distribution area..." - cp bin-Java2/xwt.jar /var/www/dist.xwt.org/xwt-$(current_build).jar.unsigned + cp bin-Java2/xwt.jar /var/www/master.dist.xwt.org/xwt-$(current_build).jar.unsigned echo "stripping xwt.exe and copying it to the distribution area..." - $(strip) bin-Win32/xwt.exe -o /var/www/dist.xwt.org/xwt-$(current_build).exe.unsigned + $(strip) bin-Win32/xwt.exe -o /var/www/master.dist.xwt.org/xwt-$(current_build).exe.unsigned echo "copying xwt.linux to distribution area..." - $(strip) bin-Linux/xwt.linux -o /var/www/dist.xwt.org/xwt-$(current_build).linux.unsigned + $(strip) bin-Linux/xwt.linux -o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned echo echo "*** DONE ******************************************"