X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile.upstream;h=07498137f6329c8520e6d73642a91fb273e6a774;hp=b4e8759daed9a238edb627d855b72a3a063b1e7f;hb=f45bf5b8d4f76e5c847b8496a2ee7ef96c665077;hpb=ae0cd6164facf843cc136f52e3f78e3843191d61 diff --git a/Makefile.upstream b/Makefile.upstream index b4e8759..0749813 100644 --- a/Makefile.upstream +++ b/Makefile.upstream @@ -13,11 +13,11 @@ url_mingw-runtime-3.0 := http://unc.dl.sourceforge.net/sourceforge/mingw/mingw- url_freetype-2.1.4 := http://unc.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.4.tar.gz url_gcc-3.3 := http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-3.3/gcc-3.3.tar.gz url_jpeg-6b := http://www.ijg.org/files/jpegsrc.v6b.tar.gz -url_jikes-1.18 := http://dist.xwt.org/jikes-1.18.tgz url_libmspack-20030726 := http://www.kyz.uklinux.net/downloads/libmspack-20030726.tar.gz 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 .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor rm -rf upstream/darwin-linker/src @@ -107,16 +107,17 @@ environment_gcc_3.3_$(target) += PATH=$(shell pwd)/upstream/install/bi .PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target) -.download_nestedvm: - mkdir -p upstream/nestedvm - cd upstream/nestedvm; wget -nH -r http://nestedvm.ibex.org/ - 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 + @touch $@ -.build_nestedvm: .download_nestedvm - cd upstream/nestedvm; make +.build_org.ibex.nestedvm: .vendor .download_org.ibex.nestedvm + cd upstream/org.ibex.nestedvm; make usr=$(shell pwd)/upstream/install all env.sh touch $@ -.install_nestedvm: .build_nestedvm +.install_org.ibex.nestedvm: .build_org.ibex.nestedvm touch $@ # vendor-supplied binaries and headers; this is stuff that comes with various OSes @@ -139,7 +140,7 @@ endif curl $(url_gcc-3.3) | tar xzf - -C upstream/gcc-3.3 mv upstream/gcc-3.3/gcc-3.3 upstream/gcc-3.3/src-darwin; true mv upstream/gcc-3.3/libmspack upstream/gcc-3.3/src-darwin; true - (cd upstream/gcc-3.3/src-darwin && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true + (cd upstream/gcc-3.3/src-darwin && for A in ../patches/[a-y]*.patch; do patch -p0 -l < $$A; done); true (cd upstream/gcc-3.3/src-darwin && for A in ../patches-darwin/*.patch; do patch -p0 -l < $$A; done); true touch $@ @@ -181,22 +182,7 @@ endif cd upstream/libmspack-20030726/build-$(target); ln -sf ../src/mspack/* . touch $@ -.install_binutils-2.13.2.1_mips-unknown-elf: .install_mips2java; touch $@ -.install_gcc-3.3_mips-unknown-elf: .install_mips2java; touch $@ - -.download_mips2java: - mkdir -p upstream/install - curl http://www.megacz.com/tmp/mips.snapshot.tgz | tar -C upstream -xvzf - -# echo '/1 :pserver:cvs@cvs.ibex.org:2401/ A' >> ~/.cvspass -# cd upstream; cvs -d :pserver:cvs@cvs.ibex.org:/ co mips - cd upstream/mips/upstream; ln -sf `cd ../..; pwd`/install - touch $@ - -.install_mips2java: .download_mips2java - (cd upstream/mips; make) - touch $@ - -.install_freetype-2.1.4_mips-unknown-elf: .install_mips2java .download_freetype-2.1.4 +.install_freetype-2.1.4_mips-unknown-elf: .install_org.ibex.nestedvm .download_freetype-2.1.4 cd upstream/freetype-2.1.4/src; \ make setup ansi; \ PATH=$$PATH:`pwd`/../../install/bin make \ @@ -216,6 +202,9 @@ endif .install_libmspack-20030726_$(target): .build_libmspack-20030726_$(target); true +.install_gcc-3.3_mips-unknown-elf: .install_org.ibex.nestedvm + touch $@ + .install_%_$(target): .build_%_$(target) @echo -e "\n\033[1minstalling $*...\033[0m" cd upstream/$*/build-$(target); \ @@ -224,24 +213,5 @@ endif make $(make_install_$*_$(target)) install $(setcc) $(environment_$*_$(target)) touch $@ -# jikes has a special target to autodetect a pre-installed jikes, and to autodetect the JVM's $CLASSPATH -.jikes: - @echo -e "\n\033[1mdetecting your jikes installation...\033[0m" - echo "#!/bin/sh" > .jikes -ifeq ($(shell javac -version 2>&1 | head -n 1),javac 1.5.0-beta) - echo -n 'PATH=upstream/install/bin:$$PATH javac -classpath upstream/bcel-5.1/src/bcel-5.1.jar:build/class $$@ -d build/class/ -sourcepath build/java/:upstream/mips:upstream/mips/build:src' >> .jikes -else - echo -n 'PATH=upstream/install/bin:$$PATH jikes -classpath upstream/bcel-5.1/src/bcel-5.1.jar:build/class $$@ -d build/class/ -sourcepath build/java/:upstream/mips:upstream/mips/build:src ' >> .jikes - (type jikes && (jikes --version | grep "Version 1.18")) || make .install_jikes-1.18_ target= - echo -n "$(jikes_flags) -bootclasspath " >> .jikes - echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java - echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }" >> GetBootClassPath.java - javac GetBootClassPath.java - java -cp . GetBootClassPath >> .jikes - rm GetBootClassPath.* -endif - echo 'EXIT=$$?' >> .jikes - echo 'exit $$EXIT' >> .jikes - mv .jikes .jikes+ - cp .jikes+ .jikes - chmod +x .jikes + +