Author: sylvestre Date: 2012-11-08 15:19:13 +0000 (Thu, 08 Nov 2012) New Revision: 16355
Added: trunk/gluegen2/debian/patches/disable_android2.diff Modified: trunk/gluegen2/debian/changelog trunk/gluegen2/debian/patches/hideException.diff trunk/gluegen2/debian/patches/renamedLibrary.diff Log: New upstream release Modified: trunk/gluegen2/debian/changelog =================================================================== --- trunk/gluegen2/debian/changelog 2012-11-03 15:13:30 UTC (rev 16354) +++ trunk/gluegen2/debian/changelog 2012-11-08 15:19:13 UTC (rev 16355) @@ -1,3 +1,9 @@ +gluegen2 (2.0-rc10-1~exp1) experimental; urgency=low + + * New upstream release + + -- Sylvestre Ledru <[email protected]> Sun, 02 Sep 2012 14:55:41 +0200 + gluegen2 (2.0-rc9-1~exp1) experimental; urgency=low * New upstream release Added: trunk/gluegen2/debian/patches/disable_android2.diff =================================================================== --- trunk/gluegen2/debian/patches/disable_android2.diff (rev 0) +++ trunk/gluegen2/debian/patches/disable_android2.diff 2012-11-08 15:19:13 UTC (rev 16355) @@ -0,0 +1,141 @@ +Index: gluegen-v2.0-rc8/make/build.xml +=================================================================== +--- gluegen-v2.0-rc8.orig/make/build.xml 2012-05-15 14:31:28.000000000 +0200 ++++ gluegen-v2.0-rc8/make/build.xml 2012-05-15 15:28:39.000000000 +0200 +@@ -131,7 +131,7 @@ + + <property name="jogamp.android-launcher.classes" value="jogamp/android/launcher/**"/> + <property name="jogamp.awt.classes" value="jogamp/common/awt/**"/> +- <property name="gluegen.excludes.all" value="${gluegen.excludes.nsig} ${jogamp.android-launcher.classes}" /> ++ <property name="gluegen.excludes.all" value="${gluegen.excludes.nsig} ${jogamp.android-launcher.classes} jogamp/common/os/android/**" /> + <property name="gluegen-rt.classes" value="com/jogamp/gluegen/runtime/**"/> + <property name="jogamp.common.classes" value="com/jogamp/common/** jogamp/common/**"/> + </target> +@@ -638,8 +638,11 @@ + </antcall> + + <!-- Build GlueGen using the generated Java files along with the +- - original source. --> +- ++ - original source. --> ++ <delete> ++ <fileset dir="${src.java}/jogamp/common/os/android/"/> ++ </delete> ++ + <!--compile gluegen-rt first--> + <javac destdir="${classes}" + includeAntRuntime="false" +Index: gluegen-v2.0-rc8/src/java/com/jogamp/common/util/IOUtil.java +=================================================================== +--- gluegen-v2.0-rc8.orig/src/java/com/jogamp/common/util/IOUtil.java 2012-05-15 14:29:21.000000000 +0200 ++++ gluegen-v2.0-rc8/src/java/com/jogamp/common/util/IOUtil.java 2012-05-15 14:50:46.000000000 +0200 +@@ -44,13 +44,13 @@ + import java.nio.ByteBuffer; + + import jogamp.common.Debug; +-import jogamp.common.os.android.StaticContext; ++//import jogamp.common.os.android.StaticContext; + +-import android.content.Context; ++//import android.content.Context; + + import com.jogamp.common.net.AssetURLContext; + import com.jogamp.common.nio.Buffers; +-import com.jogamp.common.os.AndroidVersion; ++//import com.jogamp.common.os.AndroidVersion; + import com.jogamp.common.os.MachineDescription; + import com.jogamp.common.os.Platform; + +@@ -648,19 +648,19 @@ + public static File getTempRoot(AccessControlContext acc) + throws SecurityException, RuntimeException + { +- if(AndroidVersion.isAvailable) { +- final Context ctx = StaticContext.getContext(); +- if(null != ctx) { +- final File tmpRoot = ctx.getDir("temp", Context.MODE_WORLD_READABLE); +- if(null==tmpRoot|| !tmpRoot.isDirectory() || !tmpRoot.canWrite()) { +- throw new RuntimeException("Not a writable directory: '"+tmpRoot+"', retrieved Android static context"); +- } +- if(DEBUG) { +- System.err.println("IOUtil.getTempRoot(Android): temp dir: "+tmpRoot.getAbsolutePath()); +- } +- return tmpRoot; +- } +- } ++ // if(AndroidVersion.isAvailable) { ++ // final Context ctx = StaticContext.getContext(); ++ // if(null != ctx) { ++ // final File tmpRoot = ctx.getDir("temp", Context.MODE_WORLD_READABLE); ++ // if(null==tmpRoot|| !tmpRoot.isDirectory() || !tmpRoot.canWrite()) { ++ // throw new RuntimeException("Not a writable directory: '"+tmpRoot+"', retrieved Android static context"); ++ // } ++ // if(DEBUG) { ++ // System.err.println("IOUtil.getTempRoot(Android): temp dir: "+tmpRoot.getAbsolutePath()); ++ // } ++ // return tmpRoot; ++ // } ++ // } + final String tmpRootName = PropertyAccess.getProperty(java_io_tmpdir_propkey, false, acc); + if(null == tmpRootName || 0 == tmpRootName.length()) { + throw new RuntimeException("Property '"+java_io_tmpdir_propkey+"' value is empty: <"+tmpRootName+">"); +@@ -670,7 +670,7 @@ + throw new RuntimeException("Not a writable directory: '"+tmpRoot+"', retrieved by propery '"+java_io_tmpdir_propkey+"'"); + } + if(DEBUG) { +- System.err.println("IOUtil.getTempRoot(isAndroid: "+AndroidVersion.isAvailable+"): temp dir: "+tmpRoot.getAbsolutePath()); ++// System.err.println("IOUtil.getTempRoot(isAndroid: "+AndroidVersion.isAvailable+"): temp dir: "+tmpRoot.getAbsolutePath()); + } + return tmpRoot; + } +Index: gluegen-v2.0-rc8/src/java/com/jogamp/common/util/JogampVersion.java +=================================================================== +--- gluegen-v2.0-rc8.orig/src/java/com/jogamp/common/util/JogampVersion.java 2012-05-15 14:29:21.000000000 +0200 ++++ gluegen-v2.0-rc8/src/java/com/jogamp/common/util/JogampVersion.java 2012-05-15 15:29:41.000000000 +0200 +@@ -29,7 +29,7 @@ + package com.jogamp.common.util; + + import com.jogamp.common.GlueGenVersion; +-import com.jogamp.common.os.AndroidVersion; ++//import com.jogamp.common.os.AndroidVersion; + import com.jogamp.common.os.Platform; + + import java.util.Iterator; +@@ -37,7 +37,7 @@ + import java.util.jar.Attributes; + import java.util.jar.Manifest; + +-import jogamp.common.os.android.PackageInfoUtil; ++//import jogamp.common.os.android.PackageInfoUtil; + + public class JogampVersion { + +@@ -58,11 +58,11 @@ + this.hash = this.mf.hashCode(); + mainAttributes = this.mf.getMainAttributes(); + mainAttributeNames = mainAttributes.keySet(); +- if(AndroidVersion.isAvailable) { +- androidPackageVersionName = PackageInfoUtil.getPackageInfoVersionName(packageName); +- } else { ++// if(AndroidVersion.isAvailable) { ++// androidPackageVersionName = PackageInfoUtil.getPackageInfoVersionName(packageName); ++// } else { + androidPackageVersionName = null; +- } ++/// } + } + + @Override +@@ -109,9 +109,9 @@ + } + + public final String getExtensionName() { +- if(null != androidPackageVersionName) { +- return packageName; +- } ++// if(null != androidPackageVersionName) { ++// return packageName; ++// } + return this.getAttribute(Attributes.Name.EXTENSION_NAME); + } + Modified: trunk/gluegen2/debian/patches/hideException.diff =================================================================== --- trunk/gluegen2/debian/patches/hideException.diff 2012-11-03 15:13:30 UTC (rev 16354) +++ trunk/gluegen2/debian/patches/hideException.diff 2012-11-08 15:19:13 UTC (rev 16355) @@ -1,35 +1,43 @@ -Index: gluegen-v2.0-rc9/src/java/com/jogamp/common/os/Platform.java +Index: gluegen-v2.0-rc10/src/java/com/jogamp/common/os/Platform.java =================================================================== ---- gluegen-v2.0-rc9.orig/src/java/com/jogamp/common/os/Platform.java 2012-07-02 02:53:15.000000000 +0200 -+++ gluegen-v2.0-rc9/src/java/com/jogamp/common/os/Platform.java 2012-07-02 02:54:34.534570176 +0200 -@@ -225,18 +225,18 @@ +--- gluegen-v2.0-rc10.orig/src/java/com/jogamp/common/os/Platform.java 2012-09-02 14:56:25.000000000 +0200 ++++ gluegen-v2.0-rc10/src/java/com/jogamp/common/os/Platform.java 2012-09-02 14:58:12.222431352 +0200 +@@ -230,22 +230,22 @@ + private static final void loadGlueGenRTImpl() { AccessController.doPrivileged(new PrivilegedAction<Object>() { public Object run() { - final ClassLoader cl = Platform.class.getClassLoader(); - if(USE_TEMP_JAR_CACHE && TempJarCache.initSingleton()) { -- final String nativeJarName = libBaseName+"-natives-"+os_and_arch+".jar"; +- String nativeJarName = null; +- URL jarUrlRoot = null; +- URL nativeJarURL = null; - try { -- final URL jarUrlRoot = JarUtil.getURLDirname( -- JarUtil.getJarSubURL(Platform.class.getName(), cl) ); -- final URL nativeJarURL = JarUtil.getJarFileURL(jarUrlRoot, nativeJarName); -- TempJarCache.bootstrapNativeLib(Platform.class, libBaseName, nativeJarURL, cl); +- final String jarName = JarUtil.getJarBasename(platformClassJarURL); +- final String nativeJarBasename = jarName.substring(0, jarName.indexOf(".jar")); // ".jar" already validated w/ JarUtil.getJarBasename(..) +- nativeJarName = nativeJarBasename+"-natives-"+PlatformPropsImpl.os_and_arch+".jar"; +- jarUrlRoot = JarUtil.getURLDirname( JarUtil.getJarSubURL(platformClassJarURL) ); +- nativeJarURL = JarUtil.getJarFileURL(jarUrlRoot, nativeJarName); +- TempJarCache.bootstrapNativeLib(Platform.class, libBaseName, nativeJarURL); - } catch (Exception e0) { - // IllegalArgumentException, IOException -- System.err.println("Catched: "+e0.getMessage()); +- System.err.println("Catched "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while TempJarCache.bootstrapNativeLib() of "+nativeJarURL+" ("+jarUrlRoot+" + "+nativeJarName+")"); - } - } + // if(USE_TEMP_JAR_CACHE && TempJarCache.initSingleton()) { -+ // final String nativeJarName = libBaseName+"-natives-"+os_and_arch+".jar"; ++ // String nativeJarName = null; ++ // URL jarUrlRoot = null; ++ // URL nativeJarURL = null; + // try { -+ // final URL jarUrlRoot = JarUtil.getURLDirname( -+ // JarUtil.getJarSubURL(Platform.class.getName(), cl) ); -+ // final URL nativeJarURL = JarUtil.getJarFileURL(jarUrlRoot, nativeJarName); -+ // TempJarCache.bootstrapNativeLib(Platform.class, libBaseName, nativeJarURL, cl); ++ // final String jarName = JarUtil.getJarBasename(platformClassJarURL); ++ // final String nativeJarBasename = jarName.substring(0, jarName.indexOf(".jar")); // ".jar" already validated w/ JarUtil.getJarBasename(..) ++ // nativeJarName = nativeJarBasename+"-natives-"+PlatformPropsImpl.os_and_arch+".jar"; ++ // jarUrlRoot = JarUtil.getURLDirname( JarUtil.getJarSubURL(platformClassJarURL) ); ++ // nativeJarURL = JarUtil.getJarFileURL(jarUrlRoot, nativeJarName); ++ // TempJarCache.bootstrapNativeLib(Platform.class, libBaseName, nativeJarURL); + // } catch (Exception e0) { + // // IllegalArgumentException, IOException -+ // System.err.println("Catched: "+e0.getMessage()); ++ // System.err.println("Catched "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while TempJarCache.bootstrapNativeLib() of "+nativeJarURL+" ("+jarUrlRoot+" + "+nativeJarName+")"); + // } + // } - DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, cl); + DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, Platform.class.getClassLoader()); return null; } Modified: trunk/gluegen2/debian/patches/renamedLibrary.diff =================================================================== --- trunk/gluegen2/debian/patches/renamedLibrary.diff 2012-11-03 15:13:30 UTC (rev 16354) +++ trunk/gluegen2/debian/patches/renamedLibrary.diff 2012-11-08 15:19:13 UTC (rev 16355) @@ -1,7 +1,7 @@ -Index: gluegen-v2.0-rc9/src/junit/com/jogamp/common/util/TestTempJarCache.java +Index: gluegen-v2.0-rc10/src/junit/com/jogamp/common/util/TestTempJarCache.java =================================================================== ---- gluegen-v2.0-rc9.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java 2012-06-20 03:09:50.000000000 +0200 -+++ gluegen-v2.0-rc9/src/junit/com/jogamp/common/util/TestTempJarCache.java 2012-07-02 02:52:48.122572551 +0200 +--- gluegen-v2.0-rc10.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java 2012-07-19 21:16:38.000000000 +0200 ++++ gluegen-v2.0-rc10/src/junit/com/jogamp/common/util/TestTempJarCache.java 2012-09-02 14:56:25.886433725 +0200 @@ -192,8 +192,8 @@ @Test public void testTempJarCache02AddNativeLibs() throws IOException { @@ -22,10 +22,10 @@ JNILibLoaderBase.addNativeJarLibs(TempJarCache.class, libBaseName); Assert.assertTrue(JNILibLoaderBase.isLoaded(libBaseName)); -Index: gluegen-v2.0-rc9/src/java/com/jogamp/common/os/Platform.java +Index: gluegen-v2.0-rc10/src/java/com/jogamp/common/os/Platform.java =================================================================== ---- gluegen-v2.0-rc9.orig/src/java/com/jogamp/common/os/Platform.java 2012-06-20 03:09:50.000000000 +0200 -+++ gluegen-v2.0-rc9/src/java/com/jogamp/common/os/Platform.java 2012-07-02 02:53:15.982571929 +0200 +--- gluegen-v2.0-rc10.orig/src/java/com/jogamp/common/os/Platform.java 2012-07-19 21:16:38.000000000 +0200 ++++ gluegen-v2.0-rc10/src/java/com/jogamp/common/os/Platform.java 2012-09-02 14:56:25.886433725 +0200 @@ -139,7 +139,7 @@ private static final String useTempJarCachePropName = "jogamp.gluegen.UseTempJarCache"; @@ -35,7 +35,7 @@ // // static initialization order: -@@ -170,7 +170,7 @@ +@@ -182,7 +182,7 @@ loadGlueGenRTImpl(); @@ -44,7 +44,7 @@ MachineDescription md = MachineDescriptionRuntime.getRuntime(); if(null == md) { -@@ -244,7 +244,7 @@ +@@ -253,7 +253,7 @@ } /** _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
