Sophie

Sophie

distrib > Mageia > 3 > x86_64 > media > core-release-src > by-pkgid > 0695b83318a215ca4f31e8c485238544 > files > 3

jogl2-2.0-4.mga2.src.rpm

diff -Nru jogl2-2.0-rc3/make/build-newt.xml jogl2-2.0-rc3-gil/make/build-newt.xml
--- jogl2-2.0-rc3/make/build-newt.xml	2011-12-05 15:56:51.786518109 +0100
+++ jogl2-2.0-rc3-gil/make/build-newt.xml	2011-12-05 15:55:58.023519171 +0100
@@ -139,7 +139,7 @@
            <isset property="setup.noOpenGL"/>
         </condition>
 
-        <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.opengl}" />
+        <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.opengl} jogamp/newt/driver/android/**" />
         <echo message="java.excludes.all: ${java.excludes.all}" />
 
     </target>
@@ -635,7 +635,7 @@
       <javah destdir="${src.generated.c}/X11"         classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Window" />
       <javah destdir="${src.generated.c}/X11"         classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Screen" />
       <javah destdir="${src.generated.c}/X11"         classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Display" />
-      <javah destdir="${src.generated.c}/Android"     classpath="${javah.classpath}:${android.jar}" class="jogamp.newt.driver.android.AndroidWindow" />
+<!--      <javah destdir="${src.generated.c}/Android"     classpath="${javah.classpath}:${android.jar}" class="jogamp.newt.driver.android.AndroidWindow" />-->
     </target>
 
     <target name="c.build.newt.windowlib" unless="setup.nonatives">
diff -Nru jogl2-2.0-rc3/make/build-test.xml jogl2-2.0-rc3-gil/make/build-test.xml
--- jogl2-2.0-rc3/make/build-test.xml	2011-10-06 15:52:37.000000000 +0200
+++ jogl2-2.0-rc3-gil/make/build-test.xml	2011-12-05 15:55:58.024519171 +0100
@@ -78,12 +78,14 @@
     </target>
 
     <target name="test.compile" depends="test.compile.check" unless="test.compile.skip">
+        <property name="java.excludes.all" value="jogamp/newt/driver/android/** com/jogamp/opengl/test/android/**" />
         <!-- Perform the junit pass Java compile -->
         <javac destdir="${classes}"
                source="${host.sourcelevel}"
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
                includeAntRuntime="false"
+               excludes="${java.excludes.all}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="junit_jogl_newt_android.compile.classpath"/>
             <src path="${src.test}" />