find upstream -name config.cache -exec rm {} \;
test -e upstream/mips && make -C upstream/mips clean
+libwing_Linux := -Lupstream/install/i686-pc-linux-gnu/lib/
+libwing_Linux += upstream/install/i686-pc-linux-gnu/lib/libWINGs.a
+libwing_Linux += upstream/install/i686-pc-linux-gnu/lib/libwraster.a
+
+libwing_Solaris := -Lupstream/install/sparc-sun-solaris2.7/lib/
+libwing_Solaris += upstream/install/sparc-sun-solaris2.7/lib/libWINGs.a
+libwing_Solaris += upstream/install/sparc-sun-solaris2.7/lib/libwraster.a
+
JVM: build/JVM/ibex.jar
-Linux: ; make gcj platform=Linux link_flags="-lX11 -lXext"
-Solaris: ; make gcj platform=Solaris link_flags="-lX11 -lXext -lpthread"
+Linux: ; make gcj platform=Linux link_flags="$(libwing_Linux) -lXpm -lX11 -lXext"
+Solaris: ; make gcj platform=Solaris link_flags="$(libwing_Solaris) -lXpm -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
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 build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform)
+gcj: .install_gcc-3.3_$(target)
+ make compile
+ 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 := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java' | grep -v Preprocessor | grep -v plat/AWT | grep -v plat/Java2))
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
@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 $@
build/class/org/ibex/translators/MIPSApps.class: build/mips/mipsapps.mips .jikes
mkdir -p build/java/org/ibex/translators
@echo -e "\n\033[1mtranslating .mips -> .java: $<\033[0m"
- (echo -e 'package org.xwt.translators;\n'; \
+ (echo -e 'package org.ibex.translators;\n'; \
java -Xint -cp upstream/mips/build org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips) \
| sed 's,//.*$$,,;'| tr -d '\n' > build/java/org/ibex/translators/MIPSApps.java
@echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m"
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/class/org/ibex/util/Preprocessor.class: src/org/ibex/util/Preprocessor.java .jikes
+gnu_regexp_jfiles := $(patsubst src/%.java, build/java/%.java, $(shell find src/gnu/regexp -name \*.java))
+gnu_regexp := $(patsubst src/%.java, build/class/%.class, $(shell find src/gnu/regexp -name \*.java))
+
+build/class/gnu/regexp/%.class: build/java/gnu/regexp/%.java $(gnu_regexp_jfiles) .jikes
@echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m"
mkdir -p build/class/org/ibex/util/
./.jikes $<
-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"
- @rm -f $(java_sources:build/java/%.java=build/class/%.class)
- mkdir -p build/class
- echo @./.jikes $(java_sources)
- @./.jikes $(java_sources)
- touch .compile
+build/class/org/ibex/util/Preprocessor.class: src/org/ibex/util/Preprocessor.java $(gnu_regexp) .jikes
+ @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m"
+ mkdir -p build/class/org/ibex/util/
+ ./.jikes src/org/ibex/util/Vec.java
+ ./.jikes $<
+
+build/class/%.class: build/java/%.java $(java_sources) .jikes
+ @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m"
+ mkdir -p $(@D)
+ ./.jikes $<
+
+oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -target 1.1 -source 1.2 -d build/class `find build/java/ -name \*.java`
+
+compile: .jikes .install_mips2java
+ @make -s $(java_sources:build/java/%.java=build/class/%.class)
+.compile: compile
+
+#.compile: $(java_sources) .jikes .install_mips2java
+# @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
+# cd build/java; for A in `find . -name \*.java`; do mkdir -p ../class/`dirname $$A`; done
+# @./.jikes -Xlint:deprecation $(java_sources)
+# touch .compile
build/JVM/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/translators/MIPSApps.class
@echo -e "\n\033[1marchiving .class -> .jar: build/JVM/ibex.jar\033[0m"
build/$(platform)/org/ibex/plat/Java2.java.o: ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
build/$(platform)/org/ibex/plat/AWT.java.o: ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
-build/$(platform)/org/ibex/translators/MIPSApps.java.o: build/class/org/ibex/translators/MIPSApps.class
- @echo -e "\n\033[1mcompiling .class -> .o: $<\033[0m"
- mkdir -p `dirname $@`
- $(gcj) -Os -c $< -o $@
-
-build/$(platform)/%.java.o: build/java/%.java
+build/$(platform)/%.java.o: build/class/%.class
@echo -e "\n\033[1mcompiling .java -> .o: $<\033[0m"
mkdir -p `dirname $@`
- $(gcj) -c $< -o $@
+ $(gcj) -fCLASSPATH=build/class -c $< -o $@
+
+# FIXME detect subclasses of X11
+build/$(platform)/org/ibex/plat/Linux.cc.o: .install_WindowMaker-0.80.2_$(target)
+build/$(platform)/org/ibex/plat/Solaris.cc.o: .install_WindowMaker-0.80.2_$(target)
build/$(platform)/org/ibex/plat/$(platform).cc.o: src/org/ibex/plat/$(platform).cc src/org/ibex/plat/*.cc .configure_jpeg-6b_$(target)
@make $(java_headers)
upstream/install/$(target)/bin/ranlib $@
upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
-build/$(platform)/$(target_bin): build/$(platform)/org/ibex/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar build/$(platform)/org/ibex/plat/$(platform).java.o
+
+# note: binaries appear in a different order in the dependency line vs the link line
+build/$(platform)/$(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/org/ibex/plat/$(platform).cc.o
@echo -e "\n\033[1mlinking .o -> $(target_bin)\033[0m"
- mkdir -p build/$(platform)
- PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.ibex.Main -o $@ -Lupstream/install/$(target)/lib $^ $(link_flags)
+ make $(java_sources)
+ rm -rf build/pruned; mkdir -p build/pruned
+ javac -classpath lib/bcel-5.1.jar:build/class -d build/class src/org/ibex/util/BytecodePruner.java
+ rm -f build/$(platform)/ibex.jar
+ cd build/class; \
+ fastjar cf ../$(platform)/ibex.jar \
+ `find . -name \*.class | grep -v ibex/plat/` \
+ org/ibex/plat/$(platform)*.class \
+ org/ibex/plat/X11*.class \
+ org/ibex/plat/GCJ*.class \
+ org/ibex/plat/POSIX*.class
+ java -cp lib/bcel-5.1.jar:build/class org.ibex.util.BytecodePruner \
+ build/$(platform)/ibex.jar:upstream/install/share/java/libgcj-3.3.jar -o build/pruned
+# rm -rf out/java/awt
+# rm -f out/java/lang/*.*
+# rm -f out/java/lang/reflect/*
+# mkdir -p out/java/lang/ref
+# mkdir -p out/java/lang/reflect
+# cp upstream/gcc-3.3/src/libjava/java/lang/*.java out/java/lang/
+# cp upstream/gcc-3.3/src/libjava/java/lang/ref/*.java out/java/lang/ref/
+# cp upstream/gcc-3.3/src/libjava/java/lang/reflect/*.java out/java/lang/reflect/
+ rm -rf build/pruned/org/ibex/js/*; cp build/java/org/ibex/js/* build/pruned/org/ibex/js/
+ rm build/pruned/java/lang/System.class
+ cp upstream/gcc-3.3/src/libjava/java/lang/System.java build/pruned/java/lang/
+ cd build/pruned; \
+ for A in `find . -name \*.class -or -name \*.java`; do \
+ echo compiling $$A....; \
+ ../../upstream/install/bin/$(target)-gcj -w -c -fCLASSPATH=../../build/class $$A && \
+ (mkdir -p ../../build/$(platform)/`dirname $$A`; mv *.o ../../build/$(platform)/`dirname $$A`); \
+ done
+ rm -f build/$(platform)/ibex.a
+ cd upstream/gcc-3.3/build-$(target)/$(target)/libjava; \
+ $(shell pwd)/upstream/install/$(target)/bin/ar cq \
+ $(shell pwd)/build/$(platform)/ibex.a \
+ `find . -name nat\*.o` \
+ `find . -name \*.o -not -name '*[A-Z]*'` \
+ $(shell pwd)/build/$(platform)/org/ibex/plat/$(platform).cc.o \
+ `find $(shell pwd)/build/$(platform) -name \*.o`
+ PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj \
+ --main=org.ibex.plat.$(platform) \
+ -Lupstream/install/$(target)/lib \
+ -Lupstream/install/lib \
+ build/$(platform)/ibex.a \
+ upstream/jpeg-6b/build-$(target)/libjpeg.a \
+ $(link_flags) \
+ upstream/gcc-3.3/build-$(target)/$(target)/boehm-gc/.libs/libgcjgc.a \
+ -lz -ldl -lffi \
+ -o $@
+
### Builtin Resources ##############################################################################
builtin_src := $(shell find src/org/ibex/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/VeraMono.ttf
- cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraSe.ttf
+ cd build/res/fonts/vera; ln -fs ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
+ cd build/res/fonts/vera; ln -fs ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraMono.ttf
+ 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 $(^:build/res/%=%)
current_build := $(shell cat next.build)
strip_$(platform) := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o
strip_JVM := cp build/$(platform)/$(target_bin)
-install-dist:; $(strip_$(platform)) /var/www/master.dist.ibex.org/ibex-$(current_build).$(target_bin_extension).unsigned
+install-dist:; $(strip_$(platform)) /var/www/org/xwt/dist/master/ibex-$(current_build).$(target_bin_extension).unsigned
dist: compile
(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 -e "\n\n\n*** DONE ******************************************"
propose-patch:
- darcs push -s -A $(USER)@xwt.org -T patches@xwt.org
+ @darcs push --and-apply --edit-description -o .darcspatch -T patches@xwt.org http://darcs.ibex.org/ibex/
+ @(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";\
+ echo;\
+ cat .darcspatch) | /usr/sbin/sendmail -bm -f $(USER)@xwt.org patches@xwt.org;
+ @rm .darcspatch
projects / org.ibex.core.git / blobdiff