diff options
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 54 |
1 files changed, 45 insertions, 9 deletions
diff --git a/make/build.xml b/make/build.xml index e92da5b..3bf0b10 100644 --- a/make/build.xml +++ b/make/build.xml @@ -250,7 +250,6 @@ <target name="declare.win32" depends="declare.win32.vc6,declare.win32.vc7,declare.win32.vc8,declare.win32.vc8_x64,declare.win32.vc9,declare.win32.mingw,declare.win64.mingw" if="isWindows" > <property name="c.src.dir.os" value="windows" /> - <property name="java.includes.dir.platform" value="${java.includes.dir}/win32" /> </target> <target name="declare.linux.x86" if="isLinuxX86"> @@ -277,6 +276,12 @@ <property name="linker.cfg.id" value="linker.cfg.linux.armv6" /> </target> + <target name="declare.linux.aarch64" if="isLinuxARM64"> + <echo message="Linux.aarch64" /> + <property name="compiler.cfg.id" value="compiler.cfg.linux.aarch64" /> + <property name="linker.cfg.id" value="linker.cfg.linux.aarch64" /> + </target> + <target name="declare.linux.alpha" if="isLinuxAlpha"> <echo message="Linux.alpha" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> @@ -325,9 +330,8 @@ <property name="linker.cfg.id" value="linker.cfg.linux.sparc" /> </target> - <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6" if="isLinux" > + <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6,declare.linux.aarch64" if="isLinux" > <property name="c.src.dir.os" value="unix" /> - <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> </target> <target name="declare.android" if="isAndroid" > @@ -354,7 +358,6 @@ <target name="declare.solaris" depends="declare.solaris32,declare.solarisSparcv9,declare.solarisAMD64" if="isSolaris" > <property name="c.src.dir.os" value="unix" /> - <property name="java.includes.dir.platform" value="${java.includes.dir}/solaris" /> </target> <target name="declare.macosx" if="isOSX"> @@ -380,7 +383,6 @@ <target name="declare.freebsd" depends="declare.freebsd.x86,declare.freebsd.amd64" if="isFreeBSD" > <property name="c.src.dir.os" value="unix" /> - <property name="java.includes.dir.platform" value="${java.includes.dir}/freebsd" /> </target> <target name="declare.hpux" if="isHPUX"> @@ -388,7 +390,6 @@ <property name="compiler.cfg.id" value="compiler.cfg.hpux" /> <property name="linker.cfg.id" value="linker.cfg.hpux" /> <property name="c.src.dir.os" value="unix" /> - <property name="java.includes.dir.hpux" value="${java.includes.dir}/hp-ux" /> </target> <target name="c.configure" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler,declare.win32,declare.linux,declare.android,declare.solaris,declare.macosx,declare.freebsd,declare.hpux,gluegen.cpptasks.configure.compiler" unless="build.javaonly" /> @@ -794,6 +795,32 @@ </filterset> </copy> + <copy file="jogamp-fat.mf" + tofile="${build}/jogamp-fat.mf" + overwrite="true"> + <filterset> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${gluegen.version}"/> + <filter token="SCM_BRANCH" value="${gluegen.build.branch}"/> + <filter token="SCM_COMMIT" value="${gluegen.build.commit}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}"/> + <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/> + </filterset> + </copy> + + <copy file="jogamp-fat-test.mf" + tofile="${build}/jogamp-fat-test.mf" + overwrite="true"> + <filterset> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${gluegen.version}"/> + <filter token="SCM_BRANCH" value="${gluegen.build.branch}"/> + <filter token="SCM_COMMIT" value="${gluegen.build.commit}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}"/> + <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/> + </filterset> + </copy> + <!-- copy file="Manifest-rt-alt" tofile="${build}/Manifest-rt-alt.temp" overwrite="true"> @@ -1080,8 +1107,11 @@ <target name="developer-zip-archive" depends="init,developer-src-zip" if="build.archiveon"> <delete includeEmptyDirs="true" quiet="true" dir="${archive}" failonerror="false" /> <mkdir dir="${archive}" /> - <copy file="${build}/artifact.properties" todir="${archive}"/> - <copy file="../LICENSE.txt" todir="${archive}" /> + <copy todir="${archive}"> + <fileset dir=".." includes="LICENSE.txt"/> + <fileset dir="${build}" includes="artifact.properties"/> + <fileset dir="${build}" includes="gluegen-java-src.zip"/> + </copy> <mkdir dir="${archive}/jar" /> <copy todir="${archive}/jar"> <fileset dir="${build}" includes="gluegen*.jar"/> @@ -1095,7 +1125,13 @@ <copy todir="${archive}/jnlp-files"> <fileset dir="${project.root}/jnlp-files" includes="*" /> </copy> - <copy todir="${archive}" file="${build}/gluegen-java-src.zip"/> + <mkdir dir="${archive}/dist" /> + <copy todir="${archive}/dist"> + <fileset dir="${build}" includes="jogamp-fat.mf"/> + <fileset dir="${build}" includes="jogamp-fat-test.mf"/> + <fileset dir="lib" includes="junit.jar"/> + </copy> + <archive.7z destfile="${build}/${archive.name}.7z" basedir="${build}" includes="${archive.name}/**" /> |