Mercurial > hg > monetdb-java

diff build.xml @ 85:073ee535234b embedded

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ok. Now everything compiles back with Ant again. Moved the Embedded stuff to the temporary MonetDBJavaLite repository before moving into the suggested MonetDBLite repository. The soon generated Embedded Connection jar will have a dependency on the regular JDBC driver jar. The JDBC driver jar is independent, however if attempted to create an Embedded Connection with will try to load the respective class from the class loader, failing if the Embedded Connection jar is not present. If anyone in the group has expertise on Java Class dynamic loading, please contact me because there might be issues on this. Removed the pom.xml file because the regular maven compilation fails.
author Pedro Ferreira <pedro.ferreira@monetdbsolutions.com>
date Fri, 30 Dec 2016 18:55:13 +0000 (2016-12-30)
parents a5a898f6886c
children 2b5e32efb1a4
line wrap: on
line diff
--- a/build.xml
+++ b/build.xml
@@ -31,7 +31,6 @@ Copyright 1997 - July 2008 CWI, August 2
   <property name="util-package"         value="nl/cwi/monetdb/util" />
   <property name="mero-control-package" value="nl/cwi/monetdb/merovingian" />
 
-  <property file="build.local.properties" />
   <property file="build.properties" />
 
   <property name="jdbc-jar"
@@ -258,7 +257,7 @@ Copyright 1997 - July 2008 CWI, August 2
   </target>
 
   <!--
-  This generates MonetDriver.java from its ".java.in" equivalents.  It's
+  This generates MonetDriver.java.in from its ".java.in" equivalents.  It's
   required for importing the driver version properties.
   -->
   <target name="driver" depends="prepare" unless="uptodate.drivers">
@@ -282,7 +281,7 @@ Copyright 1997 - July 2008 CWI, August 2
     <!-- now copy and filter the file -->
   	<copy file="${srcdir}/${jdbc-package}/MonetDriver.java.in"
   	  overwrite="true"
-  	  tofile="${srcdir}/${jdbc-package}/MonetDriver.java"
+  	  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" />