# HG changeset patch # User Sjoerd Mullender <sjoerd@acm.org> # Date 1703165193 -3600 # Node ID a03de7b24ae89c45242b69e070bdc6f2fd65c41f # Parent be78e5a8c9cd1f08f4cd45581f3ac92d8e0cf659 No need to create MonetVersion.java before running ant. diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all: src/main/java/org/monetdb/jdbc/MonetVersion.java +all: src/main/java/org/monetdb/jdbc/MonetVersion.java.in ant -f build.xml distjdbc distmerocontrol cd tests; ant -f build.xml jar_jdbctests @@ -7,9 +7,6 @@ jre17jars: src/main/java/org/monetdb/jdb ant -f build_jre17.xml distjdbc rm -rf build -src/main/java/org/monetdb/jdbc/MonetVersion.java: build.properties src/main/java/org/monetdb/jdbc/MonetVersion.java.in - . ./build.properties; sed -e "s/@JDBC_MAJOR@/$$JDBC_MAJOR/g;s/@JDBC_MINOR@/$$JDBC_MINOR/g;s/@JDBC_VER_SUFFIX@/$$JDBC_VER_SUFFIX $$buildno/g" src/main/java/org/monetdb/jdbc/MonetVersion.java.in > src/main/java/org/monetdb/jdbc/MonetVersion.java - testsjar: cd tests; ant -f build.xml jar_jdbctests