X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=7f1d74af494cd1345d0cb91480619dc3dd34f85b;hp=e8bb2c09d01d6bd79420ddb76389ef91902b393c;hb=71a2f5a6107cc7d5d63b6ddd0f01dc0341c18af3;hpb=8dc6899b7793bffc0943b27dd66f224656eacf2e diff --git a/Makefile b/Makefile index e8bb2c0..7f1d74a 100644 --- a/Makefile +++ b/Makefile @@ -111,6 +111,48 @@ java_sources += build/java/org/xwt/mips/Registers.java java_sources += build/java/org/xwt/mips/Runtime.java java_sources += build/java/org/xwt/mips/UsermodeConstants.java +java_sources += build/java/org/ibex/crypto/DER.java +java_sources += build/java/org/ibex/crypto/Digest.java +java_sources += build/java/org/ibex/crypto/HMAC.java +java_sources += build/java/org/ibex/crypto/MD2.java +java_sources += build/java/org/ibex/crypto/MD5.java +java_sources += build/java/org/ibex/crypto/PKCS1.java +java_sources += build/java/org/ibex/crypto/RC4.java +java_sources += build/java/org/ibex/crypto/RSA.java +java_sources += build/java/org/ibex/crypto/SHA1.java +java_sources += build/java/org/ibex/crypto/X509.java +java_sources += build/java/org/ibex/crypto/Base64.java +java_sources += build/java/org/ibex/net/ssl/RootCerts.java +java_sources += build/java/org/ibex/net/SSL.java + +java_sources += build/java/gnu/regexp/CharIndexed.java +java_sources += build/java/gnu/regexp/CharIndexedCharArray.java +java_sources += build/java/gnu/regexp/CharIndexedInputStream.java +java_sources += build/java/gnu/regexp/CharIndexedString.java +java_sources += build/java/gnu/regexp/CharIndexedStringBuffer.java +java_sources += build/java/gnu/regexp/RE.java +java_sources += build/java/gnu/regexp/REException.java +java_sources += build/java/gnu/regexp/REFilterInputStream.java +java_sources += build/java/gnu/regexp/REMatch.java +java_sources += build/java/gnu/regexp/REMatchEnumeration.java +java_sources += build/java/gnu/regexp/RESyntax.java +java_sources += build/java/gnu/regexp/REToken.java +java_sources += build/java/gnu/regexp/RETokenAny.java +java_sources += build/java/gnu/regexp/RETokenBackRef.java +java_sources += build/java/gnu/regexp/RETokenChar.java +java_sources += build/java/gnu/regexp/RETokenEnd.java +java_sources += build/java/gnu/regexp/RETokenEndSub.java +java_sources += build/java/gnu/regexp/RETokenLookAhead.java +java_sources += build/java/gnu/regexp/RETokenWordBoundary.java +java_sources += build/java/gnu/regexp/RETokenOneOf.java +java_sources += build/java/gnu/regexp/RETokenPOSIX.java +java_sources += build/java/gnu/regexp/RETokenRange.java +java_sources += build/java/gnu/regexp/RETokenRepeated.java +java_sources += build/java/gnu/regexp/RETokenStart.java +java_sources += build/java/gnu/regexp/UncheckedRE.java +java_sources += build/java/gnu/regexp/CharIndexedReader.java +java_sources += build/java/gnu/regexp/REFilterReader.java + java_classes := $(java_sources:build/java/%.java=build/class/%.class) java_classes += build/class/gnu/regexp/CharUnit.class build/class/gnu/regexp/IntPair.class @@ -125,10 +167,10 @@ build/java/org/ibex/%.java: src/org/ibex/%.java build/class/org/ibex/util/Prepro @echo -e "\033[1mpreprocessing .java -> .java: $<\033[0m" @mkdir -p `dirname $@`; java -cp build/class:upstream/gnu.regexp-1.1.4/src/src org.ibex.util.Preprocessor < $< > $@ -upstream/org.ibex.crypto/%.java:; @make -s .download_org.ibex.crypto &>/dev/null -upstream/org.ibex.nestedvm/%.java:; @make -s .download_org.ibex.nestedvm &>/dev/null +upstream/org.ibex.crypto/%.java:; @make .download_org.ibex.crypto +upstream/org.ibex.nestedvm/%.java:; @make .download_org.ibex.nestedvm link_upstream = build/java/$(1): $(2)/$(1); -link_upstream += @echo -e "\033[1mlinking .java -> .java: $$< -> $$@\033[0m"; +link_upstream += @echo -e "\033[1mlinking .java -> .java: $$@\033[0m"; link_upstream += mkdir -p $$(@D); link_upstream += ln -fs `echo $$(@D)/ | sed 's_[^/]*//*_../_g'`/$$< $$@ $(call link_upstream,org/xwt/mips/%.java,upstream/org.ibex.nestedvm/src,.download_org.ibex.nestedvm) @@ -143,12 +185,16 @@ $(call link_upstream,%.cc,src) ### Java Class Files ############################################################################## compile: .compile -.compile: .download_org.ibex.nestedvm .download_bcel-5.1 $(java_sources) $(java_classes); touch $@ - -build/class/org/ibex/util/Preprocessor.class: src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java .download_gnu.regexp-1.1.4 - @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m" +.compile: .download_org.ibex.nestedvm .download_bcel-5.1 .download_gnu.regexp-1.1.4 $(java_sources) + @echo -e "\n\033[1mcompiling .java -> .class\033[0m" + @mkdir -p build/java build/class @mkdir -p build/class/org/ibex/util build/class/gnu/regexp build/java build/class - $(javac) src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java upstream/gnu.regexp-1.1.4/src/src/gnu/regexp/*.java + @test -e build/class/org/ibex/util/Preprocessor.class || \ + $(javac) src/org/ibex/util/Preprocessor.java \ + src/org/ibex/util/Vec.java upstream/gnu.regexp-1.1.4/src/src/gnu/regexp/*.java + @echo $(java_sources) | tr ' ' '\n' | sed 's_build/java/_ _' | sed 's_/_._g' | sed 's_.java$$__g' + @$(javac) $(java_sources) -d build/class + build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_org.ibex.nestedvm @mkdir -p build/java/org/ibex/util @@ -156,11 +202,6 @@ build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_org. java -cp upstream/org.ibex.nestedvm/build:upstream/org.ibex.nestedvm/upstream/build/bcel-5.1/bcel-5.1.jar \ org.xwt.mips.Compiler org.ibex.util.MIPSApps $< -outfile $@ -$(java_classes): build/class/org/ibex/util/Preprocessor.class $(java_sources) - @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m" - @mkdir -p build/java build/class - $(javac) $(java_sources) -d build/class - build/Java2/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/util/MIPSApps.class @echo -e "\n\033[1marchiving .class -> .jar: build/Java2/ibex.jar\033[0m" mkdir -p build/Java2 @@ -205,13 +246,20 @@ build/$(platform)/org/ibex/plat/$(platform).cc.o: src/org/ibex/plat/$(platform). bcel_jar := upstream/bcel-5.1/src/bcel-5.1.jar build/$(platform)/ibex.pruned.jar: .compile $(java_classes) .install_jpeg-6b_$(target) build/$(platform)/builtin.o build/$(platform)/org/ibex/plat/$(platform).cc.o @echo -e "\n\033[1mpruning .jar -> .jar\033[0m" +ifneq ($(platform),Darwin) cp upstream/install/share/java/libgcj-3.3.jar build/$(platform)/ibex.jar cd build/class; jar uf ../$(platform)/ibex.jar $(java_classes:build/class/%.class=%*.class) - (nm $(nat_libjava_files) build/$(platform)/org/ibex/plat/$(platform).cc.o; echo org.ibex.plat.$(platform).main) |\ + ($(nm) $(nat_libjava_files) build/$(platform)/org/ibex/plat/$(platform).cc.o; echo org.ibex.plat.$(platform).main) |\ grep _ZN | c++filt --format java | grep " U " | sed 's_ * U __' | sed 's_(.*__' \ | java -cp $(bcel_jar):build/class org.ibex.util.NanoGoat build/$(platform)/ibex.jar | tee nanogoat.log mkdir tmp; cd tmp; fastjar xvf ../build/$(platform)/ibex.jar.pruned; rm gnu/gcj/runtime/FirstThread*; cp ../build/class/org/ibex/plat/GCJ* org/ibex/plat/; cp -r ../build/class/org/xwt/mips/* org/xwt/mips/; mkdir -p $(shell pwd)/build/$(platform)/java/lang; mv java/lang/Class.class $(shell pwd)/build/$(platform)/java/lang; fastjar cvf ../build/$(platform)/ibex.jar.pruned .; cd ..; rm -rf tmp mv build/$(platform)/ibex.jar.pruned $@ +endif +ifeq ($(platform),Darwin) + cd build/class; jar cf ../$(platform)/ibex.pruned.jar \ + org/ibex/plat/Platform*.class \ + $(filter-out org/ibex/util/NanoGoat%,$(java_classes:build/class/%.class=%*.class)) +endif ifeq ($(platform),Win32) filedes := $(shell pwd)/upstream/gcc-3.3/src/libjava/java/io/natFileWin32.cc @@ -225,6 +273,7 @@ ifneq ($(target_bin_extension),jar) build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar src/org/ibex/plat/*.cc build/$(platform)/builtin.o $(java_headers) @echo -e "\n\033[1mlinking .jar -> $(target_bin).phat\033[0m" +ifneq ($(platform),Darwin) # -Os cd build/$(platform); $(shell pwd)/upstream/install/bin/$(target)-gcj \ -fCLASSPATH=$(shell pwd)/upstream/install/share/java/libgcj-3.3.jar \ @@ -233,9 +282,9 @@ build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar src/org/ibex/ -c java/lang/Class.class cd upstream/gcc-3.3/src/libjava/java/lang;\ ln -sf ../../../../build-$(target)/$(target)/libjava/java/lang/natConcreteProcess.cc +endif # we need -fno-store-check since we can't dynamically resolve references to array classes PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj \ - -Wl,-O2,--relax,--gc-sections,--noinhibit-exec,--no-whole-archive \ --main=org.ibex.plat.$(platform) \ -Dfile.encoding=UTF8 \ -DPREFIX=\"\" \ @@ -258,15 +307,23 @@ build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar src/org/ibex/ -Ufile \ build/$(platform)/ibex.pruned.jar \ src/org/ibex/plat/$(platform).cc \ - $(nat_libjava_files_:%.o=$(shell pwd)/upstream/gcc-3.3/src/libjava/%.c*) \ - $(filedes) \ build/$(platform)/builtin.o \ upstream/jpeg-6b/build-$(target)/libjpeg.a \ $(link_flags) \ $(libjava_dir)/../boehm-gc/.libs/libgcjgc.a \ +ifneq ($(platform),Darwin) + $(nat_libjava_files_:%.o=$(shell pwd)/upstream/gcc-3.3/src/libjava/%.c*) \ + $(filedes) \ build/$(platform)/Class.o \ - $(libjava_dir)/gnu/gcj/runtime/FirstThread.o \ - -lz -o $@.phat + $(libjava_dir)/gnu/gcj/runtime/FirstThread.o \ + -Wl,-O2,--relax,--gc-sections,--noinhibit-exec,--no-whole-archive \ + -lz -o $@.phat \ +else + $(libjava_dir)/.libs/libgcj.a \ + -o $@ \ +endif + +ifneq ($(platform),Darwin) @echo; ls -l $@.phat @echo -e "\n\033[1mstripping $(target_bin).phat -> $(target_bin)\033[0m" @@ -277,6 +334,7 @@ build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar src/org/ibex/ upx-ucl-beta $@ @echo; ls -l $@.phat endif +endif ### Builtin Resources ############################################################################## @@ -348,7 +406,7 @@ dist: compile echo -e "\n\n\n*** DONE ******************************************" propose-patch: - @darcs send --edit-description -o .darcspatch -T patches@xwt.org http://core.ibex.org/ + @darcs push --edit-description -o .darcspatch -T patches@xwt.org http://core.ibex.org/ @(echo "To: patches@xwt.org";\ SUB=`grep -A10000 New.patches .darcspatch | grep '^\\[' | cut -b 2- | tr \\\n , | sed s_,_,\ _g | sed "s_, *\\$$__"`;\ echo "Subject: $$SUB";\ @@ -363,5 +421,3 @@ doc/%.pdf: build/class/org/ibex/util/XML.class build/class/org/ibex/util/Doc.cla cd $(@D); java -cp ../../build/class org.ibex.util.Doc slides < `basename $*`.xml > `basename $*`.tex cd $(@D); pdflatex `basename $*`.tex open doc/$*.pdf - -