Author: sylvestre
Date: 2011-11-21 23:50:41 +0000 (Mon, 21 Nov 2011)
New Revision: 15430
Added:
trunk/gluegen2/debian/patches/TARGET_JAVA_LIBS_disabled.diff
trunk/gluegen2/debian/patches/hideException.diff
Modified:
trunk/gluegen2/debian/changelog
trunk/gluegen2/debian/control
trunk/gluegen2/debian/patches/series
Log:
* Fix an issue under Arm and an other one for sparc which were causing issues
with the jogl build
-- Sylvestre Ledru <sylves...@debian.org> Tue, 22 Nov 2011 00:40:19 +0100
gluegen2 (2.0-rc3-5) unstable; urgency=low
* Add dependency between libgluegen2-rt-java => libgluegen2-jni
* Disable the display of the cache jar exception
Modified: trunk/gluegen2/debian/changelog
===================================================================
--- trunk/gluegen2/debian/changelog 2011-11-21 08:19:41 UTC (rev 15429)
+++ trunk/gluegen2/debian/changelog 2011-11-21 23:50:41 UTC (rev 15430)
@@ -1,3 +1,17 @@
+gluegen2 (2.0-rc3-6) unstable; urgency=low
+
+ * Fix an issue under Arm and an other one for sparc which were causing issues
+ with the jogl build
+
+ -- Sylvestre Ledru <sylves...@debian.org> Tue, 22 Nov 2011 00:40:19 +0100
+
+gluegen2 (2.0-rc3-5) unstable; urgency=low
+
+ * Add dependency between libgluegen2-rt-java => libgluegen2-jni
+ * Disable the display of the cache jar exception
+
+ -- Sylvestre Ledru <sylves...@debian.org> Sun, 20 Nov 2011 17:59:48 +0100
+
gluegen2 (2.0-rc3-4) unstable; urgency=low
* Grrr, now, compiler.cfg.linux is factorized for the other archs
Modified: trunk/gluegen2/debian/control
===================================================================
--- trunk/gluegen2/debian/control 2011-11-21 08:19:41 UTC (rev 15429)
+++ trunk/gluegen2/debian/control 2011-11-21 23:50:41 UTC (rev 15430)
@@ -13,7 +13,7 @@
Package: libgluegen2-rt-java
Architecture: all
Suggests: libgluegen2-doc
-Depends: ${misc:Depends}, antlr
+Depends: ${misc:Depends}, antlr, libgluegen2-jni
Description: Tool to automatically generate the Java and JNI code.
Gluegen reads as input ANSI C header files and separate configuration files
which provide control over many aspects of the glue code generation. GlueGen
Added: trunk/gluegen2/debian/patches/TARGET_JAVA_LIBS_disabled.diff
===================================================================
--- trunk/gluegen2/debian/patches/TARGET_JAVA_LIBS_disabled.diff
(rev 0)
+++ trunk/gluegen2/debian/patches/TARGET_JAVA_LIBS_disabled.diff
2011-11-21 23:50:41 UTC (rev 15430)
@@ -0,0 +1,30 @@
+Index: gluegen2-2.0-rc3/make/gluegen-cpptasks-base.xml
+===================================================================
+--- gluegen2-2.0-rc3.orig/make/gluegen-cpptasks-base.xml 2011-11-20
17:13:25.000000000 +0100
++++ gluegen2-2.0-rc3/make/gluegen-cpptasks-base.xml 2011-11-22
00:39:36.011692419 +0100
+@@ -1147,14 +1147,14 @@
+ <echo message="Linux.alpha" />
+ <property name="compiler.cfg.id.base"
value="compiler.cfg.linux.alpha" />
+ <property name="linker.cfg.id.base"
value="linker.cfg.linux.alpha" />
+- <property name="java.lib.dir.platform"
value="${env.TARGET_JAVA_LIBS}" />
++ <property name="java.lib.dir.platform"
value="${java.home.dir}/jre/lib/alpha" />
+ </target>
+
+ <target name="gluegen.cpptasks.declare.compiler.linux.armv7"
if="isLinuxARMv7">
+ <echo message="Linux.armv7" />
+ <property name="compiler.cfg.id.base"
value="compiler.cfg.linux.armv7" />
+ <property name="linker.cfg.id.base"
value="linker.cfg.linux.armv7" />
+- <property name="java.lib.dir.platform"
value="${env.TARGET_JAVA_LIBS}" />
++ <property name="java.lib.dir.platform"
value="${java.home.dir}/jre/lib/arm" />
+ </target>
+
+ <target name="gluegen.cpptasks.declare.compiler.linux.ia64"
if="isLinuxIA64">
+@@ -1203,7 +1203,7 @@
+ <echo message="Linux.Sparc" />
+ <property name="compiler.cfg.id.base"
value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.base" value="linker.cfg.linux"
/>
+- <property name="java.lib.dir.platform"
value="${java.home.dir}/jre/lib/" />
++ <property name="java.lib.dir.platform"
value="${java.home.dir}/jre/lib/sparc" />
+ </target>
+
+ <target name="gluegen.cpptasks.declare.compiler.linux"
depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv7,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.sparc"
if="isLinux">
Added: trunk/gluegen2/debian/patches/hideException.diff
===================================================================
--- trunk/gluegen2/debian/patches/hideException.diff
(rev 0)
+++ trunk/gluegen2/debian/patches/hideException.diff 2011-11-21 23:50:41 UTC
(rev 15430)
@@ -0,0 +1,37 @@
+Index: gluegen2-2.0-rc3/src/java/com/jogamp/common/os/Platform.java
+===================================================================
+--- gluegen2-2.0-rc3.orig/src/java/com/jogamp/common/os/Platform.java
2011-11-20 17:44:15.396627341 +0100
++++ gluegen2-2.0-rc3/src/java/com/jogamp/common/os/Platform.java
2011-11-20 17:51:18.500617899 +0100
+@@ -298,19 +298,19 @@
+
+ AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ public Object run() {
+- if(USE_TEMP_JAR_CACHE && TempJarCache.initSingleton()) {
+- final String nativeJarName =
"gluegen2-rt-natives-"+os_and_arch+".jar";
+- final ClassLoader cl = Platform.class.getClassLoader();
+- try {
+- final URL jarUrlRoot = JarUtil.getJarURLDirname(
+-
JarUtil.getJarURL(Platform.class.getName(), cl) );
+- final URL nativeJarURL = JarUtil.getJarURL(jarUrlRoot,
nativeJarName);
+- final JarFile nativeJar =
JarUtil.getJarFile(nativeJarURL, cl);
+- TempJarCache.bootstrapNativeLib(Platform.class,
libBaseName, nativeJar);
+- } catch (IOException ioe) {
+- ioe.printStackTrace();
+- }
+- }
++// if(USE_TEMP_JAR_CACHE && TempJarCache.initSingleton()) {
++// final String nativeJarName =
"gluegen2-rt-natives-"+os_and_arch+".jar";
++// final ClassLoader cl = Platform.class.getClassLoader();
++// try {
++// final URL jarUrlRoot = JarUtil.getJarURLDirname(
++//
JarUtil.getJarURL(Platform.class.getName(), cl) );
++// final URL nativeJarURL = JarUtil.getJarURL(jarUrlRoot,
nativeJarName);
++// final JarFile nativeJar =
JarUtil.getJarFile(nativeJarURL, cl);
++// TempJarCache.bootstrapNativeLib(Platform.class,
libBaseName, nativeJar);
++// } catch (IOException ioe) {
++// // ioe.printStackTrace();
++// }
++// }
+
DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false);
+ return null;
+ }
Modified: trunk/gluegen2/debian/patches/series
===================================================================
--- trunk/gluegen2/debian/patches/series 2011-11-21 08:19:41 UTC (rev
15429)
+++ trunk/gluegen2/debian/patches/series 2011-11-21 23:50:41 UTC (rev
15430)
@@ -8,4 +8,6 @@
disable_android.diff
disable_git_call.diff
linker.diff
+hideException.diff
+TARGET_JAVA_LIBS_disabled.diff
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
