From 8dc6899b7793bffc0943b27dd66f224656eacf2e Mon Sep 17 00:00:00 2001
From: adam <adam@megacz.com>
Date: Wed, 14 Apr 2004 08:49:36 +0000
Subject: [PATCH] uniform naming of upstream org.ibex packages

darcs-hash:20040414084936-5007d-00d20099988fae9559f47f9a07468d33ec1ad64f.gz
---
 Makefile          |   84 +++++++++++++++++++++++------------------------------
 Makefile.upstream |   14 +++++----
 2 files changed, 44 insertions(+), 54 deletions(-)

diff --git a/Makefile b/Makefile
index 4779d99..e8bb2c0 100644
--- a/Makefile
+++ b/Makefile
@@ -18,12 +18,12 @@ target := $(target_$(platform))
 
 all:         Java2 Linux Win32 Darwin Solaris
 
-clean:      ; rm -rf build; rm .preprocessor
+clean:      ; rm -rf build; rm build/class/org/ibex/util/Preprocessor.class
 dist-clean:
 	rm -rf .configure* .install* build .compile .build*
 	find upstream -name config.cache -exec rm {} \;
-	test -e upstream/nestedvm && make -C upstream/nestedvm clean
-	rm .install_nestedvm
+	test -e upstream/org.ibex.nestedvm && make -C upstream/org.ibex.nestedvm clean
+	rm .install_org.ibex.nestedvm
 
 libwing_Linux := -Lupstream/install/i686-pc-linux-gnu/lib/
 libwing_Linux +=   upstream/install/i686-pc-linux-gnu/lib/libWINGs.a
@@ -118,59 +118,48 @@ java_classes              += build/class/gnu/regexp/CharUnit.class build/class/g
 
 ### Java Source Files ##############################################################################
 
