reorganized file layout (part 2: edits)

[org.ibex.core.git] / Makefile.upstream

diff --git a/Makefile.upstream b/Makefile.upstream
index 17722ac..fb677cb 100644 (file)
--- 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
@@ -121,6 +121,11 @@ environment_gcc_3.3_$(target)           += PATH=$(shell pwd)/upstream/install/bi
        touch .install_gcc-3.3_mips-unknown-elf
        touch .install_binutils-2.13.2.1_mips-unknown-elf
 
+.download_org.ibex.crypto:
+       mkdir -p upstream/org.ibex.crypto
+       cd upstream/org.ibex.crypto; wget -l 99 -nH -r http://crypto.ibex.org/
+       touch $@
+
 # vendor-supplied binaries and headers; this is stuff that comes with various OSes
 vendor: .vendor; @true
 .vendor:
@@ -226,24 +231,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
+
+