build-dist.xml (hsqldb-2.6.0) | : | build-dist.xml (hsqldb-2.6.1) | ||
---|---|---|---|---|
<?xml version="1.0"?> | <?xml version="1.0"?> | |||
<!-- | <!-- | |||
$Id: build-dist.xml 5329 2014-01-19 14:43:43Z unsaved $ | $Id: build-dist.xml 6365 2021-07-19 09:10:13Z fredt $ | |||
--> | --> | |||
<!-- N.b. the clean targets, even 'clean-all', do not clean the "dist" | <!-- N.b. the clean targets, even 'clean-all', do not clean the "dist" | |||
subdirectory. | subdirectory. | |||
IMPORTANT! This build file may not be invoked directly with Ant any more. | IMPORTANT! This build file may not be invoked directly with Ant any more. | |||
Instead, use the file "build-dist.gradle" with Gradle, and that will pull | Instead, use the file "build-dist.gradle" with Gradle, and that will pull | |||
in this file. Like this: | in this file. Like this: | |||
gradlew -b build-dist.gradle... | gradlew -b build-dist.gradle... | |||
skipping to change at line 71 | skipping to change at line 71 | |||
<filesmatch textfile="true" | <filesmatch textfile="true" | |||
file1="tmp/readme-svn.txt" file2="tmp/readme-generated.txt"/> | file1="tmp/readme-svn.txt" file2="tmp/readme-generated.txt"/> | |||
</condition> | </condition> | |||
<fail unless="_readme.ok">The 'readme.txt' file in your Subversion export co ntains the wrong product | <fail unless="_readme.ok">The 'readme.txt' file in your Subversion export co ntains the wrong product | |||
version. You should verify this. If the version is indeed wrong, you should | version. You should verify this. If the version is indeed wrong, you should | |||
abort this export, commit an updated 'readme.txt' from a work area, then retag | abort this export, commit an updated 'readme.txt' from a work area, then retag | |||
and re-export.</fail> | and re-export.</fail> | |||
</target> | </target> | |||
<target name="dist" | <target name="dist" | |||
depends="state-check, clean-all, javadoc, gen-docs, sqltool, hsqldb" | depends="state-check, clean-all, gen-docs, sqltool, osgi, javadoc" | |||
description="Build joint binary + source distribution zip package"> | description="Build joint binary + source distribution zip package"> | |||
<mkdir dir="dist"/> | <mkdir dir="dist"/> | |||
<property name="app.basedir" value="hsqldb-${hsqldb.version}"/> | <property name="app.basedir" value="hsqldb-${hsqldb.version}"/> | |||
<!-- Enforce platform-independent EOL policies on items that will be | <!-- Enforce platform-independent EOL policies on items that will be | |||
packed. Generated docs and everything under classes/ already | packed. Generated docs and everything under classes/ already | |||
have EOLs enforced. | have EOLs enforced. | |||
To make maintenance easier, please order by srcdir, and put that | To make maintenance easier, please order by srcdir, and put that | |||
attribute first. Much easier to find what you are interested this | attribute first. Much easier to find what you are interested this | |||
way. | way. | |||
skipping to change at line 136 | skipping to change at line 136 | |||
The problem is not with the umlauted character, but is the side-effect | The problem is not with the umlauted character, but is the side-effect | |||
of something else in the file. I can pull the umlauted "Zürich" | of something else in the file. I can pull the umlauted "Zürich" | |||
string out of that file and put it into its own UTF-8 file, and Ant | string out of that file and put it into its own UTF-8 file, and Ant | |||
can filter that just fine. --> | can filter that just fine. --> | |||
<fixcrlf srcdir="testrun" | <fixcrlf srcdir="testrun" | |||
preservelastmodified='true' eol="lf" encoding="UTF-8" | preservelastmodified='true' eol="lf" encoding="UTF-8" | |||
includes="**/*.sql, **/*.dsv, **/*.isql, **/*.nsql, **/*.inter, | includes="**/*.sql, **/*.dsv, **/*.isql, **/*.nsql, **/*.inter, | |||
**/*.bash, **/*.gradle, **/*.groovy" | **/*.bash, **/*.gradle, **/*.groovy" | |||
/> | /> | |||
<!-- This is a wasteful work-around to get Ant to zip the file with a | <move file="lib/hsqldb-osgi.jar" tofile="lib/hsqldb.jar"/> | |||
different name than "hsqldb-osgi.jar" --> | ||||
<!-- | ||||
<copy file="lib/hsqldb-osgi.jar" tofile="tmp/hsqldb.jar"/> | ||||
--> | ||||
<mkdir dir="data"/> | <mkdir dir="data"/> | |||
<zip destfile="dist/${app.basedir}.zip"> | <zip destfile="dist/${app.basedir}.zip"> | |||
<zipfileset prefix="${app.basedir}/hsqldb" dir="." | <zipfileset prefix="${app.basedir}/hsqldb" dir="." | |||
includes="**/*.cmd, **/*.bat, **/*.bash, **/*.sh, **/*.pl, | includes="**/*.cmd, **/*.bat, **/*.bash, **/*.sh, **/*.pl, | |||
**/*.php, **/*.init, **/*.py, build/gradlew, | **/*.php, **/*.init, **/*.py, build/gradlew, | |||
build/gradle-gui, **/*.groovy" | build/gradle-gui, **/*.groovy" | |||
filemode="0755" | filemode="0755" | |||
excludes="**/.*/**, build/local**, test-src/**, doc-src/**, | excludes="**/.*/**, build/local**, test-src/**, doc-src/**, | |||
*gradled*, build/gradle-app.setting, | *gradled*, build/gradle-app.setting, | |||
classes/**, dist/**, local*/**, tmp/**"/> | classes/**, dist/**, local*/**, tmp/**"/> | |||
skipping to change at line 162 | skipping to change at line 159 | |||
excludes="**/.*/**, **/*.cmd, **/*.bat, **/*.bash, **/*.sh, | excludes="**/.*/**, **/*.cmd, **/*.bat, **/*.bash, **/*.sh, | |||
test-src/**, **/*.pl, **/*.php, **/*.init, **/*.py, lib/** | test-src/**, **/*.pl, **/*.php, **/*.init, **/*.py, lib/** | |||
build/build.properties, build/local**, build/ivysettings.xml, | build/build.properties, build/local**, build/ivysettings.xml, | |||
classes/**, dist/**, local*/**, tmp/**, doc-src/**, | classes/**, dist/**, local*/**, tmp/**, doc-src/**, | |||
build/ivysettings.xml, stylesheets/rng-catalog.xml, | build/ivysettings.xml, stylesheets/rng-catalog.xml, | |||
build/gradle-gui, **/*.groovy, | build/gradle-gui, **/*.groovy, | |||
build/gradlew, *gradled*, build/gradle-app.setting"/> | build/gradlew, *gradled*, build/gradle-app.setting"/> | |||
<zipfileset prefix="${app.basedir}/hsqldb/doc-src" dir="doc-src" | <zipfileset prefix="${app.basedir}/hsqldb/doc-src" dir="doc-src" | |||
includes="changelist_2_0.txt,hsqldb_lic.txt,hypersonic_lic.txt "/> | includes="changelist_2_0.txt,hsqldb_lic.txt,hypersonic_lic.txt "/> | |||
<zipfileset prefix="${app.basedir}/hsqldb/lib" dir="lib" | <zipfileset prefix="${app.basedir}/hsqldb/lib" dir="lib" | |||
includes="sqltool.jar, servlet*.zip"/> | includes="sqltool*.jar, servlet*.zip"/> | |||
<zipfileset prefix="${app.basedir}/hsqldb/lib" dir="lib" | <zipfileset prefix="${app.basedir}/hsqldb/lib" dir="lib" | |||
includes="hsqldb*.jar"/> | includes="hsqldb*.jar"/> | |||
</zip> | </zip> | |||
<!-- Don't leave "tmp/hsqldb.jar" lying around, because it has a | ||||
misleading name and it is redundant. --> | ||||
<!-- | ||||
<delete file="tmp/hsqldb.jar"/> | ||||
--> | ||||
</target> | </target> | |||
</project> | </project> | |||
End of changes. 5 change blocks. | ||||
13 lines changed or deleted | 5 lines changed or added |