Changeset: 982534c83436 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java?cmd=changeset;node=982534c83436
Modified Files:
Makefile
build.xml
tests/build.xml
Branch: default
Log Message:
Updating build.xml and tests/build.xml
In build.xml corrected some comments, made target doc working.
In tests/build.xml added javac.flags as argument to javac. This removes
compiler warning: [javac] warning: [options] bootstrap class path not set in
conjunction with -source 1.7
Added target doc to the Makefile for convenience
diffs (105 lines):
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,9 @@ all: src/main/java/nl/cwi/monetdb/jdbc/M
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
+doc:
+ ant -f build.xml doc
+
clean:
rm -f src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java
- rm -rf build tests/build jars
+ rm -rf build tests/build jars doc
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -11,8 +11,7 @@ Copyright 1997 - July 2008 CWI, August 2
<!--
Build file to allow ant (http://jakarta.apache.org/ant/) to be used
- to build the MonetDB Java libraries, such as the JDBC and XML:DB
- drivers.
+ to build the MonetDB Java packages, such as the JDBC driver.
-->
@@ -42,7 +41,6 @@ Copyright 1997 - July 2008 CWI, August 2
value="${jardir}/jmonetdb.jar" />
<property name="mcl-jar"
value="${jardir}/monetdb-mcl-${MCL_MAJOR}.${MCL_MINOR}.jar" />
-
<property name="mero-control-jar"
value="${jardir}/merocontrol.jar" />
@@ -64,9 +62,7 @@ Copyright 1997 - July 2008 CWI, August 2
<!-- full target -->
<target name="all">
<antcall target="distjdbc" />
-
<antcall target="distmerocontrol" />
-
<antcall target="doc" />
</target>
@@ -120,11 +116,11 @@ Copyright 1997 - July 2008 CWI, August 2
</jar>
</target>
- <!-- a convenience jar of JDBC plus the JdbcClient utililty -->
+ <!-- a convenience jar of jdbcclient command line program plus JDBC driver
-->
<target name="jar_jdbcclient"
depends="compile_mcl,compile_jdbc,compile_util,compile_client"
unless="uptodate.jdbcclient-jar">
- <echo message="Building JDBC + JdbcClient convenience jar" />
+ <echo message="Building jdbcclient + JDBC driver convenience jar" />
<jar jarfile="${jdbcclient-jar}">
<fileset dir="${builddir}">
<include name="${jdbc-package}/**/*.class" />
@@ -258,8 +254,8 @@ Copyright 1997 - July 2008 CWI, August 2
</target>
<!--
- This generates MonetDriver.java from its ".java.in" equivalents. It's
- required for importing the driver version properties.
+ This generates MonetDriver.java from its ".java.in" equivalent.
+ It's required for importing the driver version properties.
-->
<target name="driver" depends="prepare" unless="uptodate.drivers">
<tstamp>
@@ -356,7 +352,7 @@ Copyright 1997 - July 2008 CWI, August 2
<!-- documentation target -->
<target name="doc"
-
depends="compile_mcl,compile_jdbc,compile_util,compile_client,compile_mero_control">
+ depends="driver">
<javadoc
destdir="${docdir}"
author="true"
@@ -371,14 +367,6 @@ Copyright 1997 - July 2008 CWI, August 2
<include name="${util-package}/**/*.java" />
<include name="${mero-control-package}/**/*.java" />
</fileset>
-
- <fileset dir="${builddir}/src" defaultexcludes="yes">
- <include name="${jdbc-package}/**/*.java" />
- <include name="${mcl-package}/**/*.java" />
- <include name="${client-package}/**/*.java" />
- <include name="${util-package}/**/*.java" />
- <include name="${mero-control-package}/**/*.java" />
- </fileset>
</javadoc>
</target>
diff --git a/tests/build.xml b/tests/build.xml
--- a/tests/build.xml
+++ b/tests/build.xml
@@ -52,6 +52,7 @@ Copyright 1997 - July 2008 CWI, August 2
target="${jvm.version}"
>
<include name="**/*.java" />
+ <compilerarg line="${javac.flags}" />
<classpath>
<pathelement path="${srcdir}" />
<pathelement path="${jdbc_jar}" />
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
