From 62910022be653ba915d21ed2f6d154b6e8624fe1 Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 21 Jun 2009 23:34:19 +0000 Subject: [PATCH] fix makefiles darcs-hash:20090621233419-5007d-fb4df6479cd0c57bf1366fc1ced0e0f510881c4b.gz --- Makefile | 12 ++++++------ Makefile.tool | 12 ++++++------ Makefile.upstream | 9 ++++++++- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 9ca6dea..bad72a2 100644 --- a/Makefile +++ b/Makefile @@ -167,21 +167,21 @@ build/cc/%.cc: src/%.c ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $ build/res/%: src/% ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@ $(call link_upstream,org/ibex/nestedvm/%.java,upstream/org.ibex.nestedvm/src,.download_org.ibex.nestedvm) $(call link_upstream,org/ibex/crypto/%.java,upstream/org.ibex.crypto/src,.download_org.ibex.crypto) -$(call link_upstream,org/ibex/net/ssl/%.java,upstream/org.ibex.crypto/src,.download_org.ibex.crypto) -$(call link_upstream,org/ibex/net/SSL.java,upstream/org.ibex.crypto/src,.download_org.ibex.crypto) +$(call link_upstream,org/ibex/net/ssl/%.java,upstream/org.ibex.net/src,.download_org.ibex.net) +$(call link_upstream,org/ibex/net/SSL.java,upstream/org.ibex.net/src,.download_org.ibex.net) $(call link_upstream,gnu/regexp/%.java,upstream/gnu.regexp-1.1.4/src/src) -build/java/org/ibex/%.java: src/org/ibex/%.java .download_gnu.regexp-1.1.4 build/class/org/ibex/util/Preprocessor.class +build/java/org/ibex/%.java: src/org/ibex/%.java .download_gnu.regexp-1.1.4 build/class/org/ibex/tool/Preprocessor.class @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 < $< > $@ + mkdir -p `dirname $@`; java -cp build/class:upstream/gnu.regexp-1.1.4/src/src org.ibex.tool.Preprocessor < $< > $@ $(call link_upstream,%.java,src) $(call link_upstream,%.cc,src) ### Java Class Files ############################################################################## -build/class/org/ibex/util/Preprocessor.class: src/org/ibex/util/Preprocessor.java +build/class/org/ibex/tool/Preprocessor.class: .download_org.ibex.tool .download_org.ibex.util @mkdir -p build/class/gnu/regexp build/class/org/ibex/util - $(javac) $< src/org/ibex/util/Vec.java upstream/gnu.regexp-1.1.4/src/src/gnu/regexp/*.java + $(javac) src/org/ibex/tool/Preprocessor.java src/org/ibex/util/Vec.java upstream/gnu.regexp-1.1.4/src/src/gnu/regexp/*.java compile: .compile .compile: $(java_sources) diff --git a/Makefile.tool b/Makefile.tool index 80ccb5b..dca2295 100644 --- a/Makefile.tool +++ b/Makefile.tool @@ -1,17 +1,17 @@ -default: src/org/ibex/graphics/Vera.java src/org/ibex/core/builtin/Scar.java jar/mipsapps.jar +default: repo/org.ibex.core/src/org/ibex/graphics/Vera.java repo/org.ibex.core/src/org/ibex/core/builtin/Scar.java jar/mipsapps.jar jar/mipsapps.jar: cp repo/org.ibex.core/prebuilt/mipsapps.jar $@ -src/org/ibex/graphics/Vera.java: +repo/org.ibex.core/src/org/ibex/graphics/Vera.java: @echo " Encoding Vera.ttf -> Vera.java" @curl -\# http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.gz |\ tar -Oxzf - ttf-bitstream-vera-1.10/Vera.ttf | \ java -Djava.ext.dirs=jar org.ibex.util.Encode\$$JavaSourceCode org.ibex.graphics Vera > \ - src/org/ibex/graphics/Vera.java + repo/org.ibex.core/src/org/ibex/graphics/Vera.java -src/org/ibex/core/builtin/Scar.java: +repo/org.ibex.core/src/org/ibex/core/builtin/Scar.java: @echo " Encoding scar.png -> Scar.java" @java -Djava.ext.dirs=jar org.ibex.util.Encode\$$JavaSourceCode org.ibex.core.builtin Scar \ - < src/org/ibex/core/builtin/scar.png \ - > src/org/ibex/core/builtin/Scar.java \ + < repo/org.ibex.core/src/org/ibex/core/builtin/scar.png \ + > repo/org.ibex.core/src/org/ibex/core/builtin/Scar.java \ diff --git a/Makefile.upstream b/Makefile.upstream index 0749813..4b2c6bf 100644 --- a/Makefile.upstream +++ b/Makefile.upstream @@ -17,7 +17,7 @@ url_libmspack-20030726 := http://www.kyz.uklinux.net/downloads/libmspack-2003072 url_vera-1.10 := http://fgo-temp.acc.umu.se/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.gz url_WindowMaker-0.80.2 := http://windowmaker.org/pub/source/release/WindowMaker-0.80.2.tar.gz url_bcel-5.1 := http://www.apache.org/dist/jakarta/bcel/binaries/bcel-5.1.tar.gz -url_gnu.regexp-1.1.4 := ftp://ftp.tralfamadore.com/pub/java/gnu.regexp-1.1.4.tar.gz +url_gnu.regexp-1.1.4 := http://21cma.bao.ac.cn/gentoo/distfiles/gnu.regexp-1.1.4.tar.gz .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor rm -rf upstream/darwin-linker/src @@ -107,10 +107,17 @@ environment_gcc_3.3_$(target) += PATH=$(shell pwd)/upstream/install/bi .PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target) +.download_org.ibex.nestedvm: + @mkdir -p upstream; cd upstream; rm -rf org.ibex.$*; rm -rf org.ibex.$*_* + @cd upstream; git clone http://nestedvm.ibex.org/.git org.ibex.nestedvm + @touch $@ + .download_org.ibex.%: @echo -e "\033[1mfetching repository org.ibex.$*\033[0m" @mkdir -p upstream; cd upstream; rm -rf org.ibex.$*; rm -rf org.ibex.$*_* @cd upstream; darcs get --verbose --partial --repo-name=org.ibex.$* http://$*.ibex.org + @rm -f src/org/ibex/$* + @ln -s ../../../upstream/org.ibex.$*/src/org/ibex/$* src/org/ibex/$* @touch $@ .build_org.ibex.nestedvm: .vendor .download_org.ibex.nestedvm -- 1.7.10.4