Changeset 2541

Timestamp:

10/16/08 12:03:08 (4 years ago)

Author:

leo

Message:

changed to load the version number from the VERSION file

Location:

XerialJ/trunk/sqlite-jdbc

Files:

• .classpath (modified) (1 diff)
• README (added)
• SQLiteJDBC.wiki (added)
• pom.xml (modified) (1 diff)
• src/main/java/org/xerial/db/sql/sqlite/SQLiteJDBCLoader.java (modified) (3 diffs)
• src/test/java/org/xerial/db/sql/sqlite/SQLiteJDBCLoaderTest.java (modified) (1 diff)

XerialJ/trunk/sqlite-jdbc/.classpath

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-        <classpathentry kind="src" path="src/main/java"/>
-        <classpathentry excluding="**/*.java" including="native/**|org/**" kind="src" path="src/main/resources"/>
-        <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-        <classpathentry kind="var" path="M2_REPO/org/xerial/thirdparty/jdbc-api/1.4/jdbc-api-1.4.jar"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-        <classpathentry kind="var" path="M2_REPO/junit/junit/4.1/junit-4.1.jar"/>
-        <classpathentry kind="var" path="M2_REPO/org/xerial/xerial-core/0.8.0/xerial-core-0.8.0.jar"/>
-        <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
-        <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.1-b1/stringtemplate-3.1-b1.jar"/>
-        <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar"/>
-        <classpathentry kind="var" path="M2_REPO/org/xerial/thirdparty/nestedvm/1.0/nestedvm-1.0.jar"/>
-        <classpathentry kind="var" path="M2_REPO/org/xerial/thirdparty/sqlitejdbc-nested/3.6.0/sqlitejdbc-nested-3.6.0.jar"/>
-        <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="src" path="." including="VERSION" excluding="**/*.java"/>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/main/resources" including="native/**|org/**" excluding="**/*.java"/>
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/xerial/thirdparty/jdbc-api/1.4/jdbc-api-1.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.1/junit-4.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/xerial/thirdparty/nestedvm/1.0/nestedvm-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.1-b1/stringtemplate-3.1-b1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/xerial/xerial-core/0.8.0/xerial-core-0.8.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar"/>
 </classpath>

XerialJ/trunk/sqlite-jdbc/pom.xml

@@ -27 +27 @@
           <include>native/**</include>
           <include>org/**</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>${basedir}</directory>
+        <includes>
+          <include>VERSION</include>
         </includes>
       </resource>

XerialJ/trunk/sqlite-jdbc/src/main/java/org/xerial/db/sql/sqlite/SQLiteJDBCLoader.java

@@ -32 +32 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.Properties;
 
 /**
@@ -109 +111 @@
     {
         String nativeLibraryFilePath = libFolderForCurrentOS + "/" + libraryFileName;
-        final String prefix = "sqlite-3.6.4-";
+        final String prefix = String.format("sqlite-%s-", getVersion());
 
         String extractedLibFileName = prefix + libraryFileName;
@@ -258 +260 @@
     }
 
+    public static String getVersion()
+    {
+        URL versionFile = SQLiteJDBCLoader.class.getResource("/VERSION");
+
+        String version = "unknown";
+        try
+        {
+            if (versionFile != null)
+            {
+                Properties versionData = new Properties();
+                versionData.load(versionFile.openStream());
+                version = versionData.getProperty("sqlite_version", version);
+                version = version.trim().replaceAll("[^0-9\\.]", "");
+            }
+        }
+        catch (IOException e)
+        {
+            System.err.println(e);
+        }
+        return version;
+    }
+
 }

XerialJ/trunk/sqlite-jdbc/src/test/java/org/xerial/db/sql/sqlite/SQLiteJDBCLoaderTest.java

@@ -112 +112 @@
     }
 
+    @Test
+    public void version()
+    {
+        _logger.debug(SQLiteJDBCLoader.getVersion());
+    }
+
 }