modified the Makefile

git-svn-id: http://www.xerial.org/svn/project/XerialJ/trunk/sqlite-jdbc@2519 ae02f08e-27ec-0310-ae8c-8ba02fe2eafd

diff --git a/Makefile b/Makefile
index 7d85126..27a2ce0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 # use JDK1.5 to build native libraries\r
 \r
+include Makefile.version\r
+\r
 #CURRENT_DIR = $(shell cygpath -w `pwd`)\r
 RESOURCE_DIR = src/main/resources\r
 \r
@@ -44,15 +46,17 @@ OSInfoClass=org/xerial/db/sql/sqlite/OSInfo
 target/sqlitejdbc/$(OSInfoClass).class:\r
        mkdir -p target/sqlitejdbc\r
        javac src/main/java/$(OSInfoClass).java -d target/sqlitejdbc\r
-       \r
 \r
 sqlitejdbc/build/$(target)/$(LIBNAME): \r
        cd sqlitejdbc && make native \r
 \r
+sqlitejdbc/build/$(sqlite)-$(target):\r
+       cd sqlitejdbc && make native\r
+\r
 LIB_FOLDER = $(RESOURCE_DIR)/native/$(shell java -cp target/sqlitejdbc org.xerial.db.sql.sqlite.OSInfo)\r
 \r
 #native: sqlitejdbc/build/$(target)/$(LIBNAME) target/sqlitejdbc/$(OSInfoClass).class\r
-native: target/sqlitejdbc/$(OSInfoClass).class\r
+native: sqlitejdbc/build/$(sqlite)-$(target) sqlitejdbc/build/$(target)/$(LIBNAME) target/sqlitejdbc/$(OSInfoClass).class\r
        mkdir -p $(LIB_FOLDER)\r
        cp sqlitejdbc/build/$(target)/$(LIBNAME) $(LIB_FOLDER) \r
        mvn package\r

diff --git a/Makefile.package b/Makefile.package
index 3846cc5..95e5d74 100644 (file)
--- a/Makefile.package
+++ b/Makefile.package
@@ -1,7 +1,7 @@
-RESOURCE_DIR=src/main/resources/native\r
+RESOURCE_DIR=src/main/resources\r
+NATIVE_DIR=$(RESOURCE_DIR)/native\r
 RSYNC=rsync -av -e ssh --exclude=".svn"\r
 \r
-\r
 WIN_SERVER=192.168.11.7\r
 WIN_WORK=work/eclipse/workspace/xerial/sqlite-jdbc\r
 \r
@@ -14,21 +14,28 @@ LINUX_WORK=work/eclipse/xerial/sqlite-jdbc
 AMD_SERVER=utgb01\r
 AMD_WORK=work/eclipse/xerial/sqlite-jdbc\r
 \r
-all: win mac linux linux-amd\r
+BUILD_CMD = svn update && make\r
+\r
+all: purejava win mac linux linux-amd\r
+\r
+purejava: \r
+       ssh $(MAC_SERVER) "source .zprofile && cd $(MAC_WORK)/sqlitejdbc && make -f Makefile.nested"\r
+       mkdir -p $(RESOURCE_DIR)/org/sqlite\r
+       scp $(MAC_SERVER):./$(MAC_WORK)/sqlitejdbc/build/org/sqlite/SQLite.class $(RESOURCE_DIR)/org/sqlite/\r
 \r
 win:\r
        ssh $(WIN_SERVER) "source .zprofile && cd $(WIN_WORK) && svn update && make" \r
-       $(RSYNC)  $(WIN_SERVER):./$(WIN_WORK)/$(RESOURCE_DIR)/Windows/ $(RESOURCE_DIR)/Windows/\r
+       $(RSYNC)  $(WIN_SERVER):./$(WIN_WORK)/$(NATIVE_DIR)/Windows/ $(NATIVE_DIR)/Windows/\r
 \r
 mac:   \r
        ssh $(MAC_SERVER) "source .zprofile && cd $(MAC_WORK) && svn update && make" \r
-       $(RSYNC)  $(MAC_SERVER):./$(MAC_WORK)/$(RESOURCE_DIR)/Mac/ $(RESOURCE_DIR)/Mac/\r
+       $(RSYNC)  $(MAC_SERVER):./$(MAC_WORK)/$(NATIVE_DIR)/Mac/ $(NATIVE_DIR)/Mac/\r
 \r
 linux:         \r
        ssh $(LINUX_SERVER) "source .zprofile && source /etc/profile.d/java.sh && cd $(LINUX_WORK) && svn update && make" \r
-       $(RSYNC)  $(LINUX_SERVER):./$(LINUX_WORK)/$(RESOURCE_DIR)/Linux/i386/ $(RESOURCE_DIR)/Linux/i386/\r
+       $(RSYNC)  $(LINUX_SERVER):./$(LINUX_WORK)/$(NATIVE_DIR)/Linux/i386/ $(NATIVE_DIR)/Linux/i386/\r
 \r
 linux-amd:     \r
        ssh $(AMD_SERVER) "source .zprofile && cd $(AMD_WORK) && svn update && make" \r
-       $(RSYNC)  $(AMD_SERVER):./$(AMD_WORK)/$(RESOURCE_DIR)/Linux/amd64/ $(RESOURCE_DIR)/Linux/amd64/\r
+       $(RSYNC)  $(AMD_SERVER):./$(AMD_WORK)/$(NATIVE_DIR)/Linux/amd64/ $(NATIVE_DIR)/Linux/amd64/\r
 \r

diff --git a/Makefile.version b/Makefile.version
new file mode 100644 (file)
index 0000000..6873fff
--- /dev/null
+++ b/Makefile.version
@@ -0,0 +1,2 @@
+sqlite_version := 3.6.3
+sqlite := sqlite-$(sqlite_version)

diff --git a/sqlitejdbc/Makefile.common b/sqlitejdbc/Makefile.common
index dc4a01d..5d2dec5 100644 (file)
--- a/sqlitejdbc/Makefile.common
+++ b/sqlitejdbc/Makefile.common
@@ -1,3 +1,5 @@
+include ../Makefile.version
+
 ifndef JAVA_HOME
 $(error Set JAVA_HOME environment variable)
 endif

diff --git a/src/main/resources/native/Mac/i386/libsqlitejdbc.jnilib b/src/main/resources/native/Mac/i386/libsqlitejdbc.jnilib
index 2e37a90..d43be90 100755 (executable)
Binary files a/src/main/resources/native/Mac/i386/libsqlitejdbc.jnilib and b/src/main/resources/native/Mac/i386/libsqlitejdbc.jnilib differ