-#
+#############################################################################
+#
# The XWT Makefile
+
#
-## Configurables ###########################################################################
-
-jpeg_headers := jpeglib.h jconfig.h jmorecfg.h jerror.h jinclude.h jpegint.h jchuff.h jdhuff.h jdct.h jmemsys.h jversion.h
-jpeg_c_sources := jdapimin.c jdapistd.c jcomapi.c jcparam.c jdmaster.c jdinput.c jdmainct.c jdcoefct.c jdpostct.c jdmarker.c
-jpeg_c_sources += jdhuff.c jdphuff.c jddctmgr.c jidctint.c jidctfst.c jidctflt.c jidctred.c jdsample.c jdcolor.c jdmerge.c
-jpeg_c_sources += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c
-
-# inputs
-java_pp_sources := $(shell find src -name \*.java.pp)
-java_pp_postproc := $(java_pp_sources:src/%.java.pp=bin/%.java)
-java_generated_sources := $(java_pp_postproc) bin/org/xwt/imp/Freetype.java
-java_sources := $(shell find src -name \*.java)
-java_headers := $(java_sources:src/%.java=bin/%.h) $(java_generated_sources:bin/%.java=bin/%.h)
-xwar_sources := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
-cc_sources := src/org/xwt/plat/$(platform).cc
-c_sources := $(jpeg_c_sources:%.c=src/org/ijg/%.c)
-
-# freetype inputs
-freetype_base_sources := ftsystem.c ftmm.c ftbbox.c ftinit.c ftdebug.c ftbase.c ftglyph.c
-freetype_other_sources := smooth/smooth.c autohint/autohint.c sfnt/sfnt.c truetype/truetype.c
-freetype_sources := $(freetype_base_sources:%=gcc/src/freetype-2.1.4/src/base/%)
-freetype_sources += $(freetype_other_sources:%=gcc/src/freetype-2.1.4/src/%)
-
-# outputs
-java_objects := $(filter-out bin-$(platform)/org/xwt/plat/%, $(java_sources:src/%.java=bin-$(platform)/%.java.o))
-java_objects += $(filter-out bin-$(platform)/org/xwt/plat/%, $(java_generated_sources:bin/%.java=bin-$(platform)/%.java.o))
-java_objects += bin-$(platform)/org/xwt/plat/GCJ.java.o
-java_objects += $(platform_java_sources:%=bin-$(platform)/org/xwt/plat/%.java.o)
-cc_objects := $(cc_sources:src/%.cc=bin-$(platform)/%.cc.o)
-c_objects := $(c_sources:src/%.c=bin-$(platform)/%.c.o)
-
-# tools
-gcc_path := $(shell pwd)/gcc/install
-#gcc_optimizations := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions
-#gcc_optimzations += -funroll-loops -ffunction-sections -fdata-sections
+all: JVM Linux Win32 Darwin Solaris
+
+clean:
+ rm -rf .jikes .configure* .install* build .compile .build*
+ find upstream -name config.cache -exec rm {} \;
+
+JVM: build/JVM/xwt.jar
+Linux: ; make gcj platform=Linux target=i686-pc-linux-gnu link_flags="-lX11 -lXext"
+Solaris: ; make gcj platform=Solaris target=sparc-sun-solaris2.7 link_flags="-lX11 -lXext"
+Win32: ; make gcj platform=Win32 target=i686-pc-mingw32 link_flags="-Wl,--subsystem,windows -lcomdlg32" target_bin=xwt.exe
+Darwin: ; make gcj platform=Darwin target=powerpc-apple-darwin link_flags="$(darwin_linker_flags)"
+
+# default
+platform := JVM
+
+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
+darwin_linker_flags += -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:$(darwin_libdir)/libGL.dylib
+darwin_linker_flags += -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib:$(darwin_libdir)/libGLU.dylib
+darwin_linker_flags += -lSystem.B -lmathCommon.A -lGL -lGLU
+
+
+#############################################################################
+# Configurables:
+#
+target_bin := xwt.$(shell echo $(platform) | tr A-Z a-z)
+jikes_flags := -nowarn -sourcepath src/
gcc_optimizations := -O2
-debug :=
-gcc_flags := $(gcc_optimizations) $(debug) -Isrc/org/ijg
-gcj_flags := -fCLASSPATH=src
-gcj := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
-g++ := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
-gcc := $(gcc_path)/bin/$(target)-gcc $(gcc_flags)
-gcjh := $(gcc_path)/bin/$(target)-gcjh
-
-as := $(gcc_path)/$(target)/bin/as
-ar := $(gcc_path)/$(target)/bin/ar
-ranlib := $(gcc_path)/$(target)/bin/ranlib
-strip := $(gcc_path)/$(target)/bin/strip
+#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)/
+gcj_flags := -fCLASSPATH=build/java
+gcj := upstream/install/bin/$(target)-gcj $(gcc_flags) $(gcj_flags)
+gcjh := $(shell test -e `pwd`/upstream/install/bin/$(target)-gcjh && echo `pwd`/upstream/install/bin/$(target)-gcjh || echo `pwd`/upstream/install/bin/gcjh)
+g++ := upstream/install/bin/$(target)-gcj $(gcc_flags)
+gcc := upstream/install/bin/$(target)-gcc $(gcc_flags)
jar := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
-# path
-PATH := jikes-1.18/bin:$(PATH)
-
-# path
-PATH := jikes-1.18/bin:$(PATH)
-
-
-## Platform-Neutral ###########################################################################
-
-ifneq ($(verbose),true)
-.SILENT: $(cc_objects) $(java_objects) $(java_headers) all bin/org/xwt/builtin.xwar $(target_bin) compile
-silent := --silent
-endif
-
-compile: .javac $(java_generated_sources) bin/org/xwt/builtin.xwar
- echo "compiling .java -> .class: [all]"
- mkdir -p bin
- $(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) $(java_generated_sources) -d bin/ 2>&1 | \
- grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling .java -> .class: src/_"
-
-bin/%.class: src/%.java .javac
- @echo "compiling .java -> .class: $<"
- @mkdir -p bin
- @$(shell cat .javac) -classpath lib/libgcj-minimal.jar $< -d bin/ 2>&1 | \
- grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling .java -> .class: src/_"
-
-$(java_pp_postproc): bin/%.java: src/%.java.pp bin/org/xwt/util/Preprocessor.class
- @echo "preprocessing .java.pp -> .java: $<"
- @mkdir -p `dirname $@`
- @java -cp bin org.xwt.util.Preprocessor < $< > $@
-
-# platforms
-all: Win32 Linux Java2 #Solaris
-
-.javac:
- @if \
- type jikes && (jikes --version | grep "Version 1.18"); \
- then \
- echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java; \
- echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }" >> GetBootClassPath.java; \
- javac GetBootClassPath.java; \
- java -cp . GetBootClassPath > .bootclasspath; \
- rm GetBootClassPath.*; \
- echo -n "jikes -verbose -nowarn -sourcepath src/ -bootclasspath " > .javac; \
- cat .bootclasspath >> .javac; \
- else \
- echo "WARNING: You do not have jikes; falling back to javac. Compiles will be very slow."; \
- echo javac > .javac; \
- fi
-
-jikes:
- curl ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2 | tar xjvf -
- cd jikes-1.18; ./configure --prefix=`pwd` && make && make install
- ln -sf jikes-1.18/bin/jikes .jikes
-
-bin/org/xwt/builtin.xwar: $(xwar_sources)
- mkdir -p bin/org/xwt
- cd src; $(jar) cf ../bin/org/xwt/builtin.xwar $(xwar_sources:src/%=%)
+include Makefile.upstream
-clean:
- rm -rf bin-* bin
- find . -name \*~ | xargs rm -f
- find . -name \#\*\# | xargs rm -f
+# figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
+all_java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java'))
+all_java_sources += $(patsubst src/%.java.pp, build/java/%.java, $(shell find src -name '*.java.pp'))
+
+java_sources := $(all_java_sources)
+nonplat_java_sources := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources))
+plat_java_sources := $(filter build/java/org/xwt/plat/%, $(all_java_sources))
+
+# FIXME: must have a relitavely new GNU sed... Apple sed fails silently (why?)
+build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+build/cc/%.cc: src/%.c ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+build/c/jpeg/%.c: upstream/jpeg-6b/src/%.c
+ @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+build/res/%: src/% ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+
+build/java/%.java: src/%.java.pp
+ make build/class/org/xwt/util/Preprocessor.class
+ @echo -e "\n\033[1mpreprocessing .java.pp -> .java: $<\033[0m"
+ mkdir -p `dirname $@`
+ rm -f $@
+ java -cp build/class org.xwt.util.Preprocessor < $< > $@
+
+build/class/%.class: build/java/%.java .jikes
+ @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m"
+ mkdir -p build/class
+ ./.jikes $<
+
+# this forces a clean build every time because jikes is so damn buggy
+compile: .compile
+.compile: $(all_java_sources) .jikes
+ @echo -e "\n\033[1mcompiling .java -> .class: src/**/*.java\033[0m"
+ rm -rf build/class
+ mkdir -p build/class
+ @./.jikes $(all_java_sources)
+ touch .compile
+
+# PHASE 4: gcj-generated headers
+java_headers := $(all_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
+ @echo -e "\n\033[1mextracting .class -> .h: $<\033[0m"
+ mkdir -p `dirname $@`
+ ls `echo $< | sed s/.class\$$//`*.class |\
+ sed s_build/class/__ | sed s/.class\$$//g | sed s_/_._g | (cd build/class; xargs $(gcjh) -d ../h --classpath .)
+
+# a hack since we've disabled gcj's awt implementation
+build/$(platform)/org/xwt/plat/Java2.java.o:
+ touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
+build/$(platform)/org/xwt/plat/AWT.java.o:
+ touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
+
+build/$(platform)/%.java.o: build/java/%.java
+ @echo -e "\n\033[1mcompiling .java -> .o: $<\033[0m"
+ mkdir -p `dirname $@`
+ $(gcj) -c $< -o $@
+
+headers: $(java_headers)
+
+build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/$(platform).cc src/org/xwt/plat/*.cc .configure_jpeg-6b_$(target)
+ @make headers
+ @echo -e "\n\033[1mcompiling .cc -> .o: $<\033[0m"
+ mkdir -p `dirname $@`
+ $(g++) -Iupstream/install/lib/gcc-lib/$(target)/3.3/include/ -Iupstream/install/$(target)/include -I/usr/X11R6/include/ -Ibuild/h -Wno-multichar -Iupstream/install/include -c $< -o $@
+
+build/$(platform)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c
+ @echo -e "\n\033[1mcompiling .c -> .o: $<\033[0m"
+ mkdir -p `dirname $@`
+ $(gcc) -Ibuild/h -c $< -o $@
+
+# PHASE 5: linking
+# FIXME use libjpeg
+jpeg_sources := jdapimin.c jdapistd.c jcomapi.c jcparam.c jdmaster.c jdinput.c jdmainct.c jdcoefct.c jdpostct.c jdmarker.c
+jpeg_sources += jdhuff.c jdphuff.c jddctmgr.c jidctint.c jidctfst.c jidctflt.c jidctred.c jdsample.c jdcolor.c jdmerge.c
+jpeg_sources += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c
+
+upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
+java_objects := $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
+
+build/$(platform)/$(platform).ar: $(java_objects) $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
+ @echo -e "\n\033[1marchiving .o -> .a\033[0m"
+ mkdir -p build/$(platform)
+ upstream/install/$(target)/bin/ar rc $@ $?
+ upstream/install/$(target)/bin/ranlib $@
+
+$(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
+ @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 build/$(platform)/$(target_bin) -Lupstream/install/$(target)/lib build/$(platform)/org/xwt/plat/$(platform).java.o $^ $(link_flags)
+
+
+##############################################################################
+# Special treatment:
+#
+
+builtin_src := $(shell find src/org/xwt/builtin -name '*.*')
+build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/freetype.mips build/res/libmspack.mips
+ @echo -e "\n\033[1mzipping res/* -> .jar: builtin.jar\033[0m"
+ cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
+
+build/$(platform)/builtin.o: build/res/builtin.jar
+ @echo -e "\n\033[1mwrapping .jar -> .o: resources.o\033[0m"
+ @(echo "unsigned int builtin_length = "; \
+ (wc -c build/res/builtin.jar | sed "s_build.*__"); \
+ echo \;; \
+ echo "unsigned char builtin_bytes[] = {"; \
+ hexdump -ve '"0x" 1/1 "%x,\n"' build/res/builtin.jar; \
+ echo "};") > .builtin.c
+ $(gcc) -c .builtin.c -o build/$(platform)/builtin.o
+
+# compile is here to force compilation of the .class files (they get used via -Ibuild) without
+# having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes)
+gcj: .vendor .compile .install_gcc-3.3_$(target) $(target_bin)
+
+build/JVM/xwt.jar: .compile build/res/builtin.jar
+ @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`;
+
+
+
+##############################################################################
+# Freetype
+#
+
+build/mips/%.c.o: src/%.c
+ make .install_freetype-2.1.4_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 -I upstream/freetype-2.1.4/src/include -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
+ make .install_freetype-2.1.4_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 \
+ -nostdlib \
+ --static \
+ -march=mips1 \
+ -T src/org/xwt/mips/linker.ld \
+ -Lbuild/mips \
+ -Lupstream/freetype-2.1.4/src/objs \
+ -o $@ \
+ build/mips/org/xwt/translators/Freetype.c.o \
+ --strip \
+ -lfreetype
+
+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
+ 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 \
+ -nostdlib \
+ --static \
+ -march=mips1 \
+ -T src/org/xwt/mips/linker.ld \
+ -Lbuild/mips \
+ -Lupstream/libmspack-20030726/build-mips-unknown-elf/ \
+ -o $@ \
+ build/mips/org/xwt/translators/MSPack.c.o \
+ --strip \
+ -lmspack
+
+
+
+
+##############################################################################
+# Maintainer stuff: generating numbered builds, proposing patches
+#
update-build:
cvs tag -F xwt-$(current_build)
) > .message
bash -c "cat .message > /dev/tcp/mail.xwt.org/25" # /dev/tcp is faked by bash; not part of the os
-## GCJ-Derived Platforms #######################################################################
-
-# if the user doesn't change gcc_path, and it's not built, then we'll try to build it
-$(shell pwd)/gcc/install/bin/$(target)-gcj: .upstream
- make -C gcc
-
-gcc/src/.freetype:
- mkdir -p gcc/src
- curl http://umn.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.4.tar.gz | tar xvzf - -C gcc/src
- cd gcc/src; patch -p0 < freetype.patch
- touch gcc/src/.freetype
-
-freetype.mips: gcc/src/.freetype
- make -C gcc mips target=mips
- $(gcc_path)/bin/mips-gcc \
- --static \
- -mabi=o32 \
- -mips1 \
- -msoft-float \
- -o $@ \
- -I gcc/src/freetype-2.1.4/include \
- $(freetype_sources) \
- -Wl,--warn-once \
- src/org/xwt/imp/Freetype.c \
- $(gcc_path)/mips/lib/libc.a \
- -Wl,-s,-T,$(gcc_path)/mips/lib/nullmon.ld
-
-bin/org/xwt/imp/Freetype.java: freetype.mips bin/org/xwt/imp/MIPS.class
- @echo "translating .mips -> .java: $<"
- @java -cp bin org.xwt.imp.MIPS org.xwt.imp.Freetype freetype.mips > bin/org/xwt/imp/Freetype.java
-
-# compile is here to force compilation of the .class files (they get used via -Ibin/) without
-# having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes)
-gcj: $(gcc_path)/bin/$(target)-gcj compile $(target_bin)
-
-$(target_bin): $(java_objects) $(cc_objects) $(c_objects) bin-$(platform)/org/xwt/builtin.o
- @echo "linking .o -> $(target_bin)"
- $(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ $(platform_link)
-
-bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
- @echo "wrapping .xwar -> .o: bin/org/xwt/builtin.o"
- @(echo "unsigned int builtin_xwar_length = ";\
- (wc -c bin/org/xwt/builtin.xwar | sed "s_bin.*__");\
- echo \;;\
- echo "unsigned char builtin_xwar[] = {";\
- hexdump -ve '"0x" 1/1 "%x,\n"' bin/org/xwt/builtin.xwar;\
- echo "};") > .builtin.c
- $(gcc) -c .builtin.c -o bin-$(platform)/org/xwt/builtin.o
-
-$(java_headers): bin/%.h: bin/%.class
- @echo "extracting .class -> .h: $<"
- cd bin; find `echo $< | sed s/.class$$// | sed s_^bin/__ `*.class |\
- sed s_/_._g | sed s/.class$$// | sed s/.java$$// |\
- xargs $(gcjh) --classpath .
-
-$(java_objects): bin-$(platform)/%.java.o: src/%.java
- @echo "compiling .java -> .o: $<"
- mkdir -p `dirname $@`
- $(gcj) -c $< -o $@
-
-# unpack and patch the ijg library
-src/org/ijg/jmorecfg.h: src/org/ijg/jpegsrc.v6b.tar.gz src/org/ijg/jmorecfg.h.patch
- cd src/org/ijg/; tar xzf jpegsrc.v6b.tar.gz
- cd src/org/ijg/jpeg-6b; ./configure --target=$(target)
- cd src/org/ijg/jpeg-6b; mv $(jpeg_c_sources) $(jpeg_headers) ..
- cd src/org/ijg; patch -l -p0 < jmorecfg.h.patch
- rm -rf src/org/ijg/jpeg-6b
-
-$(cc_objects): bin-$(platform)/%.cc.o: src/%.cc $(java_headers) src/org/ijg/jmorecfg.h
- @echo "compiling .cc -> .o: $<"
- @mkdir -p `dirname $@`
- $(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibin -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@
-
-$(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
- @echo "compiling .c -> .o: $<"
- @mkdir -p `dirname $@`
- $(gcc) -Ibin -c $< -o $@
-
-.upstream:
- mkdir -p gcc/install; curl http://www.megacz.com/upstream.tgz | tar xvzhf - -C gcc/install
- touch .upstream
-
-
-## Platforms ##############################################################################
-
-Linux:
- echo -e "\\n=== Linux ========================================="
- make gcj \
- platform=Linux \
- target=i686-pc-linux-gnu \
- target_bin=xwt.linux \
- platform_link="-L$(gcc_path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" \
- platform_java_sources="POSIX X11"
-
-Solaris:
- echo -e "\\n=== Solaris ========================================="
- make gcj \
- platform=Solaris \
- target=sparc-sun-solaris2.7 \
- target_bin=xwt.solaris \
- platform_link="-L$(gcc_path)/lib -lX11 -lXext" \
- platform_java_sources="POSIX X11"
-
-Win32:
- echo -e "\\n=== Win32 ========================================="
- make gcj \
- platform=Win32 \
- target=i686-pc-mingw32 \
- target_bin=xwt.exe \
- platform_link="-Wl,--subsystem,windows -lcomdlg32" \
- platform_java_sources="Win32"
-
-Darwin:
- echo -e "\\n=== Darwin ========================================="
- ranlib upstream/Darwin/lib/*.a
- ar x /usr/lib/libcc_dynamic.a upstream/Darwin/lib/darwin-fpsave.o
- make gcj \
- platform=Darwin \
- target=powerpc-apple-darwin \
- target_bin=xwt.darwin \
- platform_link="upstream/Darwin/lib/*.[oa] $(gcc_path)/lib/libgcj.a" \
- platform_java_sources="POSIX X11"
-
-Carbon:
- echo -e "\\n=== Carbon ========================================="
- make gcj \
- platform=Carbon \
- target=powerpc-apple-darwin \
- target_bin=xwt.carbon \
- platform_link="$(gcc_path)/lib/libgcj.a -Xlinker -framework -Xlinker Carbon" \
- platform_java_sources="POSIX Carbon"
-
-Java2: compile bin/org/xwt/builtin.xwar
- echo -e "\\n=== Java2 ========================================="
- echo "archiving .class -> .jar"
- mkdir -p bin-Java2
- echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > bin/.manifest
- cd bin; $(jar) cvfm ../bin-Java2/xwt.jar .manifest \
- org/xwt/builtin.xwar \
- `find . -name \*.class | grep -v org/xwt/plat/` \
- org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class | tr \\012 \\015
- echo
-
-PalmOS:
- echo "PalmOS is not yet supported"
- false
-
-
-## master.dist.xwt.org ############################################################################
-
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))
# pre-depend on compile as a sanity check
dist: compile
- # this will fail if we haven't checked-in since the comment is null; we want this.
- cvs commit -m '' > /dev/null
- cvs tag -F xwt-$(current_build)
-
echo "***********************************************************"
echo "* This build is $(current_build)"
echo "***********************************************************"
tail -n 200 .make-dist.out | \
mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
else
- echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt\n date=`date +%d-%b-%H%M`\n mkdir xwt-$$date\n cd xwt-$$date\n /usr/bin/cvs -d /cvs co $(this_branch_flag) xwt\n mv xwt/* .\n mv xwt/.* .\n rmdir xwt\n touch .make-dist.out\n nohup make dist &> /dev/null &\n echo\n cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
- endif
+ # this will fail if we haven't checked-in since the comment is null; we want this.
+ cvs commit -m '' > /dev/null
+ cvs tag -F xwt-$(current_build)
+# echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt\n date=`date +%d-%b-%H%M`\n mkdir xwt-$$date\n cd xwt-$$date\n /usr/bin/cvs -d /cvs co $(this_branch_flag) xwt\n mv xwt/* .\n mv xwt/.* .\n rmdir xwt\n touch .make-dist.out\n nohup make dist &\n echo\n cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
+ echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt/dist\n/usr/bin/cvs update $(this_branch_flag)\ntouch .make-dist.out\n make clean\n nohup make dist &\n' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
+ endif
dist-private:
make $(silent) update-build
- # preserve gcc across builds so we don't have to remake it
- mkdir -p $(HOME)/dist.xwt.org-gcc
- mv gcc gcc-
- ln -s $(HOME)/dist.xwt.org-gcc gcc
- mv -f gcc-/Makefile gcc/
- mv -f gcc-/*.patch gcc/
-
# build it
nice -n 19 make all
echo === master.dist.xwt.org ==================================
echo "copying xwt.jar to distribution area..."
- cp bin-Java2/xwt.jar /var/www/master.dist.xwt.org/xwt-$(current_build).jar.unsigned
+ cp build/JVM/xwt.jar /var/www/master.dist.xwt.org/xwt-$(current_build).jar.unsigned
echo "stripping xwt.exe and copying it to the distribution area..."
- $(strip) bin-Win32/xwt.exe -o /var/www/master.dist.xwt.org/xwt-$(current_build).exe.unsigned
+ upstream/install/i686-pc-mingw32/bin/strip build/Win32/xwt.exe \
+ -o /var/www/master.dist.xwt.org/xwt-$(current_build).exe.unsigned
echo "copying xwt.linux to distribution area..."
- $(strip) bin-Linux/xwt.linux -o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
+ upstream/install/i686-pc-linux-gnu/bin/strip build/Linux/xwt.linux \
+ -o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
+
+# echo "copying xwt.solaris to distribution area..."
+# upstream/install/sparc-sun-solaris2.7/bin/strip build/Solaris/xwt.solaris \
+# -o /var/www/master.dist.xwt.org/xwt-$(current_build).solaris.unsigned
+
+ echo "copying xwt.darwin to distribution area..."
+ upstream/install/powerpc-apple-darwin/bin/strip build/Darwin/xwt.darwin \
+ -o /var/www/master.dist.xwt.org/xwt-$(current_build).darwin.unsigned
echo "creating source tarball in distribution area..."
CVSROOT=/cvs cvs export -r xwt-$(current_build) xwt
projects / org.ibex.core.git / blobdiff