-build/java/gnu/regexp: .download_gnu.regexp-1.1.4
-	mkdir -p $(@D); cd $(@D); ln -sf ../../../upstream/gnu.regexp-1.1.4/src/src/gnu/regexp
-build/java/org/xwt/mips: .download_nestedvm
-	mkdir -p $(@D); cd $(@D); ln -sf ../../../../upstream/nestedvm/src/org/xwt/mips
-build/java/org/ibex/crypto: .download_org.ibex.crypto
-	mkdir -p $(@D); cd $(@D); ln -sf ../../../../upstream/org.ibex.crypto/src/org/ibex/crypto
-	mkdir -p build/java/org/ibex/net;
-	cd build/java/org/ibex/net; ln -sf ../../../../../upstream/org.ibex.crypto/src/org/ibex/net/SSL.java
-	cd build/java/org/ibex/net; ln -sf ../../../../../upstream/org.ibex.crypto/src/org/ibex/net/ssl
-
-ifeq ($(platform),Java2)
-.preprocessor: build/java/gnu/regexp src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java build/java/org/xwt/mips build/java/org/ibex/crypto
-
-	@mkdir -p build/class/org/ibex/util build/class/gnu/regexp
-	$(javac) src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java build/java/gnu/regexp/*.java  -d build/class
-	@touch $@
-else
-.preprocessor: build/java/gnu/regexp src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java build/java/org/xwt/mips build/java/org/ibex/crypto
-	@mkdir -p build/class/org/ibex/util build/class/gnu/regexp
-	$(gcj) -Isrc -C src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java build/java/gnu/regexp/*.java  -d build/class
-	@touch $@
-endif
 build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 build/res/%:       src/%      ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
-build/java/org/ibex/%.java: src/org/ibex/%.java .preprocessor
-	@echo -e "\n\033[1mpreprocessing      .java -> .java:  $<\033[0m"
-	mkdir -p `dirname $@`; java -cp build/class:build/java org.ibex.util.Preprocessor < $^ > $@
-build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 
+build/java/org/ibex/%.java: src/org/ibex/%.java build/class/org/ibex/util/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 < $< > $@
+
+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
+link_upstream =  build/java/$(1): $(2)/$(1);
+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)
+$(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,gnu/regexp/%.java,upstream/gnu.regexp-1.1.4/src/src)
+$(call link_upstream,%.java,src)
+$(call link_upstream,%.cc,src)
 
-### Java Class Files ##############################################################################
 
-build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_nestedvm 
-	mkdir -p build/java/org/ibex/util
-	@echo -e "\n\033[1mtranslating        .mips -> .class:  $<\033[0m"
-	java -cp upstream/nestedvm/build:upstream/nestedvm/upstream/build/bcel-5.1/bcel-5.1.jar \
-		org.xwt.mips.Compiler org.ibex.util.MIPSApps $< -outfile $@
-#-o onepage,pagesize=8m
+### Java Class Files ##############################################################################
 
 compile: .compile
-.compile: .download_nestedvm .download_bcel-5.1 $(java_sources) $(java_classes); touch $@
+.compile: .download_org.ibex.nestedvm .download_bcel-5.1 $(java_sources) $(java_classes); touch $@
 
-ifeq ($(platform),Java2)
-build/class/%.class: build/java/%.java .preprocessor
+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"
-	mkdir -p build/class
-	@$(javac) $< -d build/class
-else
-build/class/%.class: build/java/%.java
+	@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
+
+build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_org.ibex.nestedvm 
+	@mkdir -p build/java/org/ibex/util
+	@echo -e "\n\033[1mtranslating        .mips -> .class:  $<\033[0m"
+	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 $(@D)
-	$(gcj) -I$(bcel_jar) -C -O0 $< -d build/class
-endif
+	@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"
@@ -183,7 +172,6 @@ build/Java2/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/util/M
 ### Headers ##################################################################################
 
 java_headers          := $(java_sources:build/java/%.java=build/h/%.h) 
-build/h/edu/stanford/ejalbert/BrowserLauncher.h:; mkdir -p $(@D); touch $@
 build/h/%.h: build/class/%.class .compile
 	@echo -e "\n\033[1mextracting        .class -> .h:     $<\033[0m"
 	mkdir -p `dirname $@`
@@ -312,7 +300,7 @@ build/$(platform)/builtin.o: build/res/builtin.jar
 		echo "};") > .builtin.c
 	$(gcc) -c .builtin.c -o build/$(platform)/builtin.o
 
-build/mips/%.c.o: src/%.c .download_libmspack-20030726 .install_nestedvm
+build/mips/%.c.o: src/%.c .download_libmspack-20030726 .install_org.ibex.nestedvm
 	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
 	make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
 	mkdir -p $(@D)
diff --git a/Makefile.upstream b/Makefile.upstream
index f7867d9..4228f4f 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -107,21 +107,23 @@ 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 -l 99 -nH -r http://nestedvm.ibex.org/
+.download_org.ibex.nestedvm:
+	mkdir -p upstream/org.ibex.nestedvm
+	cd upstream/org.ibex.nestedvm; wget -l 999 -nH -r http://nestedvm.ibex.org/
+	find upstream/org.ibex.nestedvm -name index.html -exec rm -f {} \;
 	touch $@
 
 .build_nestedvm: .vendor .download_nestedvm
-	cd upstream/nestedvm; make usr=$(shell pwd)/upstream/install all env.sh
+	cd upstream/nestedvm; make usr=$(shell pwd)/upstream/install
 	touch $@
 
-.install_nestedvm: .build_nestedvm
+.install_org.ibex.nestedvm: .build_org.ibex.nestedvm
 	touch $@
 
 .download_org.ibex.crypto:
 	mkdir -p upstream/org.ibex.crypto
-	cd upstream/org.ibex.crypto; wget -l 99 -nH -r http://crypto.ibex.org/
+	cd upstream/org.ibex.crypto; wget -l 999 -nH -r http://crypto.ibex.org/
+	find upstream/org.ibex.crypto -name index.html -exec rm -f {} \;
 	touch $@
 
 # vendor-supplied binaries and headers; this is stuff that comes with various OSes
-- 
1.7.10.4