X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=72f68df2759b8a022cdf0cffe3c814550bbf96a3;hp=7fcbf5ec6bf8c2cab71cb4ebc6eb0aed467a0936;hb=eb69dc64717856f2e0f1471f4fcab998329627a2;hpb=17da0d711dc2a5eb62a1b7e6d933bddef4a19019

diff --git a/Makefile b/Makefile
index 7fcbf5e..72f68df 100644
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,10 @@ all:         Java2 Linux Win32 Darwin Solaris
 
 clean:      ; rm -rf build; rm .preprocessor
 dist-clean:
-	rm -rf .jikes .configure* .install* build .compile .build*
+	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
 
 libwing_Linux := -Lupstream/install/i686-pc-linux-gnu/lib/
 libwing_Linux +=   upstream/install/i686-pc-linux-gnu/lib/libWINGs.a
@@ -56,7 +57,7 @@ target_bin_extension_Java2       := jar
 target_bin_extension             := $(target_bin_extension_$(platform))
 target_bin                       := ibex.$(target_bin_extension)
 
-jikes_flags        := -nowarn
+javac   := 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
 gcc_optimizations  := -Os
 #gcc_optimizations  := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls
 #gcc_optimizations  += -finline-functions -funroll-loops -ffunction-sections -fdata-sections
@@ -103,60 +104,62 @@ java_sources              += build/java/org/xwt/mips/util/SeekableByteArray.java
 java_sources              += build/java/org/xwt/mips/util/SeekableData.java
 java_sources              += build/java/org/xwt/mips/util/SeekableFile.java
 java_sources              += build/java/org/xwt/mips/util/SeekableInputStream.java
-java_sources              += build/java/org/xwt/mips/ClassFileCompiler.java
-java_sources              += build/java/org/xwt/mips/ELF.java
 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/UnixRuntime.java
 java_sources              += build/java/org/xwt/mips/UsermodeConstants.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
 
-build/java/org/xwt/mips/%: .install_nestedvm
-	mkdir -p build/java/org/xwt/mips
-	cd build/java/org/xwt/mips; ln -sf ../../../../../upstream/nestedvm/src/org/xwt/mips/* .
-	cd build/java/org/xwt/mips; ln -sf ../../../../../upstream/nestedvm/build/org/xwt/mips/*.java .
-
-
 ### 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: src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java src/gnu/regexp/*.java
-	@make .jikes
+.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
-	./.jikes $^ -d build/class
+	$(javac) src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java build/java/gnu/regexp/*.java  -d build/class
 	@touch $@
 else
-.preprocessor: src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java src/gnu/regexp/*.java
+.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 $^ -d build/class
+	$(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 org.ibex.util.Preprocessor < $^ > $@
+	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'`/$< $@
 
 
 ### Java Class Files ##############################################################################
 
-build/class/org/ibex/translators/MIPSApps.class: build/mips/mipsapps.mips .install_nestedvm .jikes
-	mkdir -p build/java/org/ibex/translators
+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.translators.MIPSApps $< -o onepage,pagesize=8m -outfile $@
+		org.xwt.mips.Compiler org.ibex.util.MIPSApps $< -outfile $@
+#-o onepage,pagesize=8m
 
 compile: .compile
 .compile: .download_nestedvm .download_bcel-5.1 $(java_sources) $(java_classes); touch $@
 
 ifeq ($(platform),Java2)
-build/class/%.class: build/java/%.java .preprocessor .jikes
+build/class/%.class: build/java/%.java .preprocessor
 	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
 	mkdir -p build/class
-	@./.jikes $< -d build/class
+	@$(javac) $< -d build/class
 else
 build/class/%.class: build/java/%.java
 	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
@@ -164,10 +167,10 @@ build/class/%.class: build/java/%.java
 	$(gcj) -I$(bcel_jar) -C -O0 $< -d build/class
 endif
 
-build/Java2/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/translators/MIPSApps.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
-	echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.Main\n" > build/Java2/.manifest
+	echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.core.Main\n" > build/Java2/.manifest
 	cd build/class/org/ibex; ln -sf ../../../res/builtin.jar
 	cd build/class; $(jar) cfm ../Java2/ibex.jar ../Java2/.manifest `find . -name \*.class -or -name \*.jar`
 
@@ -284,7 +287,7 @@ endif
 
 ### Builtin Resources ##############################################################################
 
-builtin_src := $(shell find src/org/ibex/builtin -name '*.*' \! -name '*.xcf')
+builtin_src := $(shell find src/org/ibex/core/builtin -name '*.*' \! -name '*.xcf')
 build/res/fonts/vera: .download_vera-1.10
 	mkdir -p build/res/fonts/vera
 	cd build/res/fonts/vera; ln -fs ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
@@ -292,7 +295,7 @@ build/res/fonts/vera: .download_vera-1.10
 	cd build/res/fonts/vera; ln -fs ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraSe.ttf
 build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/fonts/vera
 	@echo -e "\n\033[1mzipping            res/* -> .jar: builtin.jar\033[0m"
-	cd build/res; $(jar) cf builtin.jar org/ibex/builtin/scar.png fonts
+	cd build/res; $(jar) cf builtin.jar org/ibex/core/builtin/scar.png fonts
 build/$(platform)/builtin.o: build/res/builtin.jar
 	@echo -e "\n\033[1mwrapping            .jar -> .o: resources.o\033[0m"
 	@mkdir -p $(@D)
@@ -314,7 +317,7 @@ build/mips/%.c.o: src/%.c .download_libmspack-20030726 .install_nestedvm
 		-Iupstream/libmspack-20030726/src/mspack \
 		-c -o $@ $<
 
-build/mips/mipsapps.mips: build/mips/org/ibex/translators/Freetype.c.o build/mips/org/ibex/translators/MSPack.c.o build/mips/org/ibex/translators/main.c.o 
+build/mips/mipsapps.mips: build/mips/org/ibex/graphics/Freetype.c.o build/mips/org/ibex/util/MSPack.c.o
 	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
 	make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
 	@echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
@@ -322,8 +325,8 @@ build/mips/mipsapps.mips: build/mips/org/ibex/translators/Freetype.c.o build/mip
 	upstream/install/bin/mips-unknown-elf-gcc \
 		--static \
 		-march=mips1 \
-		-T upstream/mips/org/xwt/mips/linker.ld \
-		-L upstream/mips/build/org/xwt/mips/ \
+		-T upstream/nestedvm/src/org/xwt/mips/linker.ld \
+		-L upstream/nestedvm/build/org/xwt/mips/ \
 		-L upstream/freetype-2.1.4/src/objs \
 		-L upstream/libmspack-20030726/build-mips-unknown-elf/ \
 		-o $@ \
@@ -352,7 +355,7 @@ dist: compile
 	echo -e "\n\n\n*** DONE ******************************************"
 
 propose-patch:
-	@darcs push --and-apply --edit-description -o .darcspatch -T patches@xwt.org http://core.ibex.org/
+	@darcs send --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";\