build.xml (hsqldb-2.6.0) | : | build.xml (hsqldb-2.6.1) | ||
---|---|---|---|---|
<?xml version="1.0"?> | <?xml version="1.0"?> | |||
<!-- $Id: build.xml 6329 2021-03-20 10:07:32Z fredt $ --> | <!-- $Id: build.xml 6365 2021-07-19 09:10:13Z fredt $ --> | |||
<!-- author fredt@users.sourceforge.net 2001 - 2021 --> | <!-- author fredt@users.sourceforge.net 2001 - 2021 --> | |||
<!-- additional targets 2004-2021: blaine (dot) simpson (at) admc (dot) com --> | <!-- additional targets 2004-2021: blaine (dot) simpson (at) admc (dot) com --> | |||
<project name="hsqldb" default="help" basedir="../"> | <project name="hsqldb" default="help" basedir="../"> | |||
<!-- To see what build properties you can change, see the property elements | <!-- To see what build properties you can change, see the property elements | |||
below. | below. | |||
This loads properties in the same exact way as if you ran | This loads properties in the same exact way as if you ran | |||
"ant -Dprop1name=val1 -Dprop2name=val2...", etc. To use all | "ant -Dprop1name=val1 -Dprop2name=val2...", etc. To use all | |||
defaults, you should have no 'build.properties' file. | defaults, you should have no 'build.properties' file. | |||
If you don't understand this or want to know about precedence or | If you don't understand this or want to know about precedence or | |||
skipping to change at line 30 | skipping to change at line 30 | |||
<!-- TODO: | <!-- TODO: | |||
Use multiple class directories (javac dest dirs). | Use multiple class directories (javac dest dirs). | |||
Current tactic requires tons of complicated includes and exludes | Current tactic requires tons of complicated includes and exludes | |||
and still often bundles arbitrary extra stuff (determined by what | and still often bundles arbitrary extra stuff (determined by what | |||
happened to be built previously). Mostly fixed in 2.5.1 and .2 | happened to be built previously). Mostly fixed in 2.5.1 and .2 | |||
--> | --> | |||
<property file='build/build.properties'/> | <property file='build/build.properties'/> | |||
<condition property="hsqldb.version" value="2.6.0"> | <condition property="hsqldb.version" value="2.6.1"> | |||
<available classname="java.sql.JDBCType"/> | <available classname="java.sql.JDBCType"/> | |||
</condition> | </condition> | |||
<!-- hsqldb.version is set only once - if it is set above for Java 8 and gre ater, the next line is a no-op --> | <!-- hsqldb.version is set only once - if it is set above for Java 8 and gre ater, the next line is a no-op --> | |||
<property name="hsqldb.version" value="2.3.9"/> | <property name="hsqldb.version" value="2.3.9"/> | |||
<tstamp> | <tstamp> | |||
<format property="timestamp" pattern="yyyy/MM/dd-HH:mm:ss" locale="en"/> | <format property="timestamp" pattern="yyyy/MM/dd-HH:mm:ss" locale="en"/> | |||
</tstamp> | </tstamp> | |||
<property name="build.label" value="private-${timestamp}"/> | <property name="build.label" value="private-${timestamp}"/> | |||
skipping to change at line 135 | skipping to change at line 135 | |||
<target name="-prepare" depends="-set-jvmvars"> | <target name="-prepare" depends="-set-jvmvars"> | |||
<mkdir dir="classes" /> | <mkdir dir="classes" /> | |||
<mkdir dir="classes/modules/org.hsqldb" /> | <mkdir dir="classes/modules/org.hsqldb" /> | |||
<delete dir="classes/modules/org.hsqldb" includes="**/*"/> | <delete dir="classes/modules/org.hsqldb" includes="**/*"/> | |||
<mkdir dir="classes/modules/org.hsqldb.sqltool" /> | <mkdir dir="classes/modules/org.hsqldb.sqltool" /> | |||
<delete dir="classes/modules/org.hsqldb.sqltool" includes="**/*"/> | <delete dir="classes/modules/org.hsqldb.sqltool" includes="**/*"/> | |||
<mkdir dir="classes/modules/org.hsqldb.min" /> | <mkdir dir="classes/modules/org.hsqldb.min" /> | |||
<delete dir="classes/modules/org.hsqldb.min" includes="**/*"/> | <delete dir="classes/modules/org.hsqldb.min" includes="**/*"/> | |||
</target> | </target> | |||
<target name="-prepare-javadoc"> | <target name="-prepare-javadoc" depends="switches"> | |||
<delete dir="doc/apidocs"/> | <delete dir="doc/apidocs"/> | |||
<!-- Must be vigilant about cleaning up from previous runs, since this | <!-- Must be vigilant about cleaning up from previous runs, since this | |||
same directory is used for both public API spec, and the full | same directory is used for both public API spec, and the full | |||
code-base API spec. | code-base API spec. | |||
There is no performance penalty, since the javadoc task regenerates | There is no performance penalty, since the javadoc task regenerates | |||
everything each run. | everything each run. | |||
--> | --> | |||
<copy todir="doc/apidocs"> | <copy todir="doc/apidocs"> | |||
<!-- IMPORTANT: | <!-- IMPORTANT: | |||
Add a fixcrlf if we add non-binary files to doc-src/apidocs. --> | Add a fixcrlf if we add non-binary files to doc-src/apidocs. --> | |||
<fileset dir="doc-src/apidocs"/> | <fileset dir="doc-src/apidocs"/> | |||
</copy> | </copy> | |||
<copy todir="${swsrc}"> | ||||
<fileset dir="src/modules/org.hsqldb/"/> | ||||
</copy> | ||||
<delete file="${swsrc}org/hsqldb/server/Servlet.java"/> | ||||
</target> | </target> | |||
<target name="reinit" | <target name="reinit" | |||
description="Just like 'clean' target, except overwrites switched source files to prevent need for a complete re-copy"> | description="Just like 'clean' target, except overwrites switched source files to prevent need for a complete re-copy"> | |||
<!-- Beware this will refresh a copy of removed artifacts under swsrc. | <!-- Beware this will refresh a copy of removed artifacts under swsrc. | |||
You must use the real 'clean' target to really purge everything. -- > | You must use the real 'clean' target to really purge everything. -- > | |||
<fail message="Just use 'clean' for inplace-switching setups" | <fail message="Just use 'clean' for inplace-switching setups" | |||
if="switch.inplace"/> | if="switch.inplace"/> | |||
<delete dir="classes"/> | <delete dir="classes"/> | |||
<copy todir='${swsrc}' preservelastmodified='true'> | <copy todir='${swsrc}' preservelastmodified='true'> | |||
skipping to change at line 178 | skipping to change at line 182 | |||
description="Delete the /classes directory"> | description="Delete the /classes directory"> | |||
</target> | </target> | |||
<target name="-clean"> | <target name="-clean"> | |||
<delete dir="classes"/> | <delete dir="classes"/> | |||
</target> | </target> | |||
<target name="clean-all" depends="-clean, -clean-switch-branch, clean-docs" | <target name="clean-all" depends="-clean, -clean-switch-branch, clean-docs" | |||
description="Same as clean but delete the jar and doc files as well" > | description="Same as clean but delete the jar and doc files as well" > | |||
<delete> | <delete> | |||
<fileset dir="lib" includes="sqltool*.jar, hsqldb.jar, testsuite.jar"/> | <fileset dir="lib" includes="sqltool.jar, hsqldb.jar, testsuite.jar"/> | |||
</delete> | </delete> | |||
</target> | </target> | |||
<target name="codeswitcher" depends="-prepare" | <target name="codeswitcher" depends="-prepare" | |||
description="uses +-JAVA6 +-JAVA8 etc"> | description="uses +-JAVA6 +-JAVA8 etc"> | |||
<javac destdir="classes" includeantruntime="false"> | <javac destdir="classes" includeantruntime="false"> | |||
<src path="src"/> | <src path="src"/> | |||
<include name="org/hsqldb/util/CodeSwitcher.java"/> | <include name="org/hsqldb/util/CodeSwitcher.java"/> | |||
</javac> | </javac> | |||
<antcall target="-update-switch-branch"/> | <antcall target="-update-switch-branch"/> | |||
skipping to change at line 297 | skipping to change at line 301 | |||
<include name="org/hsqldb/map/**"/> | <include name="org/hsqldb/map/**"/> | |||
<include name="org/hsqldb/lib/**"/> | <include name="org/hsqldb/lib/**"/> | |||
<exclude name="org/hsqldb/lib/AppendableException.java"/> | <exclude name="org/hsqldb/lib/AppendableException.java"/> | |||
<exclude name="org/hsqldb/lib/RefCapablePropertyResourceBundle.java"/> | <exclude name="org/hsqldb/lib/RefCapablePropertyResourceBundle.java"/> | |||
<exclude name="org/hsqldb/lib/RefCapableRBInterface.java"/> | <exclude name="org/hsqldb/lib/RefCapableRBInterface.java"/> | |||
<exclude name="org/hsqldb/lib/ValidatingResourceBundle.java"/> | <exclude name="org/hsqldb/lib/ValidatingResourceBundle.java"/> | |||
<exclude name="org/hsqldb/lib/tar/**"/> | <exclude name="org/hsqldb/lib/tar/**"/> | |||
</javac> | </javac> | |||
</target> | </target> | |||
<target name="classes-servlet" description="compiles Servlet class"> | <target name="classes-servlet" description="compiles Servlet class" unless=" ant.java.iscjava09"> | |||
<!-- 'unless' above should be removed once learn how to include in named m odule--> | <!-- 'unless' above should be removed once learn how to include in named m odule--> | |||
<available property='_servlet_available' classpath='${servletapi.lib}' | <available property='_servlet_available' classpath='${servletapi.lib}' | |||
classname='javax.servlet.ServletException'/> | classname='javax.servlet.ServletException'/> | |||
<fail unless='_servlet_available' | <fail unless='_servlet_available' | |||
message="Place Jar file for Servlet API at '${servletapi.lib}', or s et property 'servletapi.lib'"/> | message="Place Jar file for Servlet API at '${servletapi.lib}', or s et property 'servletapi.lib'"/> | |||
<javac srcdir="${swsrc}" | <javac srcdir="${swsrc}" | |||
sourcepath="" | sourcepath="" | |||
includeantruntime="false" | includeantruntime="false" | |||
encoding="${javac.encoding}" | encoding="${javac.encoding}" | |||
destdir="classes" | destdir="classes" | |||
skipping to change at line 520 | skipping to change at line 524 | |||
org/hsqldb/trigger/** | org/hsqldb/trigger/** | |||
org/hsqldb/types/** | org/hsqldb/types/** | |||
' | ' | |||
excludes='org/hsqldb/Server.class' | excludes='org/hsqldb/Server.class' | |||
/> | /> | |||
<fileset id='mainaddedclasses' dir='classes' | <fileset id='mainaddedclasses' dir='classes' | |||
includes=' | includes=' | |||
org/hsqldb/Server.class | org/hsqldb/Server.class | |||
org/hsqldb/server/** | org/hsqldb/server/** | |||
org/hsqldb/util/MainInvoker.class | ||||
' | ' | |||
/> | /> | |||
<fileset id='dbmanagerswingclasses' dir='classes' | <fileset id='dbmanagerswingclasses' dir='classes' | |||
includes=' | includes=' | |||
org/hsqldb/util/*Swing*.class | org/hsqldb/util/*Swing*.class | |||
org/hsqldb/util/ConnectionDialogCommon.class | org/hsqldb/util/ConnectionDialogCommon.class | |||
org/hsqldb/util/ConnectionSetting* | org/hsqldb/util/ConnectionSetting* | |||
org/hsqldb/util/TableSorter* | org/hsqldb/util/TableSorter* | |||
org/hsqldb/util/DatabaseManagerCommon* | org/hsqldb/util/DatabaseManagerCommon* | |||
skipping to change at line 543 | skipping to change at line 548 | |||
org/hsqldb/util/*.gif | org/hsqldb/util/*.gif | |||
' | ' | |||
/> | /> | |||
<fileset id='dbmanagerawtaddedclasses' dir='classes' | <fileset id='dbmanagerawtaddedclasses' dir='classes' | |||
includes=' | includes=' | |||
org/hsqldb/util/DatabaseManager.class | org/hsqldb/util/DatabaseManager.class | |||
org/hsqldb/util/ConnectionDialog* | org/hsqldb/util/ConnectionDialog* | |||
org/hsqldb/util/Grid.class | org/hsqldb/util/Grid.class | |||
org/hsqldb/util/Tree.class | org/hsqldb/util/Tree.class | |||
org/hsqldb/util/MainInvoker.class | ||||
' | ' | |||
excludes=' | excludes=' | |||
org/hsqldb/util/ConnectionDialogCommon.class | org/hsqldb/util/ConnectionDialogCommon.class | |||
org/hsqldb/util/ConnectionDialogSwing.class | org/hsqldb/util/ConnectionDialogSwing.class | |||
' | ' | |||
/> | /> | |||
<fileset id='utilclasses' dir='classes' includes=' | <fileset id='utilclasses' dir='classes' includes=' | |||
org/hsqldb/util/** | org/hsqldb/util/** | |||
'/> | '/> | |||
skipping to change at line 791 | skipping to change at line 795 | |||
<attribute name='Implementation-Vendor' value='${build.vendor}'/> | <attribute name='Implementation-Vendor' value='${build.vendor}'/> | |||
<attribute name='Main-Class' value='org.hsqldb.cmdline.SqlTool'/> | <attribute name='Main-Class' value='org.hsqldb.cmdline.SqlTool'/> | |||
<attribute name='Class-Path' | <attribute name='Class-Path' | |||
value='hsqldb-${hsqldb.version}.jar hsqldbmain.jar hsqldb.jar'/> | value='hsqldb-${hsqldb.version}.jar hsqldbmain.jar hsqldb.jar'/> | |||
<attribute name='Sealed' value='true'/> | <attribute name='Sealed' value='true'/> | |||
</manifest> | </manifest> | |||
<fileset refid='utilclasses'/> | <fileset refid='utilclasses'/> | |||
</jar> | </jar> | |||
</target> | </target> | |||
<fileset id='javadocsources' dir='${swsrc}' | <!-- We use this target to create hsqldb-jdk8.jar and sqltool-jdk8.jar for t | |||
includes=' | he zip distro --> | |||
org/hsqldb/jdbc/JDBCDriver.java, | <target name="jdk8jars" depends="osgi, sqltool" | |||
org/hsqldb/jdbc/pool/JDBCPooledConnection.java, | description="Build hsqldb-osgi.jar and sqltool.jar for jdk 8 targets | |||
org/hsqldb/jdbc/pool/JDBCPooledDataSource.java, | and rename" | |||
org/hsqldb/jdbc/pool/JDBCXAConnection.java, | if="ant.java.iscjava08" unless="ant.java.iscjava09"> | |||
org/hsqldb/jdbc/pool/JDBCXAConnectionWrapper.java, | <move file="lib/hsqldb-osgi.jar" tofile="lib/hsqldb-jdk8.jar"/> | |||
org/hsqldb/jdbc/pool/JDBCXADataSource.java, | <move file="lib/sqltool.jar" tofile="lib/sqltool-jdk8.jar"/> | |||
org/hsqldb/jdbc/pool/JDBCXAResource.java, | </target> | |||
org/hsqldb/jdbc/pool/JDBCXID.java, | ||||
org/hsqldb/trigger/Trigger.java, | ||||
org/hsqldb/server/Server.java, | ||||
org/hsqldb/server/WebServer.java, | ||||
org/hsqldb/server/ServerAcl.java, | ||||
org/hsqldb/sample/TriggerSample.java, | ||||
org/hsqldb/sample/SqlFileEmbedder.java, | ||||
org/hsqldb/lib/FrameworkLogger.java, | ||||
org/hsqldb/util/RCData.java, | ||||
org/hsqldb/lib/tar/DbBackup.java, | ||||
org/hsqldb/lib/tar/DbBackupMain.java, | ||||
org/hsqldb/test/TestScriptRunner.java, | ||||
org/hsqldb/cmdline/SqlFile.java, | ||||
org/hsqldb/util/MainInvoker.java, | ||||
org/hsqldb/cmdline/SqlTool.java, | ||||
org/hsqldb/auth/AuthBeanMultiplexer.java, | ||||
org/hsqldb/auth/AuthFunctionBean.java, | ||||
org/hsqldb/auth/JaasAuthBean.java, | ||||
org/hsqldb/auth/HsqldbSlaveAuthBean.java, | ||||
org/hsqldb/auth/LdapAuthBean.java, | ||||
org/hsqldb/auth/LdapAuthBeanTester.java | ||||
'/> | ||||
<target name="javadoc" depends="-prepare-javadoc, switches, -clone-shared-so urces, -set-jvmvars" | <target name="javadoc" depends="-prepare-javadoc, -clone-shared-sources, -se t-jvmvars" | |||
description="Create javadoc for the distribution package"> | description="Create javadoc for the distribution package"> | |||
<!-- TODO: Find out why JDBCDriver class is listed twice in the class | ||||
list pane, but only when All Classes selected | ||||
only listed once if jdbc package is selected). --> | ||||
<javadoc | <javadoc | |||
destdir="doc/apidocs" | destdir="doc/apidocs" | |||
stylesheetfile="doc-src/apidocs/javadoc.css" | stylesheetfile="doc-src/apidocs/javadoc.css" | |||
docencoding="UTF-8" | docencoding="UTF-8" | |||
charset="UTF-8" | charset="UTF-8" | |||
author="true" | author="true" | |||
version="false" | version="false" | |||
use="true" | use="true" | |||
public="true" | public="true" | |||
failonerror="false" | failonerror="false" | |||
verbose="false" | verbose="false" | |||
windowtitle="${hsqldb.title} ${hsqldb.version} API" | windowtitle="${hsqldb.title} ${hsqldb.version} API" | |||
doctitle="${hsqldb.title} ${hsqldb.version}" | doctitle="${hsqldb.title} ${hsqldb.version}" | |||
bottom="<i>Copyright © 2001 - 2021 HSQL Development Group. </i>"> | bottom="<i>Copyright © 2001 - 2021 HSQL Development Group. </i>"> | |||
<sourcefiles id="javadocsources"/> | ||||
<classpath> | <classpath> | |||
<pathelement location="${servletapi.lib}"/> | <pathelement location="${servletapi.lib}"/> | |||
<pathelement location="${junit38.lib}"/> | <pathelement location="${junit38.lib}"/> | |||
</classpath> | </classpath> | |||
<packageset dir="${swsrc}"> | <packageset dir="${swsrc}"> | |||
<include name='org.hsqldb/auth'/> | <include name='org/hsqldb/auth'/> | |||
<include name='org/hsqldb/jdbc'/> | <include name='org/hsqldb/jdbc'/> | |||
<include name='org/hsqldb/jdbc/pool'/> | <include name='org/hsqldb/jdbc/pool'/> | |||
<include name='org/hsqldb/lib'/> | <include name='org/hsqldb/lib'/> | |||
<include name='org/hsqldb/lib/tar'/> | <include name='org/hsqldb/lib/tar'/> | |||
<include name='org/hsqldb/server'/> | <include name='org/hsqldb/server'/> | |||
<include name='org/hsqldb/trigger'/> | <include name='org/hsqldb/trigger'/> | |||
<include name='org.hsqldb/util'/> | <include name='org/hsqldb/util'/> | |||
</packageset> | </packageset> | |||
<tag name="todo" enabled="false"/> | <tag name="todo" enabled="false"/> | |||
<tag name="revised" enabled="false"/> | <tag name="revised" enabled="false"/> | |||
<tag name="jboss.xmbean" enabled="false"/> | <tag name="jboss.xmbean" enabled="false"/> | |||
<tag name="jmx.mbean" enabled="false"/> | <tag name="jmx.mbean" enabled="false"/> | |||
<tag name="jmx.managed-attribute" enabled="false"/> | <tag name="jmx.managed-attribute" enabled="false"/> | |||
<tag name="jmx.managed-operation" enabled="false"/> | <tag name="jmx.managed-operation" enabled="false"/> | |||
<tag name="jmx.managed-operation-parameter" enabled="false"/> | <tag name="jmx.managed-operation-parameter" enabled="false"/> | |||
</javadoc> | </javadoc> | |||
<fixcrlf preservelastmodified='true' eol="lf" encoding="UTF-8" | <fixcrlf preservelastmodified='true' eol="lf" encoding="UTF-8" | |||
srcdir="doc/apidocs" includes="**/*.css, **/*.html, **/package-list"/> | srcdir="doc/apidocs" includes="**/*.css, **/*.html, **/package-list"/> | |||
</target> | </target> | |||
<target name="javadocdev" | <target name="javadocdev" | |||
depends="-prepare-javadoc, switches, -clone-shared-sources,-set-jvmv ars" | depends="-prepare-javadoc, -clone-shared-sources,-set-jvmvars" | |||
description="Create javadoc for all HSQLDB code-base classes"> | description="Create javadoc for all HSQLDB code-base classes"> | |||
<!-- Since our preprocessor package compilatoin depends on the | <!-- Since our preprocessor package compilatoin depends on the | |||
env-specific ant runtime lib via includeAntRuntime=true, Javadoc | env-specific ant runtime lib via includeAntRuntime=true, Javadoc | |||
will fail to resolve Ant classes and produce error messages | will fail to resolve Ant classes and produce error messages | |||
accordingly. --> | accordingly. --> | |||
<javadoc | <javadoc | |||
destdir="doc/apidocs" | destdir="doc/apidocs" | |||
docencoding="UTF-8" | docencoding="UTF-8" | |||
stylesheetfile="doc-src/apidocs/javadoc.css" | stylesheetfile="doc-src/apidocs/javadoc.css" | |||
charset="UTF-8" | charset="UTF-8" | |||
skipping to change at line 1185 | skipping to change at line 1161 | |||
<!-- Purposefully not using the bndwrap task available for this purpose, | <!-- Purposefully not using the bndwrap task available for this purpose, | |||
because the docs don't explain how to use the attributes clearly enou gh | because the docs don't explain how to use the attributes clearly enou gh | |||
to figure out how to use it. --> | to figure out how to use it. --> | |||
<java failonerror="true" fork="true" dir="lib" classpath="${bndjar.file}" | <java failonerror="true" fork="true" dir="lib" classpath="${bndjar.file}" | |||
classname="aQute.bnd.main.bnd"> | classname="aQute.bnd.main.bnd"> | |||
<sysproperty key="hsqldb.version" value="${hsqldb.version}"/> | <sysproperty key="hsqldb.version" value="${hsqldb.version}"/> | |||
<sysproperty key="build.vendor" value="${user.name}"/> | <sysproperty key="build.vendor" value="${user.name}"/> | |||
<sysproperty key="build.description" value="${description}"/> | <sysproperty key="build.description" value="${description}"/> | |||
<sysproperty key="hsqldb.title" value="${hsqldb.title}"/> | <sysproperty key="hsqldb.title" value="${hsqldb.title}"/> | |||
<arg value="wrap"/> | <arg value="wrap"/> | |||
<arg value="-output"/> | <arg value="--output"/> | |||
<arg value="hsqldb-osgi.jar"/> | <arg value="hsqldb-osgi.jar"/> | |||
<arg value="-properties"/> | <arg value="--properties"/> | |||
<arg file="build/hsqldb.bnd"/> | <arg file="build/hsqldb.bnd"/> | |||
<arg value="hsqldb.jar"/> | <arg value="hsqldb.jar"/> | |||
</java> | </java> | |||
<delete file="lib/hsqldb.jar"/> | ||||
</target> | </target> | |||
</project> | </project> | |||
End of changes. 18 change blocks. | ||||
47 lines changed or deleted | 26 lines changed or added |