Mercurial > hg > monetdb-java

changeset 1:aded8207ba33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Created simple makefile for building jars using ant.
author Sjoerd Mullender <sjoerd@acm.org>
date Wed, 21 Sep 2016 10:26:55 +0200 (2016-09-21)
parents a5a898f6886c
children f5dc2be00552
files Makefile Makefile.ag tests/Makefile.ag
diffstat 3 files changed, 10 insertions(+), 63 deletions(-) [+]
line wrap: on
line diff
new file mode 100644
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,10 @@
+all: src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java
+	ant -f build.xml distjdbc distmerocontrol
+	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
+	source ./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
+
+clean:
+	rm -f src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java
+	rm -rf build tests/build jars
deleted file mode 100644
--- a/Makefile.ag
+++ /dev/null
@@ -1,28 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-
-SUBDIRS = HAVE_JAVAJDBC?tests
-
-EXTRA_DIST = build.xml build.properties release.txt
-
-EXTRA_DIST_DIR = src \
-		 example
-
-JAVA_HOME = @JAVA_HOME@
-
-ant_distjdbc = {
-	COND = HAVE_JAVAJDBC
-	DIR = datadir/monetdb/lib
-	FILES = monetdb-mcl-1.13.jar monetdb-jdbc-2.23.jar jdbcclient.jar
-}
-
-ant_distmerocontrol = {
-	COND = HAVE_JAVAMEROCONTROL
-	DIR = datadir/monetdb/lib
-	FILES = merocontrol.jar
-}
-
-# vim: ft=automake :
deleted file mode 100644
--- a/tests/Makefile.ag
+++ /dev/null
@@ -1,35 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-
-EXTRA_DIST = \
-		Test_Cautocommit.java \
-		Test_Clargequery.java \
-		Test_Cmanycon.java \
-		Test_Creplysize.java \
-		Test_Csavepoints.java \
-		Test_Ctransaction.java \
-		Test_Dobjects.java \
-		Test_PSgeneratedkeys.java \
-		Test_PSlargeresponse.java \
-		Test_PSlargeamount.java \
-		Test_PStimedate.java \
-		Test_PStimezone.java \
-		Test_PStypes.java \
-		Test_Rbooleans.java \
-		Test_Rmetadata.java \
-		Test_Rpositioning.java \
-		Test_Rtimedate.java \
-		Test_Sbatching.java \
-		Test_Int128.java \
-		BugConcurrent_clients_SF_1504657.java \
-		BugDatabaseMetaData_Bug_3356.java \
-		BugDecimalRound_Bug_3561.java \
-		build.xml build.properties
-
-ant_jar_jdbctests = {
-	DIR = datadir/monetdb/lib
-	FILES = jdbctests.jar
-}