Changeset 2855 for XerialJ/trunk/sqlite-jdbc/sqlitejdbc

Timestamp:

01/19/09 12:09:41 (3 years ago)

Author:

leo

Message:

removed unnecessary sources and modified Makefiles

Location:

XerialJ/trunk/sqlite-jdbc/sqlitejdbc

Files:

• Makefile (modified) (3 diffs)
• Makefile.common (modified) (1 diff)
• Makefile.nested (modified) (2 diffs)
• src (deleted)

XerialJ/trunk/sqlite-jdbc/sqlitejdbc/Makefile

@@ -18 +18 @@
 include Makefile.common
 
+SRC_FOLDER=../src/main/java/org/sqlite/
+
 default: test
 
@@ -34 +36 @@
         $(JAVAH) -classpath build -jni -o build/NativeDB.h org.sqlite.NativeDB
         $(CC) $(CFLAGS) -c -o build/$(target)/NativeDB.o \
-                src/org/sqlite/NativeDB.c
+                ../src/main/java/org/sqlite/NativeDB.c
         $(CC) $(CFLAGS) $(LINKFLAGS) -o build/$(target)/$(LIBNAME) \
                 build/$(target)/NativeDB.o build/$(sqlite)-$(target)/*.o
@@ -52 +54 @@
             -DSQLITE_OMIT_LOAD_EXTENSION sqlite3.c)
 
-build/org/%.class: src/org/%.java
+build/org/sqlite/%.class: ../src/main/java/org/sqlite/%.java
         @mkdir -p build
-        $(JAVAC) -source 1.2 -target 1.2 -sourcepath src -d build $<
+        $(JAVAC) -source 1.2 -target 1.2 -sourcepath ../src/main/java -d build $<
 
-build/test/%.class: src/test/%.java
-        @mkdir -p build
+build/test/org/sqlite/%.class: ../src/test/java/org/sqlite/%.java
+        @mkdir -p build/test
         $(JAVAC) -target 1.5 -classpath "build$(sep)$(libjunit)" \
-            -sourcepath src/test -d build $<
+            -sourcepath ../src/test/java -d build/test $<
 
 dl/$(sqlite)-amal.zip:

XerialJ/trunk/sqlite-jdbc/sqlitejdbc/Makefile.common

@@ -47 +47 @@
 JAVAH := "$$JAVA_HOME/bin/javah"
 
-java_sources = $(wildcard src/org/sqlite/*.java)
-java_classes = $(java_sources:src/%.java=build/%.class)
+java_sources = $(wildcard ../src/main/java/org/sqlite/*.java)
+java_classes = $(java_sources:../src/main/java/org/sqlite/%.java=build/org/sqlite/%.class)
 native_classes = $(filter-out %NestedDB.class,$(java_classes))
 java_classlist = $(subst $$,\$$,$(patsubst build/%, %, $(wildcard $(java_classes:%.class=%*))))
-test_sources = $(wildcard src/test/*.java)
-test_classes = $(test_sources:src/%.java=build/%.class)
-tests        = $(subst /,.,$(patsubst build/%.class,%,$(test_classes)))
+test_sources = $(wildcard ../src/test/java/org/sqlite/*.java)
+test_classes = $(test_sources:../src/test/java/org/sqlite/%.java=build/test/org/sqlite/%.class)
+tests        = $(subst /,.,$(patsubst build/test/org/sqlite/%.class,org/sqlite/%,$(test_classes)))
 
 target     := $(os)-$(arch)

XerialJ/trunk/sqlite-jdbc/sqlitejdbc/Makefile.nested

@@ -16 +16 @@
             -C ../$(nestedvm)/build org/ibex
 
-build/org/%.class: ../src/main/java/org/sqlite/%.java
+build/org/sqlite/%.class: ../src/main/java/org/sqlite/%.java
         @mkdir -p build
         $(JAVAC) -source 1.2 -target 1.2 -classpath "$(nestedvm)/build" \
-            -sourcepath src -d build $<
+            -sourcepath ../src/main/java -d build $<
 
-build/test/%.class: src/test/%.java
+build/test/org/sqlite/%.class: ../src/test/java/org/sqlite/%.java
         @mkdir -p build
         $(JAVAC) -target 1.5 -classpath "build$(sep)$(libjunit)" \
-            -sourcepath src/test -d build $<
+            -sourcepath ../src/test/java -d build/test $<
 
 $(nestedvm)/%:
@@ -47 +47 @@
         @mkdir -p build/$(sqlite)-nestedvm
         unzip -qo dl/$(sqlite)-amal.zip -d build/$(sqlite)-nestedvm
-        cp src/org/sqlite/Nested*.c build/$(sqlite)-nestedvm
+        cp ../src/main/java/org/sqlite/Nested*.c build/$(sqlite)-nestedvm
         perl -pi -e "s/sqlite3_api;/sqlite3_api = 0;/g" \
             build/$(sqlite)-nestedvm/sqlite3ext.h