Mercurial > hg > monetdb-java

changeset 241:3799054f098e embedded

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Continuing to add support for snapshot releases.
author Pedro Ferreira <pedro.ferreira@monetdbsolutions.com>
date Tue, 12 Jun 2018 16:13:11 +0200 (2018-06-12)
parents 9471ac1f8520
children 0a118436067b
files Makefile build.xml src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in tests/build.xml
diffstat 4 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ all: src/main/java/nl/cwi/monetdb/jdbc/M
 	cd tests; ant -f build.xml jar_jdbctests
 
 src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java: build.properties src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
-	. ./build.properties; sed -e "s/@MCL_MAJOR@/$$MCL_MAJOR/g;s/@MCL_MINOR@/$$MCL_MINOR/g;s/@JDBC_MAJOR@/$$JDBC_MAJOR/g;s/@JDBC_MINOR@/$$JDBC_MINOR/g;s/@JDBC_VER_SUFFIX@/$$JDBC_VER_SUFFIX $$buildno/g;s/@JDBC_DEF_PORT@/$$JDBC_DEF_PORT/g" src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in > src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java
+	. ./build.properties; sed -e "s/@MCL_MAJOR@/$$MCL_MAJOR/g;s/@MCL_MINOR@/$$MCL_MINOR/g;s/@JDBC_MAJOR@/$$JDBC_MAJOR/g;s/@JDBC_MINOR@/$$JDBC_MINOR/g;s/@JDBC_SNAPSHOT@/$$JDBC_SNAPSHOT/g;s/@JDBC_VER_SUFFIX@/$$JDBC_VER_SUFFIX $$buildno/g;s/@JDBC_DEF_PORT@/$$JDBC_DEF_PORT/g" src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in > src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java
 
 doc:
 	ant -f build.xml doc
--- a/build.xml
+++ b/build.xml
@@ -32,13 +32,13 @@ Copyright 1997 - July 2008 CWI, August 2
   <property file="build.properties" />
 
   <property name="jdbc-jar"
-    value="${jardir}/monetdb-jdbc-new-${JDBC_MAJOR}.${JDBC_MINOR}.jar" />
+    value="${jardir}/monetdb-jdbc-new-${JDBC_MAJOR}.${JDBC_MINOR}${JDBC_SNAPSHOT}.jar" />
   <property name="jdbcclient-jar"
     value="${jardir}/jdbcclient.jar" />
   <property name="jmonetdb-jar"
     value="${jardir}/jmonetdb.jar" />
   <property name="mcl-jar"
-    value="${jardir}/monetdb-mcl-${MCL_MAJOR}.${MCL_MINOR}.jar" />
+    value="${jardir}/monetdb-mcl-${MCL_MAJOR}.${MCL_MINOR}${MCL_SNAPSHOT}.jar" />
   <property name="mero-control-jar"
     value="${jardir}/merocontrol.jar" />
 
@@ -263,8 +263,10 @@ Copyright 1997 - July 2008 CWI, August 2
     <!-- Some defaults -->
     <filter token="JDBC_MAJOR" value="${JDBC_MAJOR}" />
     <filter token="JDBC_MINOR" value="${JDBC_MINOR}" />
+    <filter token="JDBC_SNAPSHOT" value="${JDBC_SNAPSHOT}" />
     <filter token="MCL_MAJOR" value="${MCL_MAJOR}" />
     <filter token="MCL_MINOR" value="${MCL_MINOR}" />
+    <filter token="MCL_SNAPSHOT" value="${MCL_SNAPSHOT}" />
     <filter token="JDBC_DEF_PORT" value="${JDBC_DEF_PORT}" />
     <filter token="JDBC_VER_SUFFIX" value="${JDBC_VER_SUFFIX} ${TODAY}" />
 
@@ -279,7 +281,7 @@ Copyright 1997 - July 2008 CWI, August 2
   	  tofile="src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in"
   	  filtering="yes" />
 
-    <echo message="Configured build for the ${JDBC_MAJOR}.${JDBC_MINOR} (${JDBC_VER_SUFFIX}) edition driver" />
+    <echo message="Configured build for the ${JDBC_MAJOR}.${JDBC_MINOR}${JDBC_SNAPSHOT} (${JDBC_VER_SUFFIX}) edition driver" />
   </target>
 
   <!-- Prepares the build directory and sets some variables -->
--- a/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
+++ b/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
@@ -48,7 +48,7 @@ import java.util.logging.Logger;
  * given the default (@JDBC_DEF_PORT@) will be used.
  *
  * @author Fabian Groffen, Pedro Ferreira
- * @version @JDBC_MAJOR@.@JDBC_MINOR@ (@JDBC_VER_SUFFIX@)
+ * @version @JDBC_MAJOR@.@JDBC_MINOR@@JDBC_SNAPSHOT@ (@JDBC_VER_SUFFIX@)
  */
 public final class MonetDriver implements Driver {
 	// the url kind will be jdbc:monetdb://<host>[:<port>]/<database> (in a MAPI connection)
@@ -60,6 +60,8 @@ public final class MonetDriver implement
 	private static final int DRIVERMAJOR = @JDBC_MAJOR@;
 	/** Minor version of this driver */
 	private static final int DRIVERMINOR = @JDBC_MINOR@;
+	/** Is a snapshot release of the driver */
+	private static final String DRIVERSNAPSHOT = "@JDBC_SNAPSHOT@";
 
 	/** Version suffix string */
 	private static final String DRIVERVERSIONSUFFIX =
@@ -330,7 +332,7 @@ public final class MonetDriver implement
 	 * @return the version string
 	 */
 	public static String getDriverVersion() {
-		return DRIVERMAJOR + "." + DRIVERMINOR + " (" + DRIVERVERSIONSUFFIX + ")";
+		return DRIVERMAJOR + "." + DRIVERMINOR + DRIVERSNAPSHOT + " (" + DRIVERVERSIONSUFFIX + ")";
 	}
 
 	public static int getDriverMajorVersion() {
--- a/tests/build.xml
+++ b/tests/build.xml
@@ -25,7 +25,7 @@ Copyright 1997 - July 2008 CWI, August 2
   <property name="builddir"  value="build" />
   <property name="jardir"    value="../jars" />
   <property name="jdbc_jar"
-    value="${jardir}/monetdb-jdbc-new-${JDBC_MAJOR}.${JDBC_MINOR}.jar" />
+    value="${jardir}/monetdb-jdbc-new-${JDBC_MAJOR}.${JDBC_MINOR}${JDBC_SNAPSHOT}.jar" />
   <property name="jdbc_url"
     value="jdbc:monetdb://localhost/?user=monetdb&amp;password=monetdb${debug}" />
   <property name="jdbctests-jar"