diff options
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 67 |
1 files changed, 56 insertions, 11 deletions
diff --git a/make/build.xml b/make/build.xml index aa3282b..3bf0b10 100644 --- a/make/build.xml +++ b/make/build.xml @@ -31,6 +31,7 @@ This requires the user-defined "antlr.jar" property. --> <path id="cc_gluegen.classpath"> <pathelement location="${antlr.jar}" /> + <pathelement location="${semver.jar}" /> </path> </target> @@ -59,6 +60,7 @@ <property name="project.root" value=".." /> <property name="src.java" value="${project.root}/src/java" /> <property name="src.antlr" value="${project.root}/src/antlr" /> + <property name="src.jcpp" value="${project.root}/jcpp/src/main/java" /> <property name="build" location="${project.root}/${rootrel.build}" /> <property name="javadoc.root.path" location="${build}/javadoc" /> @@ -142,6 +144,7 @@ <property name="java.part.nonjava" value="com/jogamp/common/util/bin/*" /> <property name="gluegen-rt.classes" value="com/jogamp/gluegen/runtime/**"/> <property name="jogamp.common.classes" value="com/jogamp/common/** jogamp/common/**"/> + <property name="java.part.jcpp" value="com/jogamp/gluegen/jcpp/**"/> <property name="gluegen.excludes.all" value="${gluegen.excludes.nsig} ${jogamp-android-launcher.classes}" /> </target> @@ -247,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"> @@ -274,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" /> @@ -322,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" > @@ -351,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"> @@ -377,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"> @@ -385,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" /> @@ -604,6 +608,7 @@ <uptodate property="gluegen.build.skip.java1"> <srcfiles dir= "." includes="*.xml"/> <srcfiles dir= "${src.java}" includes="**"/> + <srcfiles dir= "${src.jcpp}" includes="**"/> <srcfiles dir= "${c.grammar}" includes="*.g"/> <srcfiles dir= "${j.grammar}" includes="*.g"/> <mapper type="merge" to="${build}/gluegen.jar"/> @@ -611,6 +616,7 @@ <uptodate property="gluegen.build.skip.java2"> <srcfiles dir= "." includes="*.xml"/> <srcfiles dir= "${src.java}" includes="**"/> + <srcfiles dir= "${src.jcpp}" includes="**"/> <srcfiles dir= "${c.grammar}" includes="*.g"/> <srcfiles dir= "${j.grammar}" includes="*.g"/> <mapper type="merge" to="${build}/gluegen-rt.jar"/> @@ -739,10 +745,11 @@ excludes="${gluegen.excludes.all} ${gluegen-rt.classes} ${java.part.android}" memoryMaximumSize="${javac.memorymax}" encoding="UTF-8" - source="${target.sourcelevel}" + source="${target.sourcelevel}" target="${target.targetlevel}" bootclasspath="${host.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <src path="${src.jcpp}" /> <src path="${src.java}" /> <src path="${src.generated.java}" /> <classpath refid="cc_gluegen.classpath" /> @@ -788,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"> @@ -822,6 +855,7 @@ <include name="jogamp/common/**" /> <exclude name="${jogamp-android-launcher.classes}" /> <exclude name="${java.part.android}" /> + <exclude name="${java.part.jcpp}" /> </fileset> <fileset dir="resources/assets"> <include name="**" /> @@ -836,6 +870,7 @@ <include name="jogamp/common/**" /> <exclude name="${jogamp-android-launcher.classes}" /> <exclude name="${java.part.android}" /> + <exclude name="${java.part.jcpp}" /> </fileset> <fileset dir="resources/assets"> <include name="**" /> @@ -1033,7 +1068,7 @@ <delete dir="${javadoc.gluegen.path}" includeEmptyDirs="true" quiet="true" failonerror="false" /> <mkdir dir="${javadoc.gluegen.path}" /> <javadoc packagenames="com.jogamp.*" - sourcepath="${src.java};${src.generated.java}" + sourcepath="${src.java};${src.jcpp};${src.generated.java}" destdir="${javadoc.gluegen.path}" windowtitle="GlueGen Runtime Documentation" overview="../src/java/com/jogamp/gluegen/package.html" encoding="UTF-8" @@ -1065,14 +1100,18 @@ <zip destfile="${build}/gluegen-java-src.zip" level="0"> <fileset dir="${src.java}"/> <fileset dir="${build}/gensrc/java"/> + <fileset dir="${src.jcpp}"/> </zip> </target> <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"/> @@ -1086,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}/**" /> |