diff -Ncr fuse-j-2.2.3/build.conf fuse-j-2.2.3-mod/build.conf *** fuse-j-2.2.3/build.conf 2005-05-18 07:38:54.000000000 -0400 --- fuse-j-2.2.3-mod/build.conf 2005-10-06 21:22:20.000000000 -0400 *************** *** 4,6 **** --- 4,10 ---- # FUSE library & headers base directory FUSE_HOME=/usr/local + + # define to use GCJ + GCJ=1 + Binary files fuse-j-2.2.3/fusetest and fuse-j-2.2.3-mod/fusetest differ diff -Ncr fuse-j-2.2.3/jni/javafs.c fuse-j-2.2.3-mod/jni/javafs.c *** fuse-j-2.2.3/jni/javafs.c 2005-04-20 05:12:41.000000000 -0400 --- fuse-j-2.2.3-mod/jni/javafs.c 2005-10-06 21:19:24.000000000 -0400 *************** *** 985,996 **** fuseArgv[i + 1] = fuseArg; } ! /* printf("%d fuse arguments:", fuseArgc); for (i = 0; i < fuseArgc; i++) printf(" %s", fuseArgv[i]); printf("\n"); ! */ if (alloc_classes(env)) { --- 985,996 ---- fuseArgv[i + 1] = fuseArg; } ! #if 0 printf("%d fuse arguments:", fuseArgc); for (i = 0; i < fuseArgc; i++) printf(" %s", fuseArgv[i]); printf("\n"); ! #endif if (alloc_classes(env)) { diff -Ncr fuse-j-2.2.3/jni/Makefile fuse-j-2.2.3-mod/jni/Makefile *** fuse-j-2.2.3/jni/Makefile 2005-05-18 09:30:19.000000000 -0400 --- fuse-j-2.2.3-mod/jni/Makefile 2005-10-06 20:54:14.000000000 -0400 *************** *** 7,26 **** HDRS := javafs.h javafs_bindings.h LIB_SO := libjavafs.so INCLUDES := -I${FUSE_HOME}/include -I${JDK_HOME}/include -I${JDK_HOME}/include/linux ! LDPATH := ${LDPATH} -L${FUSE_HOME}/lib all: ${LIB_SO} ${LIB_SO}: ${OBJS} ! gcc -fPIC -shared -o ${LIB_SO} ${LDPATH} -ljvm -lfuse ${OBJS} -lpthread # ${FUSE_HOME}/lib/libfuse.a .c.o: ${SRCS} ${HDRS} ! gcc -fPIC -c ${INCLUDES} -D_FILE_OFFSET_BITS=64 $< -o $@ clean: rm -f ${LIB_SO} ${OBJS} --- 7,35 ---- HDRS := javafs.h javafs_bindings.h LIB_SO := libjavafs.so + ifdef GCJ + COPT := -g + FJNI := -fjni + INCLUDES := + LIBS := -lfuse -lgcj + LDPATH := + else INCLUDES := -I${FUSE_HOME}/include -I${JDK_HOME}/include -I${JDK_HOME}/include/linux ! LIBS := -ljvm -lfuse -lpthread LDPATH := ${LDPATH} -L${FUSE_HOME}/lib + endif all: ${LIB_SO} ${LIB_SO}: ${OBJS} ! gcc ${COPT} ${FJNI} -fPIC -shared -o ${LIB_SO} ${LDPATH} ${OBJS} ${LIBS} ! # gcc -fPIC -shared -o ${LIB_SO} ${LDPATH} ${OBJS} -ljvm -lfuse -lpthread # ${FUSE_HOME}/lib/libfuse.a .c.o: ${SRCS} ${HDRS} ! gcc ${COPT} -fPIC -c ${INCLUDES} -D_FILE_OFFSET_BITS=64 $< -o $@ clean: rm -f ${LIB_SO} ${OBJS} diff -Ncr fuse-j-2.2.3/Makefile fuse-j-2.2.3-mod/Makefile *** fuse-j-2.2.3/Makefile 2005-05-18 05:41:14.000000000 -0400 --- fuse-j-2.2.3-mod/Makefile 2005-10-06 21:46:23.000000000 -0400 *************** *** 1,8 **** include build.conf ! JAVAC := ${JDK_HOME}/bin/javac JAVA := ${JDK_HOME}/bin/java JAVASRC := $(shell find src -name '*.java') JNI_BINDINGS_H := jni/javafs_bindings.h --- 1,16 ---- include build.conf ! ifdef GCJ ! JAVAC := gcj -C --classpath=src ! JAVA := gij ! GCJMAIN := fuse.zipfs.ZipFilesystem ! TARGETS := java_all jni_all gcj_all ! else ! JAVAC := ${JDK_HOME}/bin/javac -Xlint -source 1.4 JAVA := ${JDK_HOME}/bin/java + TARGETS := java_all jni_all + endif JAVASRC := $(shell find src -name '*.java') JNI_BINDINGS_H := jni/javafs_bindings.h *************** *** 12,18 **** .PHONY: all java_all jni_all clean java_clean jni_clean ! all: java_all jni_all @echo "" @echo "FUSE-J is built." @echo "" --- 20,26 ---- .PHONY: all java_all jni_all clean java_clean jni_clean ! all: ${TARGETS} @echo "" @echo "FUSE-J is built." @echo "" *************** *** 23,33 **** # Java part java_all: ${JAVASRC} ! ${JAVAC} -Xlint -source 1.4 -d build ${JAVASRC} ! java_clean: ! rm -rf build/* # JNI part --- 31,43 ---- # Java part java_all: ${JAVASRC} ! ${JAVAC} -d build ${JAVASRC} ! gcj_all: ${JAVASRC} ! gcj --classpath=src -fjni -Wl,$(shell pwd)/jni/libjavafs.so -o fusefs --main=${GCJMAIN} ${JAVASRC} + java_clean: + rm -rf build/* fusefs # JNI part diff -Ncr fuse-j-2.2.3/zipfs_gcj.sh fuse-j-2.2.3-mod/zipfs_gcj.sh *** fuse-j-2.2.3/zipfs_gcj.sh 1969-12-31 19:00:00.000000000 -0500 --- fuse-j-2.2.3-mod/zipfs_gcj.sh 2005-10-06 21:29:15.000000000 -0400 *************** *** 0 **** --- 1,7 ---- + #!/bin/sh + + # Usage: ./zipfs_gcj.sh file.zip /mount/point + + . ./build.conf + + LD_LIBRARY_PATH=./jni:$FUSE_HOME/lib ./fusefs -f -s $2 $1