Loading .classpath +2 −2 Original line number Diff line number Diff line Loading @@ -13,9 +13,9 @@ <classpathentry kind="lib" path="libs/test/objenesis-1.0.jar"/> <classpathentry kind="lib" path="libs/test/testng-jdk15.jar"/> <classpathentry kind="lib" path="libs/build/ecj-4.6.1.jar"/> <classpathentry kind="lib" path="libs/prod/cisd-args4j-9.11.2.jar" sourcepath="libs/prod/cisd-args4j-9.11.2-sources.jar"/> <classpathentry kind="lib" path="libs/prod/commons-lang3-3.7.jar" sourcepath="libs/prod/commons-lang3-3.7-sources.jar"/> <classpathentry kind="lib" path="libs/prod/commons-io-2.6.jar" sourcepath="libs/prod/commons-io-2.6-sources.jar"/> <classpathentry kind="lib" path="libs/prod/sis-base-18.08.0.jar" sourcepath="libs/prod/sis-base-18.08.0-sources.jar"/> <classpathentry kind="lib" path="libs/prod/sis-base-18.09-pre1.jar" sourcepath="libs/prod/sis-base-18.09-pre1-sources.jar"/> <classpathentry kind="lib" path="libs/prod/args4j-2.33.jar"/> <classpathentry kind="output" path="targets/classes"/> </classpath> build.gradle +58 −37 Original line number Diff line number Diff line Loading @@ -11,8 +11,41 @@ tasks.withType(Test) { systemProperty "java.library.path", "libs/native/jhdf5/amd64-Linux:libs/native/jhdf5/amd64-Linux:libs/native/jhdf5/x86_64-Mac OS X:libs/native/jhdf5/x86_64-Mac OS X" } def execute(command, arguments) { new ByteArrayOutputStream().withStream { os -> print "execute: ${command}" arguments.collect({print " ${it}"}) println '' def result = exec { executable = command args = arguments standardOutput = os } return os.toString().split('\n') } } task processDistFiles( type: Copy) { into "$buildDir/output/dist" from ("dist") { exclude 'doc/JHDF5.odt' } from ("dist") { include 'doc/JHDF5.odt' rename { "JHDF5-${version}.odt" } } doLast { execute('lowriter', [ '--headless', '--convert-to', 'pdf', '--outdir', "$buildDir/output/dist/doc", "$buildDir/output/dist/doc/JHDF5-${version}.odt" ]) } } jar { baseName "${project.group}-jhdf5" exclude '**/HDF5ArchiverMain*.class' from('targets/dist') { include 'BUILD*INFO' } Loading @@ -21,9 +54,24 @@ jar { include 'native/jhdf5/**/**/*' } manifest { attributes 'Main-Class': 'ch.systemsx.cisd.base.BuildAndEnvironmentInfo' attributes 'Class-Path': configurations.runtime.filter { !(it.getName().contains("-sources") || it.getName().startsWith("cisd-args4j")) }.collect { it.getName() }.join(' ') } } task h5arCLIJar(type: Jar, dependsOn: [jar]) { archiveName "${project.group}-jhdf5-h5ar-cli-${version}.jar" from files(sourceSets.main.output.classesDir) { include '**/HDF5ArchiverMain*.class' } from('targets/dist') { include 'BUILD*INFO' } manifest { attributes 'Main-Class': 'ch.systemsx.cisd.hdf5.h5ar.HDF5ArchiverMain' attributes 'Class-Path': configurations.runtime.collect { it.getName().contains("-sources") ? "" : it.getName() + " " }.join('') attributes 'Class-Path': "${project.group}-jhdf5-${version}.jar " + configurations.runtime.filter { !it.getName().contains("-sources") }.collect { it.getName() }.join(' ') } } Loading Loading @@ -54,14 +102,15 @@ task myJavadoc(type: Javadoc, dependsOn: [compileJava]) { exclude "ch/systemsx/cisd/hdf5/ReflectionUtils.java" } task javadocJar(type: Jar, dependsOn: myJavadoc) { task javadocJar(type: Jar, dependsOn: [myJavadoc, processDistFiles]) { archiveName "${project.group}-jhdf5-javadoc-${project.version}.jar" from javadoc.destinationDir from ("sourceExamples/java") { include '**/*' } from ("dist/doc") { include 'JHDF5.pdf' from ("$buildDir/output/dist/doc") { include "JHDF5-${version}.pdf" rename { "JHDF5.pdf" } } from ("targets/dist") { Loading @@ -83,39 +132,7 @@ task exampleJar(type: Jar) { } def execute(command, arguments) { new ByteArrayOutputStream().withStream { os -> print "execute: ${command}" arguments.collect({print " ${it}"}) println '' def result = exec { executable = command args = arguments standardOutput = os } return os.toString().split('\n') } } task processDistFiles( type: Copy) { into "$buildDir/output/dist" from ("dist") { exclude 'doc/JHDF5.odt' } from ("dist") { include 'doc/JHDF5.odt' rename { "JHDF5-${version}.odt" } } doLast { execute('lowriter', [ '--headless', '--convert-to', 'pdf', '--outdir', "$buildDir/output/dist/doc", "$buildDir/output/dist/doc/JHDF5-${version}.odt" ]) } } task distributionZip(type: Zip, dependsOn: [jar, javadocJar, sourcesJar, exampleJar, processDistFiles]) { task distributionZip(type: Zip, dependsOn: [jar, h5arCLIJar, javadocJar, sourcesJar, exampleJar, processDistFiles]) { baseName "${project.group}-jhdf5" from('targets/dist') { Loading Loading @@ -160,6 +177,10 @@ task distributionZip(type: Zip, dependsOn: [jar, javadocJar, sourcesJar, example into "${project.group}-jhdf5/lib" } from (h5arCLIJar.archivePath) { into "${project.group}-jhdf5/lib" } from (configurations.runtime) { exclude '*restriction*' exclude '*bcel*' Loading build/antrun.shdeleted 100755 → 0 +0 −10 Original line number Diff line number Diff line #! /bin/bash SCRIPT="$0" if [ "${SCRIPT}" = "${SCRIPT#/}" ]; then SCRIPT="`pwd`/${SCRIPT#./}" fi BINDIR="${SCRIPT%/*}" BASEDIR=${BINDIR%/*} cd $BASEDIR ant -lib ../build_resources/lib/ecj.jar -f build/build.xml "$@" build/build.xmldeleted 100644 → 0 +0 −441 Original line number Diff line number Diff line <project name="jhdf5" default="dist" basedir=".."> <import file="../../build_resources/ant/build-common.xml" /> <project-classpath name="ecp" classes="${classes}:${lib}/junit4/junit.jar" /> <property name="mainfolder" value="sis-${ant.project.name}" /> <property name="distfolder" value="${ant.project.name}" /> <property name="jar.file" value="${dist}/sis-jhdf5.jar" /> <property name="dist.file" value="${dist}/sis-jhdf5" /> <property name="jar.batteries-included.filename" value="sis-jhdf5-batteries_included.jar" /> <property name="jar.batteries-included.file" value="${dist}/${jar.batteries-included.filename}" /> <property name="jar.core.file" value="${dist}/sis-jhdf5-core.jar" /> <property name="jar.tools.file" value="${dist}/sis-jhdf5-tools.jar" /> <property name="sources.examples" value="sourceExamples/java" /> <property name="src.zip.file" value="${dist}/sis-jhdf5-src.zip" /> <property name="examples.src.zip.file" value="${dist}/sis-jhdf5-examples-src.zip" /> <property name="javadoc.zip.file" value="${dist}/sis-jhdf5-javadoc.zip" /> <property name="test.jar.file" value="${dist}/sis-jhdf5-test.jar" /> <property name="lib" value="../libraries" /> <property name="original.dist" value="../${ant.project.name}/dist" /> <property name="nativesrc" value="libs/native" /> <property name="nativeroot" value="${targets}/ant" /> <property name="native" value="${nativeroot}/native" /> <property name="dist.hdf5" value="${dist}/${mainfolder}" /> <property name="dist.hdf5.lib" value="${dist.hdf5}/lib" /> <!-- // Compile Java classes using the Eclipse compiler // Note: THIS IS A PRIVATE TARGET. It isn't intended to be used in other build scripts. // Parameter: src = source folder --> <target name="_plain-compile"> <echo level="info">Compile all classes in ${basedir}/${src} and subfolders</echo> <javac srcdir="${src}" destdir="${classes}" classpath="${ecp}" source="1.7" target="1.7" encoding="UTF-8" debug="true"> <compilerarg line="-warn:none" /> </javac> <copy todir="${classes}"> <fileset dir="${src}"> <include name="**/*.xml" /> <include name="**/*.xsd" /> <include name="**/*.properties" /> <include name="**/*.jpg" /> <include name="**/*.png" /> <include name="**/*.gif" /> </fileset> </copy> </target> <target name="clean"> <delete dir="${dist}" /> <delete dir="${targets}/ant" /> </target> <target name="jar-test" depends="clean, compile-tests"> <mkdir dir="${dist.hdf5.lib}" /> <build-info revision="revision.number" version="version.number" clean="clean.flag" /> <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> <copy todir="${native}"> <fileset dir="${nativesrc}"> <include name="**/libjhdf5.so" /> <include name="**/libjhdf5.jnilib" /> <include name="**/jhdf5.dll" /> </fileset> </copy> <recursive-jar destfile="${test.jar.file}"> <fileset dir="${classes}"> <include name="**/*.class" /> <include name="${build.info.filename}" /> </fileset> <fileset dir="${nativeroot}"> <include name="native/**/*.so" /> <include name="native/**/*.jnilib" /> <include name="native/**/*.dll" /> </fileset> <fileset dir="${sources.test}/test/hdf5lib"> <include name="*.hdf" /> </fileset> <zipfileset src="${lib}/testng/testng-jdk15.jar" /> <zipfileset src="${lib}/junit4/junit.jar" /> <zipfileset src="${lib}/jmock/hamcrest/hamcrest-core.jar" /> <zipfileset src="${lib}/sis-base/sis-base.jar" /> <zipfileset src="${lib}/cisd-args4j/cisd-args4j.jar" /> <zipfileset src="${lib}/commons-lang/commons-lang.jar" /> <zipfileset src="${lib}/commons-io/commons-io.jar" /> <manifest> <attribute name="Main-Class" value="ch.systemsx.cisd.hdf5.HDF5RoundtripTest" /> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> </manifest> </recursive-jar> </target> <target name="jar-complete" depends="compile"> <mkdir dir="${dist.hdf5.lib}" /> <build-info revision="revision.number" version="version.number" clean="clean.flag" /> <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> <copy todir="${native}"> <fileset dir="${nativesrc}"> <include name="**/libjhdf5.so" /> <include name="**/libjhdf5.jnilib" /> <include name="**/jhdf5.dll" /> </fileset> </copy> <recursive-jar destfile="${jar.batteries-included.file}"> <fileset dir="${classes}"> <include name="${build.info.filename}" /> <include name="**/*.class" /> </fileset> <fileset dir="${nativeroot}"> <include name="native/**/*.so" /> <exclude name="native/**/*-SunOS/*.so" /> <include name="native/**/*.jnilib" /> <include name="native/**/*.dll" /> </fileset> <zipfileset src="${lib}/sis-base/sis-base.jar"> <exclude name="${build.info.filename}" /> <exclude name="native/**/*-SunOS/*.so" /> </zipfileset> <zipfileset src="${lib}/cisd-args4j/cisd-args4j.jar"> <exclude name="${build.info.filename}" /> <exclude name="**/AbstractBuildAndEnvironmentInfo.class" /> </zipfileset> <zipfileset src="${lib}/commons-lang/commons-lang.jar"> <exclude name="META-INF/LICENSE.txt" /> <exclude name="META-INF/NOTICE.txt" /> </zipfileset> <zipfileset src="${lib}/commons-io/commons-io.jar"> <exclude name="META-INF/LICENSE.txt" /> <exclude name="META-INF/NOTICE.txt" /> </zipfileset> <manifest> <attribute name="Main-Class" value="ch.systemsx.cisd.hdf5.h5ar.HDF5ArchiverMain" /> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> </manifest> </recursive-jar> <recursive-jar destfile="${jar.file}"> <fileset dir="${classes}"> <include name="${build.info.filename}" /> <include name="**/*.class" /> </fileset> <zipfileset src="${lib}/sis-base/sis-base.jar"> <exclude name="${build.info.filename}" /> <exclude name="native/**" /> </zipfileset> <zipfileset src="${lib}/cisd-args4j/cisd-args4j.jar"> <exclude name="${build.info.filename}" /> <exclude name="**/AbstractBuildAndEnvironmentInfo.class" /> </zipfileset> <zipfileset src="${lib}/commons-lang/commons-lang.jar"> <exclude name="META-INF/LICENSE.txt" /> <exclude name="META-INF/NOTICE.txt" /> </zipfileset> <zipfileset src="${lib}/commons-io/commons-io.jar"> <exclude name="META-INF/LICENSE.txt" /> <exclude name="META-INF/NOTICE.txt" /> </zipfileset> <manifest> <attribute name="Main-Class" value="ch.systemsx.cisd.hdf5.h5ar.HDF5ArchiverMain" /> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> <attribute name="Class-Path" value="hdf5-linux-intel.jar hdf5-macosx-intel.jar hdf5-windows-intel.jar" /> </manifest> </recursive-jar> </target> <target name="examples-src-zip"> <build-info revision="revision.number" version="version.number" clean="clean.flag" /> <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> <recursive-jar destfile="${examples.src.zip.file}"> <fileset dir="${classes}"> <include name="${build.info.filename}" /> </fileset> <fileset dir="${sources.examples}"> <include name="**/*.java" /> </fileset> <manifest> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> </manifest> </recursive-jar> </target> <target name="src-zip"> <build-info revision="revision.number" version="version.number" clean="clean.flag" /> <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> <recursive-jar destfile="${src.zip.file}"> <fileset dir="${classes}"> <include name="${build.info.filename}" /> </fileset> <fileset dir="${sources}"> <include name="**/*.java" /> </fileset> <manifest> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> </manifest> </recursive-jar> </target> <target name="jar-core" depends="compile"> <mkdir dir="${dist.hdf5.lib}" /> <build-info revision="revision.number" version="version.number" clean="clean.flag" /> <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> <jar destfile="${jar.core.file}"> <fileset dir="${classes}"> <include name="${build.info.filename}" /> <include name="**/*.class" /> <exclude name="**/io/*.class" /> <exclude name="**/h5ar/*.class" /> </fileset> <zipfileset src="${lib}/sis-base/sis-base.jar"> <include name="ch/systemsx/cisd/base/utilities/AbstractBuildAndEnvironmentInfo.class" /> </zipfileset> <manifest> <attribute name="Main-Class" value="ch.systemsx.cisd.hdf5.BuildAndEnvironmentInfo" /> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> </manifest> </jar> </target> <target name="jar-tools" depends="compile"> <mkdir dir="${dist.hdf5.lib}" /> <build-info revision="revision.number" version="version.number" clean="clean.flag" /> <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> <jar destfile="${jar.tools.file}"> <fileset dir="${classes}"> <include name="${build.info.filename}" /> <include name="**/io/*.class" /> <include name="**/h5ar/*.class" /> <include name="ch/systems/cisd/hdf5/BuildAndEnvironmentInfo*.class" /> </fileset> <zipfileset src="${lib}/sis-base/sis-base.jar"> <include name="ch/systemsx/cisd/base/utilities/AbstractBuildAndEnvironmentInfo.class" /> </zipfileset> <manifest> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> <attribute name="Main-Class" value="ch.systemsx.cisd.hdf5.h5ar.HDF5ArchiverMain" /> <attribute name="Class-Path" value="commons-lang.jar commons-io.jar sis-base.jar cisd-args4j.jar sis-jhdf5-core.jar hdf5-linux-intel.jar hdf5-macosx-intel.jar hdf5-windows-intel.jar" /> </manifest> </jar> </target> <target name="jar-all" depends="jar-complete, src-zip, examples-src-zip, jar-core, jar-tools, jar-platforms" /> <target name="jar-platforms" depends="jar-linux-intel, jar-macosx-intel, jar-windows-intel" /> <target name="jar-linux-intel" depends="compile"> <delete dir="${native}" /> <mkdir dir="${native}" /> <mkdir dir="${dist.hdf5.lib}" /> <build-info revision="revision.number" version="version.number" clean="clean.flag" /> <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> <copy todir="${native}"> <fileset dir="${nativesrc}"> <include name="jhdf5/i386-Linux/libjhdf5.so" /> <include name="jhdf5/amd64-Linux/libjhdf5.so" /> <include name="jhdf5/arm-Linux/libjhdf5.so" /> </fileset> </copy> <jar destfile="${dist}/hdf5-linux-intel.jar"> <fileset dir="${classes}"> <include name="${build.info.filename}" /> </fileset> <fileset dir="${nativeroot}"> <include name="native/**/*.so" /> </fileset> <zipfileset src="${lib}/sis-base/sis-base.jar"> <include name="ch/systemsx/cisd/base/utilities/BuildAndEnvironmentInfo.class" /> </zipfileset> <manifest> <attribute name="Main-Class" value="ch.systemsx.cisd.base.utilities.BuildAndEnvironmentInfo" /> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> </manifest> </jar> </target> <target name="jar-macosx-intel" depends="compile"> <delete dir="${native}" /> <mkdir dir="${native}" /> <mkdir dir="${dist.hdf5.lib}" /> <build-info revision="revision.number" version="version.number" clean="clean.flag" /> <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> <copy todir="${native}"> <fileset dir="${nativesrc}"> <include name="jhdf5/i386-Mac OS X/libjhdf5.jnilib" /> <include name="jhdf5/x86_64-Mac OS X/libjhdf5.jnilib" /> </fileset> </copy> <jar destfile="${dist}/hdf5-macosx-intel.jar"> <fileset dir="${classes}"> <include name="${build.info.filename}" /> </fileset> <fileset dir="${nativeroot}"> <include name="native/**/*.jnilib" /> </fileset> <zipfileset src="${lib}/sis-base/sis-base.jar"> <include name="ch/systemsx/cisd/base/utilities/BuildAndEnvironmentInfo.class" /> </zipfileset> <manifest> <attribute name="Main-Class" value="ch.systemsx.cisd.base.utilities.BuildAndEnvironmentInfo" /> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> </manifest> </jar> </target> <target name="jar-windows-intel" depends="compile"> <delete dir="${native}" /> <mkdir dir="${native}" /> <mkdir dir="${dist.hdf5.lib}" /> <build-info revision="revision.number" version="version.number" clean="clean.flag" /> <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> <copy todir="${native}"> <fileset dir="${nativesrc}"> <include name="jhdf5/x86-Windows/jhdf5.dll" /> <include name="jhdf5/amd64-Windows/jhdf5.dll" /> </fileset> </copy> <jar destfile="${dist}/hdf5-windows-intel.jar"> <fileset dir="${classes}"> <include name="${build.info.filename}" /> </fileset> <fileset dir="${nativeroot}"> <include name="native/**/*.dll" /> </fileset> <zipfileset src="${lib}/sis-base/sis-base.jar"> <include name="ch/systemsx/cisd/base/utilities/BuildAndEnvironmentInfo.class" /> </zipfileset> <manifest> <attribute name="Main-Class" value="ch.systemsx.cisd.base.utilities.BuildAndEnvironmentInfo" /> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> </manifest> </jar> </target> <target name="doc"> <delete dir="${targets}/doc" /> <delete dir="${targets}/source-base" /> <unzip src="../libraries/sis-base/sis-base-src.zip" dest="${targets}/source-base" /> <javadoc classpath="../base/targets/classes:../libraries/sis-base/sis-base.jar:../libraries/commons-lang/commons-lang.jar:../libraries/commons-io/commons-io.jar:../libraries/restrictionchecker/restrictions.jar:../libraries/cisd-args4j/cisd-args4j.jar" destdir="targets/doc" doctitle="JHDF5 14.12" author="false" overview="overview.html" access="public"> <fileset dir="source/java" defaultexcludes="yes"> <include name="ch/systemsx/cisd/hdf5/**/*.java" /> <include name="ncsa/hdf/hdf5lib/exceptions/**/*.java" /> <exclude name="ch/systemsx/cisd/hdf5/hdf5lib/**/*.java" /> <exclude name="ch/systemsx/cisd/hdf5/cleanup/**/*.java" /> <exclude name="ch/systemsx/cisd/hdf5/MatrixUtils.java" /> <exclude name="ch/systemsx/cisd/hdf5/StringUtils.java" /> <exclude name="ch/systemsx/cisd/hdf5/ReflectionUtils.java" /> <exclude name="ch/systemsx/cisd/hdf5/BitSetConversionUtils.java" /> </fileset> <fileset dir="${targets}/source-base" defaultexcludes="yes"> <include name="ch/systemsx/cisd/base/mdarray/**/*.java" /> </fileset> </javadoc> <copy todir="${targets}/doc"> <fileset dir="${sources.examples}" /> </copy> <copy file="${original.dist}/doc/JHDF5.pdf" todir="${targets}/doc" /> </target> <target name="dist" depends="clean, jar-all, doc"> <zip destfile="${javadoc.zip.file}" basedir="${targets}" includes="doc/**" /> <delete dir="${dist}/${mainfolder}" /> <copy file="${lib}/cisd-args4j/cisd-args4j.jar" todir="${dist}/${distfolder}/lib" /> <copy file="${lib}/sis-base/sis-base.jar" todir="${dist}/${distfolder}/lib" /> <copy file="${lib}/commons-lang/commons-lang.jar" todir="${dist}/${distfolder}/lib" /> <copy file="${lib}/commons-io/commons-io.jar" todir="${dist}/${distfolder}/lib" /> <move file="${jar.batteries-included.file}" todir="${dist}/${distfolder}/lib/batteries_included" /> <move file="${dist}/hdf5-linux-intel.jar" todir="${dist}/${distfolder}/lib/nativejar" /> <move file="${dist}/hdf5-macosx-intel.jar" todir="${dist}/${distfolder}/lib/nativejar" /> <move file="${dist}/hdf5-windows-intel.jar" todir="${dist}/${distfolder}/lib/nativejar" /> <move todir="${dist}/${distfolder}/lib"> <fileset dir="${dist}"> <include name="*.jar" /> </fileset> </move> <unzip src="${dist}/${distfolder}/lib/batteries_included/${jar.batteries-included.filename}" dest="${dist}/${distfolder}/lib"> <patternset> <include name="native/**" /> </patternset> </unzip> <move file="${src.zip.file}" todir="${dist}/${distfolder}/src" /> <move file="${javadoc.zip.file}" todir="${dist}/${distfolder}/doc" /> <move file="${examples.src.zip.file}" todir="${dist}/${distfolder}/doc" /> <copy todir="${dist}/${distfolder}"> <fileset dir="${original.dist}" /> </copy> <zip destfile="${dist.file}-${version.number}-r${revision.number}.zip"> <zipfileset dir="${dist}/${distfolder}" prefix="${mainfolder}" excludes="**/*.sh" /> <zipfileset dir="${dist}/${distfolder}" prefix="${mainfolder}" includes="**/*.sh" filemode="755" /> </zip> <delete dir="${dist}/${distfolder}" /> </target> <!-- // Task for continuous integration server. --> <target name="ci" depends="build-common.ci, check-dependencies" description="Task for continuous integration server." /> </project> dist/CONTENT +9 −6 Original line number Diff line number Diff line Loading @@ -42,13 +42,16 @@ Source Code: The source code of the Apache "Commons Lang3" library. Libraries: lib/sis-jhdf5.jar: The Java class files of the JHDF5 library, the h5ar archiver and the hdf5 native libraries. Requires commons-io-2.6.jar, commons-lang3-3.7.jar, sis-base-18.08.0.jar and cisd-args4j-9.11.2 (only needed for h5ar archiver) on the class path. lib/sis-base-18.08.0.jar The Java class files of the SIS base library. Requires commons-io-2.6.jar, commons-lang3-3.7.jar lib/sis-jhdf5-<VERSION>.jar: The Java class files of the JHDF5 library and the hdf5 native libraries. Requires commons-io-2.6.jar, commons-lang3-3.7.jar and sis-base-18.08.0.jar on the class path. lib/sis-jhdf5-h5ar-cli-<VERSION>.jar: The Java class files of the h5ar archiver command line interface application. Requires sis-jhdf5-<VERSION> and all its dependencies, as well as cisd-args4j-9.11.2 on the class path. lib/sis-base-18.08.0.jar The Java class files of the SIS base library. Requires commons-io-2.6.jar and commons-lang3-3.7.jar on the class path. lib/cisd-args4j-9.11.2.jar The Java class files of the CISD args4j library. lib/commons-lang3-3.7.jar Loading Loading
.classpath +2 −2 Original line number Diff line number Diff line Loading @@ -13,9 +13,9 @@ <classpathentry kind="lib" path="libs/test/objenesis-1.0.jar"/> <classpathentry kind="lib" path="libs/test/testng-jdk15.jar"/> <classpathentry kind="lib" path="libs/build/ecj-4.6.1.jar"/> <classpathentry kind="lib" path="libs/prod/cisd-args4j-9.11.2.jar" sourcepath="libs/prod/cisd-args4j-9.11.2-sources.jar"/> <classpathentry kind="lib" path="libs/prod/commons-lang3-3.7.jar" sourcepath="libs/prod/commons-lang3-3.7-sources.jar"/> <classpathentry kind="lib" path="libs/prod/commons-io-2.6.jar" sourcepath="libs/prod/commons-io-2.6-sources.jar"/> <classpathentry kind="lib" path="libs/prod/sis-base-18.08.0.jar" sourcepath="libs/prod/sis-base-18.08.0-sources.jar"/> <classpathentry kind="lib" path="libs/prod/sis-base-18.09-pre1.jar" sourcepath="libs/prod/sis-base-18.09-pre1-sources.jar"/> <classpathentry kind="lib" path="libs/prod/args4j-2.33.jar"/> <classpathentry kind="output" path="targets/classes"/> </classpath>
build.gradle +58 −37 Original line number Diff line number Diff line Loading @@ -11,8 +11,41 @@ tasks.withType(Test) { systemProperty "java.library.path", "libs/native/jhdf5/amd64-Linux:libs/native/jhdf5/amd64-Linux:libs/native/jhdf5/x86_64-Mac OS X:libs/native/jhdf5/x86_64-Mac OS X" } def execute(command, arguments) { new ByteArrayOutputStream().withStream { os -> print "execute: ${command}" arguments.collect({print " ${it}"}) println '' def result = exec { executable = command args = arguments standardOutput = os } return os.toString().split('\n') } } task processDistFiles( type: Copy) { into "$buildDir/output/dist" from ("dist") { exclude 'doc/JHDF5.odt' } from ("dist") { include 'doc/JHDF5.odt' rename { "JHDF5-${version}.odt" } } doLast { execute('lowriter', [ '--headless', '--convert-to', 'pdf', '--outdir', "$buildDir/output/dist/doc", "$buildDir/output/dist/doc/JHDF5-${version}.odt" ]) } } jar { baseName "${project.group}-jhdf5" exclude '**/HDF5ArchiverMain*.class' from('targets/dist') { include 'BUILD*INFO' } Loading @@ -21,9 +54,24 @@ jar { include 'native/jhdf5/**/**/*' } manifest { attributes 'Main-Class': 'ch.systemsx.cisd.base.BuildAndEnvironmentInfo' attributes 'Class-Path': configurations.runtime.filter { !(it.getName().contains("-sources") || it.getName().startsWith("cisd-args4j")) }.collect { it.getName() }.join(' ') } } task h5arCLIJar(type: Jar, dependsOn: [jar]) { archiveName "${project.group}-jhdf5-h5ar-cli-${version}.jar" from files(sourceSets.main.output.classesDir) { include '**/HDF5ArchiverMain*.class' } from('targets/dist') { include 'BUILD*INFO' } manifest { attributes 'Main-Class': 'ch.systemsx.cisd.hdf5.h5ar.HDF5ArchiverMain' attributes 'Class-Path': configurations.runtime.collect { it.getName().contains("-sources") ? "" : it.getName() + " " }.join('') attributes 'Class-Path': "${project.group}-jhdf5-${version}.jar " + configurations.runtime.filter { !it.getName().contains("-sources") }.collect { it.getName() }.join(' ') } } Loading Loading @@ -54,14 +102,15 @@ task myJavadoc(type: Javadoc, dependsOn: [compileJava]) { exclude "ch/systemsx/cisd/hdf5/ReflectionUtils.java" } task javadocJar(type: Jar, dependsOn: myJavadoc) { task javadocJar(type: Jar, dependsOn: [myJavadoc, processDistFiles]) { archiveName "${project.group}-jhdf5-javadoc-${project.version}.jar" from javadoc.destinationDir from ("sourceExamples/java") { include '**/*' } from ("dist/doc") { include 'JHDF5.pdf' from ("$buildDir/output/dist/doc") { include "JHDF5-${version}.pdf" rename { "JHDF5.pdf" } } from ("targets/dist") { Loading @@ -83,39 +132,7 @@ task exampleJar(type: Jar) { } def execute(command, arguments) { new ByteArrayOutputStream().withStream { os -> print "execute: ${command}" arguments.collect({print " ${it}"}) println '' def result = exec { executable = command args = arguments standardOutput = os } return os.toString().split('\n') } } task processDistFiles( type: Copy) { into "$buildDir/output/dist" from ("dist") { exclude 'doc/JHDF5.odt' } from ("dist") { include 'doc/JHDF5.odt' rename { "JHDF5-${version}.odt" } } doLast { execute('lowriter', [ '--headless', '--convert-to', 'pdf', '--outdir', "$buildDir/output/dist/doc", "$buildDir/output/dist/doc/JHDF5-${version}.odt" ]) } } task distributionZip(type: Zip, dependsOn: [jar, javadocJar, sourcesJar, exampleJar, processDistFiles]) { task distributionZip(type: Zip, dependsOn: [jar, h5arCLIJar, javadocJar, sourcesJar, exampleJar, processDistFiles]) { baseName "${project.group}-jhdf5" from('targets/dist') { Loading Loading @@ -160,6 +177,10 @@ task distributionZip(type: Zip, dependsOn: [jar, javadocJar, sourcesJar, example into "${project.group}-jhdf5/lib" } from (h5arCLIJar.archivePath) { into "${project.group}-jhdf5/lib" } from (configurations.runtime) { exclude '*restriction*' exclude '*bcel*' Loading
build/antrun.shdeleted 100755 → 0 +0 −10 Original line number Diff line number Diff line #! /bin/bash SCRIPT="$0" if [ "${SCRIPT}" = "${SCRIPT#/}" ]; then SCRIPT="`pwd`/${SCRIPT#./}" fi BINDIR="${SCRIPT%/*}" BASEDIR=${BINDIR%/*} cd $BASEDIR ant -lib ../build_resources/lib/ecj.jar -f build/build.xml "$@"
build/build.xmldeleted 100644 → 0 +0 −441 Original line number Diff line number Diff line <project name="jhdf5" default="dist" basedir=".."> <import file="../../build_resources/ant/build-common.xml" /> <project-classpath name="ecp" classes="${classes}:${lib}/junit4/junit.jar" /> <property name="mainfolder" value="sis-${ant.project.name}" /> <property name="distfolder" value="${ant.project.name}" /> <property name="jar.file" value="${dist}/sis-jhdf5.jar" /> <property name="dist.file" value="${dist}/sis-jhdf5" /> <property name="jar.batteries-included.filename" value="sis-jhdf5-batteries_included.jar" /> <property name="jar.batteries-included.file" value="${dist}/${jar.batteries-included.filename}" /> <property name="jar.core.file" value="${dist}/sis-jhdf5-core.jar" /> <property name="jar.tools.file" value="${dist}/sis-jhdf5-tools.jar" /> <property name="sources.examples" value="sourceExamples/java" /> <property name="src.zip.file" value="${dist}/sis-jhdf5-src.zip" /> <property name="examples.src.zip.file" value="${dist}/sis-jhdf5-examples-src.zip" /> <property name="javadoc.zip.file" value="${dist}/sis-jhdf5-javadoc.zip" /> <property name="test.jar.file" value="${dist}/sis-jhdf5-test.jar" /> <property name="lib" value="../libraries" /> <property name="original.dist" value="../${ant.project.name}/dist" /> <property name="nativesrc" value="libs/native" /> <property name="nativeroot" value="${targets}/ant" /> <property name="native" value="${nativeroot}/native" /> <property name="dist.hdf5" value="${dist}/${mainfolder}" /> <property name="dist.hdf5.lib" value="${dist.hdf5}/lib" /> <!-- // Compile Java classes using the Eclipse compiler // Note: THIS IS A PRIVATE TARGET. It isn't intended to be used in other build scripts. // Parameter: src = source folder --> <target name="_plain-compile"> <echo level="info">Compile all classes in ${basedir}/${src} and subfolders</echo> <javac srcdir="${src}" destdir="${classes}" classpath="${ecp}" source="1.7" target="1.7" encoding="UTF-8" debug="true"> <compilerarg line="-warn:none" /> </javac> <copy todir="${classes}"> <fileset dir="${src}"> <include name="**/*.xml" /> <include name="**/*.xsd" /> <include name="**/*.properties" /> <include name="**/*.jpg" /> <include name="**/*.png" /> <include name="**/*.gif" /> </fileset> </copy> </target> <target name="clean"> <delete dir="${dist}" /> <delete dir="${targets}/ant" /> </target> <target name="jar-test" depends="clean, compile-tests"> <mkdir dir="${dist.hdf5.lib}" /> <build-info revision="revision.number" version="version.number" clean="clean.flag" /> <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> <copy todir="${native}"> <fileset dir="${nativesrc}"> <include name="**/libjhdf5.so" /> <include name="**/libjhdf5.jnilib" /> <include name="**/jhdf5.dll" /> </fileset> </copy> <recursive-jar destfile="${test.jar.file}"> <fileset dir="${classes}"> <include name="**/*.class" /> <include name="${build.info.filename}" /> </fileset> <fileset dir="${nativeroot}"> <include name="native/**/*.so" /> <include name="native/**/*.jnilib" /> <include name="native/**/*.dll" /> </fileset> <fileset dir="${sources.test}/test/hdf5lib"> <include name="*.hdf" /> </fileset> <zipfileset src="${lib}/testng/testng-jdk15.jar" /> <zipfileset src="${lib}/junit4/junit.jar" /> <zipfileset src="${lib}/jmock/hamcrest/hamcrest-core.jar" /> <zipfileset src="${lib}/sis-base/sis-base.jar" /> <zipfileset src="${lib}/cisd-args4j/cisd-args4j.jar" /> <zipfileset src="${lib}/commons-lang/commons-lang.jar" /> <zipfileset src="${lib}/commons-io/commons-io.jar" /> <manifest> <attribute name="Main-Class" value="ch.systemsx.cisd.hdf5.HDF5RoundtripTest" /> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> </manifest> </recursive-jar> </target> <target name="jar-complete" depends="compile"> <mkdir dir="${dist.hdf5.lib}" /> <build-info revision="revision.number" version="version.number" clean="clean.flag" /> <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> <copy todir="${native}"> <fileset dir="${nativesrc}"> <include name="**/libjhdf5.so" /> <include name="**/libjhdf5.jnilib" /> <include name="**/jhdf5.dll" /> </fileset> </copy> <recursive-jar destfile="${jar.batteries-included.file}"> <fileset dir="${classes}"> <include name="${build.info.filename}" /> <include name="**/*.class" /> </fileset> <fileset dir="${nativeroot}"> <include name="native/**/*.so" /> <exclude name="native/**/*-SunOS/*.so" /> <include name="native/**/*.jnilib" /> <include name="native/**/*.dll" /> </fileset> <zipfileset src="${lib}/sis-base/sis-base.jar"> <exclude name="${build.info.filename}" /> <exclude name="native/**/*-SunOS/*.so" /> </zipfileset> <zipfileset src="${lib}/cisd-args4j/cisd-args4j.jar"> <exclude name="${build.info.filename}" /> <exclude name="**/AbstractBuildAndEnvironmentInfo.class" /> </zipfileset> <zipfileset src="${lib}/commons-lang/commons-lang.jar"> <exclude name="META-INF/LICENSE.txt" /> <exclude name="META-INF/NOTICE.txt" /> </zipfileset> <zipfileset src="${lib}/commons-io/commons-io.jar"> <exclude name="META-INF/LICENSE.txt" /> <exclude name="META-INF/NOTICE.txt" /> </zipfileset> <manifest> <attribute name="Main-Class" value="ch.systemsx.cisd.hdf5.h5ar.HDF5ArchiverMain" /> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> </manifest> </recursive-jar> <recursive-jar destfile="${jar.file}"> <fileset dir="${classes}"> <include name="${build.info.filename}" /> <include name="**/*.class" /> </fileset> <zipfileset src="${lib}/sis-base/sis-base.jar"> <exclude name="${build.info.filename}" /> <exclude name="native/**" /> </zipfileset> <zipfileset src="${lib}/cisd-args4j/cisd-args4j.jar"> <exclude name="${build.info.filename}" /> <exclude name="**/AbstractBuildAndEnvironmentInfo.class" /> </zipfileset> <zipfileset src="${lib}/commons-lang/commons-lang.jar"> <exclude name="META-INF/LICENSE.txt" /> <exclude name="META-INF/NOTICE.txt" /> </zipfileset> <zipfileset src="${lib}/commons-io/commons-io.jar"> <exclude name="META-INF/LICENSE.txt" /> <exclude name="META-INF/NOTICE.txt" /> </zipfileset> <manifest> <attribute name="Main-Class" value="ch.systemsx.cisd.hdf5.h5ar.HDF5ArchiverMain" /> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> <attribute name="Class-Path" value="hdf5-linux-intel.jar hdf5-macosx-intel.jar hdf5-windows-intel.jar" /> </manifest> </recursive-jar> </target> <target name="examples-src-zip"> <build-info revision="revision.number" version="version.number" clean="clean.flag" /> <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> <recursive-jar destfile="${examples.src.zip.file}"> <fileset dir="${classes}"> <include name="${build.info.filename}" /> </fileset> <fileset dir="${sources.examples}"> <include name="**/*.java" /> </fileset> <manifest> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> </manifest> </recursive-jar> </target> <target name="src-zip"> <build-info revision="revision.number" version="version.number" clean="clean.flag" /> <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> <recursive-jar destfile="${src.zip.file}"> <fileset dir="${classes}"> <include name="${build.info.filename}" /> </fileset> <fileset dir="${sources}"> <include name="**/*.java" /> </fileset> <manifest> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> </manifest> </recursive-jar> </target> <target name="jar-core" depends="compile"> <mkdir dir="${dist.hdf5.lib}" /> <build-info revision="revision.number" version="version.number" clean="clean.flag" /> <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> <jar destfile="${jar.core.file}"> <fileset dir="${classes}"> <include name="${build.info.filename}" /> <include name="**/*.class" /> <exclude name="**/io/*.class" /> <exclude name="**/h5ar/*.class" /> </fileset> <zipfileset src="${lib}/sis-base/sis-base.jar"> <include name="ch/systemsx/cisd/base/utilities/AbstractBuildAndEnvironmentInfo.class" /> </zipfileset> <manifest> <attribute name="Main-Class" value="ch.systemsx.cisd.hdf5.BuildAndEnvironmentInfo" /> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> </manifest> </jar> </target> <target name="jar-tools" depends="compile"> <mkdir dir="${dist.hdf5.lib}" /> <build-info revision="revision.number" version="version.number" clean="clean.flag" /> <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> <jar destfile="${jar.tools.file}"> <fileset dir="${classes}"> <include name="${build.info.filename}" /> <include name="**/io/*.class" /> <include name="**/h5ar/*.class" /> <include name="ch/systems/cisd/hdf5/BuildAndEnvironmentInfo*.class" /> </fileset> <zipfileset src="${lib}/sis-base/sis-base.jar"> <include name="ch/systemsx/cisd/base/utilities/AbstractBuildAndEnvironmentInfo.class" /> </zipfileset> <manifest> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> <attribute name="Main-Class" value="ch.systemsx.cisd.hdf5.h5ar.HDF5ArchiverMain" /> <attribute name="Class-Path" value="commons-lang.jar commons-io.jar sis-base.jar cisd-args4j.jar sis-jhdf5-core.jar hdf5-linux-intel.jar hdf5-macosx-intel.jar hdf5-windows-intel.jar" /> </manifest> </jar> </target> <target name="jar-all" depends="jar-complete, src-zip, examples-src-zip, jar-core, jar-tools, jar-platforms" /> <target name="jar-platforms" depends="jar-linux-intel, jar-macosx-intel, jar-windows-intel" /> <target name="jar-linux-intel" depends="compile"> <delete dir="${native}" /> <mkdir dir="${native}" /> <mkdir dir="${dist.hdf5.lib}" /> <build-info revision="revision.number" version="version.number" clean="clean.flag" /> <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> <copy todir="${native}"> <fileset dir="${nativesrc}"> <include name="jhdf5/i386-Linux/libjhdf5.so" /> <include name="jhdf5/amd64-Linux/libjhdf5.so" /> <include name="jhdf5/arm-Linux/libjhdf5.so" /> </fileset> </copy> <jar destfile="${dist}/hdf5-linux-intel.jar"> <fileset dir="${classes}"> <include name="${build.info.filename}" /> </fileset> <fileset dir="${nativeroot}"> <include name="native/**/*.so" /> </fileset> <zipfileset src="${lib}/sis-base/sis-base.jar"> <include name="ch/systemsx/cisd/base/utilities/BuildAndEnvironmentInfo.class" /> </zipfileset> <manifest> <attribute name="Main-Class" value="ch.systemsx.cisd.base.utilities.BuildAndEnvironmentInfo" /> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> </manifest> </jar> </target> <target name="jar-macosx-intel" depends="compile"> <delete dir="${native}" /> <mkdir dir="${native}" /> <mkdir dir="${dist.hdf5.lib}" /> <build-info revision="revision.number" version="version.number" clean="clean.flag" /> <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> <copy todir="${native}"> <fileset dir="${nativesrc}"> <include name="jhdf5/i386-Mac OS X/libjhdf5.jnilib" /> <include name="jhdf5/x86_64-Mac OS X/libjhdf5.jnilib" /> </fileset> </copy> <jar destfile="${dist}/hdf5-macosx-intel.jar"> <fileset dir="${classes}"> <include name="${build.info.filename}" /> </fileset> <fileset dir="${nativeroot}"> <include name="native/**/*.jnilib" /> </fileset> <zipfileset src="${lib}/sis-base/sis-base.jar"> <include name="ch/systemsx/cisd/base/utilities/BuildAndEnvironmentInfo.class" /> </zipfileset> <manifest> <attribute name="Main-Class" value="ch.systemsx.cisd.base.utilities.BuildAndEnvironmentInfo" /> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> </manifest> </jar> </target> <target name="jar-windows-intel" depends="compile"> <delete dir="${native}" /> <mkdir dir="${native}" /> <mkdir dir="${dist.hdf5.lib}" /> <build-info revision="revision.number" version="version.number" clean="clean.flag" /> <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo> <copy todir="${native}"> <fileset dir="${nativesrc}"> <include name="jhdf5/x86-Windows/jhdf5.dll" /> <include name="jhdf5/amd64-Windows/jhdf5.dll" /> </fileset> </copy> <jar destfile="${dist}/hdf5-windows-intel.jar"> <fileset dir="${classes}"> <include name="${build.info.filename}" /> </fileset> <fileset dir="${nativeroot}"> <include name="native/**/*.dll" /> </fileset> <zipfileset src="${lib}/sis-base/sis-base.jar"> <include name="ch/systemsx/cisd/base/utilities/BuildAndEnvironmentInfo.class" /> </zipfileset> <manifest> <attribute name="Main-Class" value="ch.systemsx.cisd.base.utilities.BuildAndEnvironmentInfo" /> <attribute name="Version" value="${version.number}" /> <attribute name="Build-Number" value="${version.number} (r${revision.number},${clean.flag})" /> </manifest> </jar> </target> <target name="doc"> <delete dir="${targets}/doc" /> <delete dir="${targets}/source-base" /> <unzip src="../libraries/sis-base/sis-base-src.zip" dest="${targets}/source-base" /> <javadoc classpath="../base/targets/classes:../libraries/sis-base/sis-base.jar:../libraries/commons-lang/commons-lang.jar:../libraries/commons-io/commons-io.jar:../libraries/restrictionchecker/restrictions.jar:../libraries/cisd-args4j/cisd-args4j.jar" destdir="targets/doc" doctitle="JHDF5 14.12" author="false" overview="overview.html" access="public"> <fileset dir="source/java" defaultexcludes="yes"> <include name="ch/systemsx/cisd/hdf5/**/*.java" /> <include name="ncsa/hdf/hdf5lib/exceptions/**/*.java" /> <exclude name="ch/systemsx/cisd/hdf5/hdf5lib/**/*.java" /> <exclude name="ch/systemsx/cisd/hdf5/cleanup/**/*.java" /> <exclude name="ch/systemsx/cisd/hdf5/MatrixUtils.java" /> <exclude name="ch/systemsx/cisd/hdf5/StringUtils.java" /> <exclude name="ch/systemsx/cisd/hdf5/ReflectionUtils.java" /> <exclude name="ch/systemsx/cisd/hdf5/BitSetConversionUtils.java" /> </fileset> <fileset dir="${targets}/source-base" defaultexcludes="yes"> <include name="ch/systemsx/cisd/base/mdarray/**/*.java" /> </fileset> </javadoc> <copy todir="${targets}/doc"> <fileset dir="${sources.examples}" /> </copy> <copy file="${original.dist}/doc/JHDF5.pdf" todir="${targets}/doc" /> </target> <target name="dist" depends="clean, jar-all, doc"> <zip destfile="${javadoc.zip.file}" basedir="${targets}" includes="doc/**" /> <delete dir="${dist}/${mainfolder}" /> <copy file="${lib}/cisd-args4j/cisd-args4j.jar" todir="${dist}/${distfolder}/lib" /> <copy file="${lib}/sis-base/sis-base.jar" todir="${dist}/${distfolder}/lib" /> <copy file="${lib}/commons-lang/commons-lang.jar" todir="${dist}/${distfolder}/lib" /> <copy file="${lib}/commons-io/commons-io.jar" todir="${dist}/${distfolder}/lib" /> <move file="${jar.batteries-included.file}" todir="${dist}/${distfolder}/lib/batteries_included" /> <move file="${dist}/hdf5-linux-intel.jar" todir="${dist}/${distfolder}/lib/nativejar" /> <move file="${dist}/hdf5-macosx-intel.jar" todir="${dist}/${distfolder}/lib/nativejar" /> <move file="${dist}/hdf5-windows-intel.jar" todir="${dist}/${distfolder}/lib/nativejar" /> <move todir="${dist}/${distfolder}/lib"> <fileset dir="${dist}"> <include name="*.jar" /> </fileset> </move> <unzip src="${dist}/${distfolder}/lib/batteries_included/${jar.batteries-included.filename}" dest="${dist}/${distfolder}/lib"> <patternset> <include name="native/**" /> </patternset> </unzip> <move file="${src.zip.file}" todir="${dist}/${distfolder}/src" /> <move file="${javadoc.zip.file}" todir="${dist}/${distfolder}/doc" /> <move file="${examples.src.zip.file}" todir="${dist}/${distfolder}/doc" /> <copy todir="${dist}/${distfolder}"> <fileset dir="${original.dist}" /> </copy> <zip destfile="${dist.file}-${version.number}-r${revision.number}.zip"> <zipfileset dir="${dist}/${distfolder}" prefix="${mainfolder}" excludes="**/*.sh" /> <zipfileset dir="${dist}/${distfolder}" prefix="${mainfolder}" includes="**/*.sh" filemode="755" /> </zip> <delete dir="${dist}/${distfolder}" /> </target> <!-- // Task for continuous integration server. --> <target name="ci" depends="build-common.ci, check-dependencies" description="Task for continuous integration server." /> </project>
dist/CONTENT +9 −6 Original line number Diff line number Diff line Loading @@ -42,13 +42,16 @@ Source Code: The source code of the Apache "Commons Lang3" library. Libraries: lib/sis-jhdf5.jar: The Java class files of the JHDF5 library, the h5ar archiver and the hdf5 native libraries. Requires commons-io-2.6.jar, commons-lang3-3.7.jar, sis-base-18.08.0.jar and cisd-args4j-9.11.2 (only needed for h5ar archiver) on the class path. lib/sis-base-18.08.0.jar The Java class files of the SIS base library. Requires commons-io-2.6.jar, commons-lang3-3.7.jar lib/sis-jhdf5-<VERSION>.jar: The Java class files of the JHDF5 library and the hdf5 native libraries. Requires commons-io-2.6.jar, commons-lang3-3.7.jar and sis-base-18.08.0.jar on the class path. lib/sis-jhdf5-h5ar-cli-<VERSION>.jar: The Java class files of the h5ar archiver command line interface application. Requires sis-jhdf5-<VERSION> and all its dependencies, as well as cisd-args4j-9.11.2 on the class path. lib/sis-base-18.08.0.jar The Java class files of the SIS base library. Requires commons-io-2.6.jar and commons-lang3-3.7.jar on the class path. lib/cisd-args4j-9.11.2.jar The Java class files of the CISD args4j library. lib/commons-lang3-3.7.jar Loading