X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=07304a17c9690f4ca90f309b4e21e651ce898b55;hb=9c2602143956cd39ecf5ef4c9eb31f5f56b5bd66;hp=4ee19ecbb85f33817c94f6e8537a35334a0e07fa;hpb=6f2339751a675c8bc42a9a496d3032ea70cc0e55;p=org.ibex.core.git diff --git a/Makefile b/Makefile index 4ee19ec..07304a1 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,9 @@ all: JVM Linux Win32 Darwin #Solaris clean: + rm -rf build + +dist-clean: rm -rf .jikes .configure* .install* build .compile .build* find upstream -name config.cache -exec rm {} \; @@ -47,16 +50,16 @@ include Makefile.upstream # figure out what stuff in org.xwt.plat.* this platform requires (its superclasses) java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java' \! -path 'src/org/xwt/mips/*')) -java_sources += build/java/org/xwt/translators/FreetypeVM.java all_java_sources := $(java_sources) nonplat_java_sources := $(filter-out build/java/org/xwt/plat/%, $(java_sources)) plat_java_sources := $(filter build/java/org/xwt/plat/%, $(java_sources)) -build/java/org/xwt/translators/FreetypeVM.java: build/res/freetype.mips build/class/org/xwt/mips/Compiler.class +build/java/org/xwt/translators/MIPSApps.java: build/mips/mipsapps.mips build/class/org/xwt/mips/Compiler.class mkdir -p build/java/org/xwt/translators + @echo -e "\n\033[1mtranslating .mips -> .java: $<\033[0m" (echo -e 'package org.xwt.translators;\nimport org.xwt.mips.*;\n'; \ - java -Xint -cp build/class org.xwt.mips.Compiler FreetypeVM build/res/freetype.mips)\ + java -Xint -cp build/class org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips)\ > $@ build/java/org/xwt/%.java: src/org/xwt/%.java @@ -71,6 +74,11 @@ build/c/jpeg/%.c: upstream/jpeg-6b/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/class/org/xwt/translators/MIPSApps.class: build/java/org/xwt/translators/MIPSApps.java .jikes + @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m" + mkdir -p build/class/org/xwt/translators + ./.jikes -g:none $< + build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java .jikes @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m" mkdir -p build/class/org/xwt/util/ @@ -85,7 +93,7 @@ build/class/org/xwt/mips/Compiler.class: src/org/xwt/mips/*.java # this forces a clean build every time because jikes is so damn buggy preprocess: $(java_sources) compile: .compile -.compile: $(java_sources) .jikes +.compile: build/class/org/xwt/translators/MIPSApps.class $(java_sources) .jikes @echo -e "\n\033[1mcompiling .java -> .class: src/**/*.java\033[0m" @rm -f $(java_sources:build/java/%.java=build/class/%.class) mkdir -p build/class @@ -154,8 +162,9 @@ builtin_src := $(shell find src/org/xwt/builtin -name '*.*' \! -name '*.xcf') build/res/fonts/vera: .download_vera-1.10 mkdir -p build/res/fonts/vera cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf - cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraBd.ttf -build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/freetype.mips build/res/libmspack.mips build/res/fonts/vera + cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraMono.ttf + cd build/res/fonts/vera; ln -s ../../../../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 $(^:build/res/%=%) @@ -178,7 +187,9 @@ build/JVM/xwt.jar: .compile build/res/builtin.jar mkdir -p build/JVM echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest cd build/class/org/xwt; ln -sf ../../../res/builtin.jar - cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest `find . \! -type d`; + cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest \ + `find . \! -type d \! -path './org/xwt/mips/*'` \ + $(patsubst %,org/xwt/mips/%*.class, Runtime Registers Syscalls Errno) @@ -186,17 +197,19 @@ build/JVM/xwt.jar: .compile build/res/builtin.jar # Freetype # -build/mips/%.c.o: src/%.c +build/mips/%.c.o: src/%.c .download_libmspack-20030726 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) echo -e "\n\033[1mcompiling $< -> $@ (mips)\033[0m" upstream/install/bin/mips-unknown-elf-gcc -march=r3000 \ -Iupstream/freetype-2.1.4/src/include \ - -Iupstream/libmspack-20030726/libmspack/mspack \ + -Iupstream/libmspack-20030726/src/mspack \ -c -o $@ $< -build/res/freetype.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o +build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/translators/main.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.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" mkdir -p build/mips build/res upstream/install/bin/mips-unknown-elf-gcc \ @@ -206,31 +219,12 @@ build/res/freetype.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/ -T src/org/xwt/mips/linker.ld \ -Lbuild/mips \ -Lupstream/freetype-2.1.4/src/objs \ + -Lupstream//libmspack-20030726/build-mips-unknown-elf/ \ -o $@ \ $^ \ -lfreetype \ -# -Wl,-s \ - -.install_libmspack-20030726:; make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf -build/mips/org/xwt/translators/MSPack.c.o: .install_libmspack-20030726 -build/res/libmspack.mips: build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o - @echo -e "\n\033[1mlinking .o -> .mips: $@\033[0m" - mkdir -p build/mips build/res - upstream/install/bin/mips-unknown-elf-gcc \ - -nostdlib \ - --static \ - -march=mips1 \ - -T src/org/xwt/mips/linker.ld \ - -Lbuild/mips \ - -Lupstream/libmspack-20030726/src/mspack \ - -Lupstream/libmspack-20030726/build-mips-unknown-elf \ - -o $@ \ - $^ \ -lmspack \ -# -Wl,-s \ - - - + -Wl,--gc-sections ############################################################################## # Maintainer stuff: generating numbered builds, proposing patches @@ -334,7 +328,7 @@ dist-private: # this is for Adam; don't mess with it -test: JVM; /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -jar build/JVM/xwt.jar http://localhost/demo.xwar -#test: JVM; java -jar build/JVM/xwt.jar http://localhost/demo.xwar +#test: JVM; /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -jar build/JVM/xwt.jar http://localhost/demo.xwar +test: JVM; java -jar build/JVM/xwt.jar http://localhost/demo.xwar oldcompile: preprocess; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar javac -d build/class `find build/java/ src/org/xwt/mips -name \*.java`