X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=2eb9259de94b06f01a057db392cd7f67c5d38f0d;hb=de378041d5ca2aca1a2b5a31ef15ae90a86c977f;hp=cf3873209ecd5ec12368ea62120a0b25938f1838;hpb=36b17515a42e468be7db1346384ce98df3e30882;p=org.ibex.core.git diff --git a/Makefile b/Makefile index cf38732..2eb9259 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ ############################################################################# # # The XWT Makefile - # target_Darwin := powerpc-apple-darwin @@ -24,6 +23,17 @@ Solaris: ; make gcj platform=Solaris link_flags="-lX11 -lXext -lpthread" Win32: ; make gcj platform=Win32 link_flags="-Wl,--subsystem,windows -lcomdlg32" Darwin: ; make gcj platform=Darwin link_flags="$(darwin_linker_flags)" +foo: .compile + rm -rf build/class/* + make oldcompile + make .install_jode-1.1.1_java target=java + cd build; jar xvf ../upstream/install/share/java/libgcj-3.3.jar java/lang/Object.class + java -cp upstream/java-getopt-1.0.9:upstream/jode-1.1.1/build-java jode.obfuscator.Main jode.conf + cd out; jar xvf ../upstream/install/share/java/libgcj-3.3.jar java/lang/ + cd build/class; tar cf - org/ | tar -C ../../out -xvf - + cd out ; rm -rf gnu/java/awt gnu/java/beans gnu/java/rmi java/rmi java/beans java/awt java/sql + for A in `find out -name \*.class`; do cd `dirname $$A`; $(shell pwd)/$(gcj) -c `basename $$A` -fCLASSPATH=$(shell pwd)/out; cd $(shell pwd); done + darwin_libdir := upstream/install/powerpc-apple-darwin/lib darwin_linker_flags := -Wl,-dylib_file,/usr/lib/libSystem.B.dylib:$(darwin_libdir)/libSystem.B.dylib darwin_linker_flags += -Wl,-dylib_file,/usr/lib/system/libmathCommon.A.dylib:$(darwin_libdir)/libmathCommon.A.dylib @@ -32,6 +42,9 @@ darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir)/libGL.dylib:$(darwin darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir):$(darwin_libdir)/libGLU.dylib darwin_linker_flags += -lSystem.B -lmathCommon.A -lGL -lGLU +# stupid broke-ass darwin linker... +darwin_linker_flags += build/Darwin/org/xwt/plat/OpenGL.java.o build/Darwin/org/xwt/plat/POSIX.java.o + target_bin_extension_$(platform) := $(shell echo $(platform) | tr A-Z a-z) target_bin_extension_Win32 := exe target_bin_extension_JVM := jar @@ -43,22 +56,43 @@ gcc_optimizations := -O2 #gcc_optimizations := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls #gcc_optimizations += -finline-functions -funroll-loops -ffunction-sections -fdata-sections -gcc_flags := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src/ -Iupstream/jpeg-6b/build-$(target) -gcc_flags += -Iupstream/install/$(target)/include -Iupstream/install/lib/gcc-lib/$(target)/3.3/include -gcc_flags += -Iupstream/install/include -gcj_flags := -fCLASSPATH=build/java -g++_flags := -Iupstream/install/lib/gcc-lib/$(target)/3.3/include/ -Iupstream/install/$(target)/include -Wno-multichar -gcj := upstream/install/bin/$(target)-gcj $(gcc_flags) $(gcj_flags) +gcc_flags := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src -Iupstream/jpeg-6b/build-$(target) +gcc_flags += -Iupstream/install/lib/gcc-lib/$(target)/3.3/include -Iupstream/install/$(target)/include +gcj := upstream/install/bin/$(target)-gcj $(gcc_flags) -fCLASSPATH=build/java gcjh := $(shell pwd)/upstream/install/bin/$(shell test -e upstream/install/bin/$(target)-gcjh && echo $(target)-)gcjh -g++ := upstream/install/bin/$(target)-gcj $(gcc_flags) -gcc := upstream/install/bin/$(target)-gcc $(gcc_flags) $(g++_flags) +g++ := upstream/install/bin/$(target)-gcj $(gcc_flags) -Iupstream/install/include -Wno-multichar +gcc := upstream/install/bin/$(target)-gcc $(gcc_flags) jar := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar) -gcj: .install_gcc-3.3_$(target); make $(target_bin) link_flags="$(link_flags)" platform=$(platform) +gcj: .install_gcc-3.3_$(target); make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform) include Makefile.upstream java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java' | grep -v Preprocessor)) +java_sources += build/java/org/xwt/mips/Errno.java +java_sources += build/java/org/xwt/mips/Unistd.java +java_sources += build/java/org/xwt/mips/Syscalls.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/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 + +build/java/org/xwt/mips/util/%: + @test -e .install_mips2java || make .install_mips2java + @echo linking $@ + @mkdir -p $(@D) + @cd $(@D); ln -sf ../../../../../../upstream/mips/org/xwt/mips/util/$* +build/java/org/xwt/mips/%: + @test -e .install_mips2java || make .install_mips2java + @echo linking $@ + @mkdir -p $(@D) + @test -e upstream/mips/build/org/xwt/mips/$* && (cd $(@D); \ + ln -sf ../../../../../upstream/mips/build/org/xwt/mips/$*); true + @test -e upstream/mips/org/xwt/mips/$* && (cd $(@D); \ + ln -sf ../../../../../upstream/mips/org/xwt/mips/$*); true ### Java Class Files ############################################################################## @@ -68,7 +102,7 @@ build/class/org/xwt/translators/MIPSApps.class: build/mips/mipsapps.mips .jikes @echo -e "\n\033[1mtranslating .mips -> .java: $<\033[0m" (echo -e 'package org.xwt.translators;\nimport org.xwt.mips.*;\n'; \ java -Xint -cp upstream/mips/build org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips) \ - | sed 's,//.*$$,,;'| tr -d '\n') > build/java/org/xwt/translators/MIPSApps.java + | sed 's,//.*$$,,;'| tr -d '\n' > build/java/org/xwt/translators/MIPSApps.java @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m" ./.jikes -g:none build/java/org/xwt/translators/MIPSApps.java @@ -86,7 +120,7 @@ build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java mkdir -p build/class/org/xwt/util/ ./.jikes $< -oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -d build/class `find build/java/ -name \*.java` +oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -target 1.1 -d build/class `find build/java/ -name \*.java` compile: .compile .compile: $(java_sources) .jikes .install_mips2java @echo -e "\n\033[1mcompiling .java -> .class: src/**/*.java\033[0m" @@ -95,13 +129,13 @@ compile: .compile @./.jikes $(java_sources) touch .compile -build/JVM/xwt.jar: .compile build/res/builtin.jar +build/JVM/xwt.jar: .compile build/res/builtin.jar build/class/org/xwt/translators/MIPSApps.class @echo -e "\n\033[1marchiving .class -> .jar: build/JVM/xwt.jar\033[0m" 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 \! -path './org/xwt/mips/*'` \ + `find . \! -type d` \ $(patsubst %,../../upstream/mips/build/org/xwt/mips/%*.class, Runtime Registers Syscalls Errno) @@ -138,7 +172,8 @@ build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/$(platform).cc mkdir -p `dirname $@` $(g++) -c $< -o $@ -build/$(platform)/$(platform).ar: $(java_sources:build/java/%.java=build/$(platform)/%.java.o) +nonplat_java_sources := $(filter-out build/java/org/xwt/plat/$(platform).java,$(java_sources)) +build/$(platform)/$(platform).ar: $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o) @echo -e "\n\033[1marchiving .o -> .a\033[0m" mkdir -p build/$(platform) rm -f $@ @@ -146,10 +181,10 @@ build/$(platform)/$(platform).ar: $(java_sources:build/java/%.java=build/$(platf upstream/install/$(target)/bin/ranlib $@ upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target) -$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar +build/$(platform)/$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar build/$(platform)/org/xwt/plat/$(platform).java.o @echo -e "\n\033[1mlinking .o -> $(target_bin)\033[0m" mkdir -p build/$(platform) - PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o $@ -Lupstream/install/$(target)/lib build/$(platform)/org/xwt/plat/$(platform).java.o $^ $(link_flags) + PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o $@ -Lupstream/install/$(target)/lib $^ $(link_flags) ### Builtin Resources ############################################################################## @@ -205,50 +240,14 @@ build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips ### Maintainer ###################################################################################### -propose-patch: - @echo -n "Please type a one-line description of this bug: "; \ - read A; \ - echo; \ - echo "Please type any additional comments that explain this patch."; \ - echo "If this patch fixes a bug, include a link to bugs.xwt.org."; \ - echo "When you are done, press control-d on a new line."; \ - echo; \ - ( echo -e "HELO patcher"; \ - echo -e "MAIL FROM:$(USER)@xwt.org"; \ - echo -e "RCPT TO: patches@xwt.org"; \ - echo -e "DATA"; \ - echo -e "From: $(USER)@xwt.org"; \ - echo -e "To: patches@xwt.org"; \ - echo -e "Subject: proposed patch to $(this_branch): $$A"; \ - echo -e ""; \ - cat; \ - echo; \ - cvs diff -Bud; \ - echo .; \ - ) > .message - bash -c "cat .message > /dev/tcp/mail.xwt.org/25" # /dev/tcp is faked by bash; not part of the os - current_build := $(shell cat next.build) -this_branch := $(shell tail -c +2 CVS/Tag 2>/dev/null || echo HEAD) -this_branch_flag := $(shell test $(this_branch) = HEAD && echo || echo -r $(this_branch)) - -strip_$(target) := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o +strip_$(platform) := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o strip_JVM := cp build/$(platform)/$(target_bin) -install-dist:; $(strip_$(target)) /var/www/master.dist.xwt.org/xwt-$(current_build).$(target_bin_extension).unsigned +install-dist:; $(strip_$(platform)) /var/www/master.dist.xwt.org/xwt-$(current_build).$(target_bin_extension).unsigned dist: compile - ifneq ($(shell uname -n),megacz.com) - echo "***********************************************************" - echo "* This build is $(current_build) *" - echo "***********************************************************" - cvs commit -m '' > /dev/null # this will fail if we haven't checked-in since the comment is null; we want this. - echo -e 'cd /home/xwt/\nrm -rf xwt\n/usr/bin/cvs co xwt\nnohup make -C xwt dist 2>&1 >> .make-dist.out &\n' |\ - ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory" -else (echo -n 0000; (echo "10k16o16i"; cat next.build | tr a-z A-Z; echo "1+f") | dc) | tail --bytes=5 > next.build- mv next.build- next.build echo -n "Next build will be "; cat next.build - cvs update CHANGES; echo -e \n`date +%d-%b`" =========== build $(current_build) ================" >> CHANGES - cvs commit -m 'this comment should not appear in CHANGES' next.build CHANGES nice -n 19 make all make install-dist platform=Win32 make install-dist platform=Linux @@ -256,4 +255,6 @@ else make install-dist platform=Darwin make install-dist platform=JVM echo -e "\n\n\n*** DONE ******************************************" -endif + +propose-patch: + darcs push -s -A $(USER)@xwt.org -T patches@xwt.org