git-svn-id: http://www.xerial.org/svn/project/XerialJ/trunk/sqlite-jdbc@2041 ae02f08e...

diff --git a/Makefile b/Makefile
index ac458fa..a995756 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,47 @@
+# use JDK1.5 to build native libraries\r
+ \r
 \r
 CURRENT_DIR = $(shell cygpath -w `pwd`)\r
+RESOURCE_DIR = src/main/resources/native\r
 \r
-# use JDK1.5 to build native libraries\r
+OS_NAME = $(shell uname) \r
+\r
+ifeq ($(findstring CYGWIN,$(OS_NAME)),CYGWIN)\r
+  LIB_FOLDER := $(RESOURCE_DIR)/win\r
+  OS := Win\r
+endif\r
+ifeq ($(findstring MINGW,$(OS_NAME)),MINGW)\r
+  LIB_FOLDER := $(RESOURCE_DIR)/win\r
+  OS := Win\r
+endif\r
+ifeq ($(OS_NAME),Darwin)\r
+  LIB_FOLDER := $(RESOURCE_DIR)/mac\r
+  OS := Darwin\r
+endif\r
+ifeq ($(OS),)\r
+  LIB_FOLDER := $(RESOURCE_DIR)/linux\r
+  OS := Default\r
+endif\r
+\r
+ifeq ($(arch),)\r
+arch := $(shell uname -m)\r
+endif\r
+\r
+target = $(OS)-$(arch)\r
 \r
-.phony: all package win mac linux native\r
+Default_LIBNAME   := libsqlitejdbc.so\r
+Darwin_LIBNAME   := libsqlitejdbc.jnilib\r
+Win_LIBNAME      := sqlitejdbc.dll\r
+LIBNAME   := $($(OS)_LIBNAME)\r
 \r
-all: package \r
 \r
-package: \r
-       mvn clean package deploy #-Dmaven.test.skip=true\r
+.phony: all package win mac linux native deploy\r
+\r
+all: native\r
+\r
+deploy: \r
+       mvn deploy \r
 \r
-LIBDIR=src/main/resources/native\r
 \r
 #win: $(LIBDIR)/win/sqlitejdbc.dll\r
 #      $(shell md5sum -b $< | cut -f 1 -d ' ' > $(LIBDIR)/win/md5sum)\r
@@ -22,8 +53,16 @@ LIBDIR=src/main/resources/native
 #      $(shell md5sum -b $< | cut -f 1 -d ' ' > $(LIBDIR)/linux/md5sum)\r
 \r
 \r
-native:\r
-       cd sqlitejdbc && make native test\r
+$(LIB_FOLDER)/$(LIBNAME):\r
+       cd sqlitejdbc && make native \r
+\r
+native: $(LIB_FOLDER)/$(LIBNAME)\r
+       mkdir -p $(LIB_FOLDER)\r
+       cp sqlitejdbc/build/$(target)/$(LIBNAME) $(LIB_FOLDER) \r
+       mvn package\r
+\r
 \r
 clean:\r
+       cd sqlitejdbc && make clean\r
        mvn clean\r
+\r

diff --git a/pom.xml b/pom.xml
index e38e8d5..7ba9d85 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
   <modelVersion>4.0.0</modelVersion>\r
   <groupId>org.xerial</groupId>\r
   <artifactId>sqlite-jdbc</artifactId>\r
-  <version>v042.1-SNAPSHOT</version>\r
+  <version>3.5.7-SNAPSHOT</version>\r
   <name>SQLite JDBC</name>\r
   <description>SQLite JDBC library</description>\r
 \r

diff --git a/sqlitejdbc/Makefile.common b/sqlitejdbc/Makefile.common
index c0825d1..42f7ead 100644 (file)
--- a/sqlitejdbc/Makefile.common
+++ b/sqlitejdbc/Makefile.common
@@ -38,7 +38,7 @@ ifeq ($(arch),)
 arch := $(shell uname -m)
 endif
 
-sqlite_version := 3.5.6
+sqlite_version := 3.5.7
 sqlite := sqlite-$(sqlite_version)
 
 sqlitejdbc := sqlitejdbc-v$(shell cat VERSION)

diff --git a/src/main/resources/native/win/sqlitejdbc.dll b/src/main/resources/native/win/sqlitejdbc.dll
index a6a5360..8ecafdd 100644 (file)
Binary files a/src/main/resources/native/win/sqlitejdbc.dll and b/src/main/resources/native/win/sqlitejdbc.dll differ