diff options
| author | Michael Bien <[email protected]> | 2011-04-20 01:41:56 +0200 |
|---|---|---|
| committer | Michael Bien <[email protected]> | 2011-04-20 01:41:56 +0200 |
| commit | bb3cc47fefe772fdb9977daf34d7f7289183ad7d (patch) | |
| tree | 47f87ad1a7f9d5f35bc23ee744e719db98ebbf89 | |
| parent | f1aeb2ca0440dc3a77943200f2f699802036196b (diff) | |
| parent | 0c3209367271dce8dd1996f159ed41f610ba88da (diff) | |
Merge branch 'master' of github.com:mbien/jocl-demos
| -rw-r--r-- | build.xml | 33 |
1 files changed, 22 insertions, 11 deletions
@@ -12,13 +12,13 @@ <import file="nbproject/build-impl.xml"/> <property file="nbproject/project.properties" /> - - <property environment="env" /> <!-- Pull in GlueGen cpptasks build file --> <import file="${gluegen.root}/make/gluegen-cpptasks.xml" /> + <import file="${gluegen.root}/make/jogamp-env.xml" /> + <import file="${gluegen.root}/make/jogamp-archivetasks.xml" /> - <target name="-pre-jar"> + <target name="-pre-jar" depends="jogamp.env.init"> <tstamp> <format property="version.timestamp" pattern="yyyyMMdd"/> </tstamp> @@ -31,17 +31,28 @@ <property name="jocl-demos.version" value="${jocl_demos_base_version}-b${jocl-demos.build.number}-${version.timestamp}" /> </target> - <target name="-post-jar" depends="tag.build,create-all-jnlps,gluegen.cpptasks.detect.os" unless="build.noarchives"> + <target name="-post-jar" depends="tag.build,create-all-jnlps,gluegen.cpptasks.detect.os,build-archive"/> + + <target name="build-archive" if="build.archiveon"> <property name="dist.zip.name" value="jocl-demos-${jocl-demos.version}-${os.and.arch}"/> - <zip destfile="${dist.dir}/${dist.zip.name}.zip"> - <zipfileset dir="${dist.dir}" includes="jocl-demos.jar" prefix="${dist.zip.name}/jar"/> - <zipfileset dir="${dist.dir}" includes="*.jnlp" prefix="${dist.zip.name}/jnlp-files"/> - <zipfileset dir="." includes="www/**" prefix="${dist.zip.name}"/> - <zipfileset dir="${dist.dir}" includes="*.properties" prefix="${dist.zip.name}"/> - </zip> - </target> + <mkdir dir="${dist.dir}/tmp/${dist.zip.name}"/> + + <copy todir="${dist.dir}/tmp/${dist.zip.name}/jar" file="${dist.dir}/jocl-demos.jar"/> + <copy todir="${dist.dir}/tmp/${dist.zip.name}/jnlp-files" > + <fileset dir="${dist.dir}" includes="*.jnlp"/> + </copy> + <copy todir="${dist.dir}/tmp/${dist.zip.name}" > + <fileset dir="." includes="www/**"/> + <fileset dir="${dist.dir}" includes="*.properties"/> + </copy> + + <zip basedir="${dist.dir}/tmp" destfile="${dist.dir}/${dist.zip.name}.zip"/> + <archive.7z basedir="${dist.dir}/tmp" destfile="${dist.dir}/${dist.zip.name}.7z" includes="*"/> + <delete dir="${dist.dir}/tmp"/> + + </target> <target name="create-all-jnlps"> |