diff options
| -rw-r--r-- | build.xml | 32 | ||||
| -rw-r--r-- | manifest.mf | 6 | ||||
| -rw-r--r-- | manifest_template.mf | 10 | ||||
| -rw-r--r-- | nbproject/project.properties | 5 |
4 files changed, 45 insertions, 8 deletions
@@ -87,6 +87,27 @@ <target name="-post-compile" depends="c.compile.default" /> + <target name="-pre-jar"> + + <property name="jocl.build.number" value="CUSTOM" /> + <property name="jocl.scm.branch" value="unknown" /> + <property name="jocl.scm.commit" value="unknown" /> + + <tstamp> + <format property="version.timestamp" pattern="yyyyMMdd"/> + </tstamp> + + <property name="jocl.version" value="${jocl_base_version}-b${jocl.build.number}-${version.timestamp}" /> + + <copy file="${basedir}/manifest_template.mf" tofile="${rootrel.build}/manifest.mf"> + <filterset> + <filter token="VERSION" value="${jocl.version}"/> + <filter token="SCM_BRANCH" value="${jocl.scm.branch}"/> + <filter token="SCM_COMMIT" value="${jocl.scm.commit}"/> + </filterset> + </copy> + </target> + <target name="-post-jar" depends="jar.natives,tag.build"> <property name="jocl.jnlp.codebase" value="http://jogamp.org/deployment/webstart-next/jocl"/> @@ -99,6 +120,15 @@ </filterchain> </copy> + <zip destfile="${dist.dir}/jocl-${jocl.version}-${os.and.arch}.zip"> + <fileset dir="${dist.dir}"> + <include name="*.jar"/> + <include name="*.jnlp"/> + <include name="*.properties"/> + <include name="lib/*"/> + </fileset> + </zip> + </target> <target name="tag.build"> @@ -112,7 +142,7 @@ <jar basedir="${natives.jocl.dir}/${namespace}" excludes="*.xml" destfile="${dist.jar.dir}/jocl-natives-${os.and.arch}.jar" - manifest="${basedir}/manifest.mf" /> + manifest="${rootrel.build}/manifest.mf" /> </target> diff --git a/manifest.mf b/manifest.mf deleted file mode 100644 index eecf55bc..00000000 --- a/manifest.mf +++ /dev/null @@ -1,6 +0,0 @@ -Manifest-Version: 1.0 -Implementation-Version: 0.1 -Implementation-Vendor: JogAmp community -Implementation-Vendor-Id: com.jogamp -Extension-Name: com.jogamp.opencl -Trusted-Library: true
\ No newline at end of file diff --git a/manifest_template.mf b/manifest_template.mf new file mode 100644 index 00000000..b284cf68 --- /dev/null +++ b/manifest_template.mf @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Implementation-Title: Java Bindings for OpenCL +Implementation-Version: @VERSION@ +Implementation-Branch: @SCM_BRANCH@ +Implementation-Commit: @SCM_COMMIT@ +Implementation-Vendor: JogAmp community +Implementation-Vendor-Id: com.jogamp +Specification-Vendor: JogAmp community +Extension-Name: com.jogamp.opencl +Trusted-Library: true diff --git a/nbproject/project.properties b/nbproject/project.properties index c5775e65..3e5d27b4 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -75,7 +75,7 @@ jnlp.enabled=false jnlp.offline-allowed=false jnlp.signed=false main.class=com.jogamp.opencl.util.CLInfo -manifest.file=manifest.mf +manifest.file=build/manifest.mf meta.inf.dir=${src.dir}/META-INF platform.active=default_platform run.classpath=\ @@ -103,6 +103,9 @@ src.java.dir=gensrc/java src.native.dir=gensrc/native test.src.dir=test +#the jocl version you are building +jocl_base_version=0.9 + #crosscompile=true #enable compiletime linking |