This is an automated email from the git hooks/post-receive script. mgilbert pushed a commit to branch master in repository lwjgl.
commit e2d68ad95edd371fabd1545f402ddc59f71153f9 Author: Michael Gilbert <[email protected]> Date: Mon Oct 13 02:04:31 2014 -0400 release 2.7.1+dfsg-3 --- build.xml | 17 +++++++----- debian/changelog | 11 ++++++++ debian/control | 13 ++++++--- debian/patches/p/systemjinput.diff | 6 ++--- debian/rules | 1 + platform_build/build-applet.xml | 2 +- platform_build/linux_ant/build.xml | 36 +++++++++++++++++++++++-- src/java/org/lwjgl/MacOSXSysImplementation.java | 4 +-- src/java/org/lwjgl/opengl/MacOSXDisplay.java | 10 +++---- 9 files changed, 76 insertions(+), 24 deletions(-) diff --git a/build.xml b/build.xml index 8d25e18..e1e8bca 100644 --- a/build.xml +++ b/build.xml @@ -137,6 +137,7 @@ <fileset refid="lwjgl.fileset" /> <manifest> <attribute name="Sealed" value="true"/> + <attribute name="Class-Path" value="/usr/share/java/jinput.jar"/> </manifest> </jar> @@ -146,6 +147,7 @@ <fileset refid="lwjgl_util_applet.fileset" /> <manifest> <attribute name="Sealed" value="true"/> + <attribute name="Class-Path" value="/usr/share/java/jinput.jar"/> </manifest> </jar> @@ -246,7 +248,7 @@ <class name="org.lwjgl.opengl.WindowsContextImplementation" /> </javah> - <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes"> + <!-- <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes"> <class name="org.lwjgl.MacOSXSysImplementation" /> <class name="org.lwjgl.opengl.MacOSXMouseEventQueue" /> <class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" /> @@ -254,7 +256,7 @@ <class name="org.lwjgl.opengl.MacOSXPbufferPeerInfo" /> <class name="org.lwjgl.opengl.MacOSXDisplay" /> <class name="org.lwjgl.opengl.MacOSXContextImplementation" /> - </javah> + </javah> --> <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes"> <class name="org.lwjgl.opengl.AWTSurfaceLock" /> @@ -293,13 +295,13 @@ </tokenfilter> </filterchain> </loadfile> - <loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version"> + <!-- <loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version"> <filterchain> <tokenfilter> <containsstring contains="JNI_VERSION ="/> </tokenfilter> </filterchain> - </loadfile> + </loadfile> --> <loadfile srcfile="${lwjgl.src.native}/windows/org_lwjgl_WindowsSysImplementation.h" property="lwjgl.native.windows.version"> <filterchain> <tokenfilter> @@ -314,13 +316,13 @@ </tokenfilter> </filterchain> </loadfile> - <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version"> + <!-- <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version"> <filterchain> <tokenfilter> <containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/> </tokenfilter> </filterchain> - </loadfile> + </loadfile> --> <echo> lwjgl.java.windows.version = ${lwjgl.java.windows.version} lwjgl.native.windows.version = ${lwjgl.native.windows.version} @@ -501,7 +503,7 @@ <os name="Mac OS X" /> </condition> <property name="native_path_expanded" location="${native_path}"/> - <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true"> + <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:/usr/share/java/jinput.jar" fork="true"> <sysproperty key="org.lwjgl.util.Debug" value="true"/> <sysproperty key="java.library.path" value="${native_path_expanded}"/> <arg line="${args}"/> @@ -511,6 +513,7 @@ <!-- Creates the Javadoc --> <target name="javadoc" description="Creates javadoc from java source code"> <javadoc destdir="${lwjgl.docs}/javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.5" windowtitle="LWJGL API" useexternalfile="true"> + <link href="/usr/share/doc/default-jdk-doc/api/" /> <fileset refid="lwjgl.javadoc.fileset" /> <doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle> <bottom><![CDATA[<i>Copyright © 2002-2009 lwjgl.org. All Rights Reserved.</i>]]></bottom> diff --git a/debian/changelog b/debian/changelog index bd0bdce..13bc5fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +lwjgl (2.7.1+dfsg-3) unstable; urgency=low + + * add java bin dir to the PATH environment (closes: #664180) + * update my email address + * build-conflict with binutils-gold + * bump standards to 3.9.3 + * add a .gitignore file + * utilize jutils.jar via jinput.jar's classpath + + -- Michael Gilbert <[email protected]> Mon, 07 May 2012 15:06:23 -0400 + lwjgl (2.7.1+dfsg-2) unstable; urgency=low [ Miguel Landaeta ] diff --git a/debian/control b/debian/control index 9f365c4..b5113df 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,9 @@ Source: lwjgl Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Gabriele Giacone <[email protected]>, Michael Gilbert <[email protected]> +Uploaders: + Gabriele Giacone <[email protected]>, + Michael Gilbert <[email protected]>, Build-Depends: debhelper (>= 8), javahelper, @@ -13,9 +15,12 @@ Build-Depends: libxrandr-dev, libxxf86vm-dev, libxcursor-dev, - libxt-dev -Build-Depends-Indep: default-jdk-doc -Standards-Version: 3.9.2 + libxt-dev, +Build-Depends-Indep: + default-jdk-doc, +Build-Conflicts: + binutils-gold, +Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/git/pkg-java/lwjgl.git Vcs-Browser: http://git.debian.org/?p=pkg-java/lwjgl.git Homepage: http://lwjgl.org/ diff --git a/debian/patches/p/systemjinput.diff b/debian/patches/p/systemjinput.diff index db7eccf..cda3943 100644 --- a/debian/patches/p/systemjinput.diff +++ b/debian/patches/p/systemjinput.diff @@ -17,7 +17,7 @@ Index: lwjgl/build.xml <fileset refid="lwjgl.fileset" /> <manifest> <attribute name="Sealed" value="true"/> -+ <attribute name="Class-Path" value="/usr/share/java/jinput.jar /usr/share/java/jutils.jar"/> ++ <attribute name="Class-Path" value="/usr/share/java/jinput.jar"/> </manifest> </jar> @@ -25,7 +25,7 @@ Index: lwjgl/build.xml <fileset refid="lwjgl_util_applet.fileset" /> <manifest> <attribute name="Sealed" value="true"/> -+ <attribute name="Class-Path" value="/usr/share/java/jinput.jar /usr/share/java/jutils.jar"/> ++ <attribute name="Class-Path" value="/usr/share/java/jinput.jar"/> </manifest> </jar> @@ -34,7 +34,7 @@ Index: lwjgl/build.xml </condition> <property name="native_path_expanded" location="${native_path}"/> - <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true"> -+ <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:/usr/share/java/jinput.jar:/usr/share/java/jutils.jar" fork="true"> ++ <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:/usr/share/java/jinput.jar" fork="true"> <sysproperty key="org.lwjgl.util.Debug" value="true"/> <sysproperty key="java.library.path" value="${native_path_expanded}"/> <arg line="${args}"/> diff --git a/debian/rules b/debian/rules index 1ab77a5..735dc20 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,7 @@ TAR := ../$(NAME)_$(VERSION).orig.tar.gz TARDFSG := ../$(NAME)_$(VERSION)+dfsg.orig.tar.gz export JAVA_HOME=/usr/lib/jvm/default-java +export PATH:=${PATH}:${JAVA_HOME}/bin # NOTE: jutils is explicitly included here (without a depends in our control # file) because jinput.jar lacks jutils in its own "Class-Path" (bug #626002) diff --git a/platform_build/build-applet.xml b/platform_build/build-applet.xml index 588347d..d96a305 100644 --- a/platform_build/build-applet.xml +++ b/platform_build/build-applet.xml @@ -1,7 +1,7 @@ <project name="applet"> <!-- Create our packer task --> - <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> +<!-- <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> --> <target name="applet"> <antcall target="-applet"> diff --git a/platform_build/linux_ant/build.xml b/platform_build/linux_ant/build.xml index 0058f05..74545f9 100644 --- a/platform_build/linux_ant/build.xml +++ b/platform_build/linux_ant/build.xml @@ -6,12 +6,14 @@ <property name="libname64" value="liblwjgl64.so"/> <property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" /> <property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" /> + <property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/${os.arch} -ljawt" /> <property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/> <target name="clean"> <delete> <fileset dir="x32"/> <fileset dir="x64"/> + <fileset dir="deb"/> <fileset dir="." includes="*.o"/> <fileset dir="." includes="*.so"/> </delete> @@ -41,6 +43,7 @@ <property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/> <property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/> + <property name="linker_flagsdeb" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs} ${xf86vm_lib}"/> <condition property="build.32bit.only"> <not> @@ -59,8 +62,11 @@ </and> </condition> - <antcall target="compile32"/> - <antcall target="compile64"/> + <condition property="build.debian"> + <os name="Linux" /> + </condition> + + <antcall target="compiledeb" /> </target> <target name="compile32" unless="build.64bit.only"> @@ -114,4 +120,30 @@ <fileset file="${libname64}"/> </apply> </target> + + <target name="compiledeb"> + <mkdir dir="deb"/> + <apply dir="deb" executable="gcc" skipemptyfilesets="true" failonerror="true"> + <arg line="${cflags32} ${cflags_pthread}"/> + <arg value="-I${java.home}/include"/> + <arg value="-I${java.home}/include/linux"/> + <arg value="-I${java.home}/../include"/> + <arg value="-I${java.home}/../include/linux"/> + <arg value="-I${java.home}/../include/solaris"/> + <arg value="-I${native}/common"/> + <arg value="-I${native}/linux"/> + <mapper type="glob" from="*.c" to="*.o"/> + <fileset dir="${native}/linux" includes="*.c"/> + <fileset dir="${native}/generated" includes="*.c"/> + <fileset dir="${native}/common" includes="*.c"/> + </apply> + <apply dir="." parallel="true" executable="gcc" failonerror="true"> + <srcfile/> + <arg line="${linker_flagsdeb}"/> + <fileset dir="deb" includes="*.o"/> + </apply> + <apply dir="." parallel="true" executable="strip" failonerror="true"> + <fileset file="${libname32}"/> + </apply> + </target> </project> diff --git a/src/java/org/lwjgl/MacOSXSysImplementation.java b/src/java/org/lwjgl/MacOSXSysImplementation.java index 3b6b32f..505c074 100644 --- a/src/java/org/lwjgl/MacOSXSysImplementation.java +++ b/src/java/org/lwjgl/MacOSXSysImplementation.java @@ -33,7 +33,7 @@ package org.lwjgl; import java.awt.Toolkit; -import com.apple.eio.FileManager; +//import com.apple.eio.FileManager; /** * @@ -55,7 +55,7 @@ final class MacOSXSysImplementation extends J2SESysImplementation { public boolean openURL(String url) { try { - FileManager.openURL(url); +// FileManager.openURL(url); return true; } catch (Exception e) { LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e); diff --git a/src/java/org/lwjgl/opengl/MacOSXDisplay.java b/src/java/org/lwjgl/opengl/MacOSXDisplay.java index eaccaee..6e46da5 100644 --- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java +++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java @@ -54,9 +54,9 @@ import org.lwjgl.BufferUtils; import org.lwjgl.LWJGLException; import org.lwjgl.LWJGLUtil; -import com.apple.eawt.Application; -import com.apple.eawt.ApplicationAdapter; -import com.apple.eawt.ApplicationEvent; +//import com.apple.eawt.Application; +//import com.apple.eawt.ApplicationAdapter; +//import com.apple.eawt.ApplicationEvent; import static org.lwjgl.opengl.GL11.*; @@ -79,11 +79,11 @@ final class MacOSXDisplay implements DisplayImplementation { try { AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() { public Object run() throws Exception { - Application.getApplication().addApplicationListener(new ApplicationAdapter() { +/* Application.getApplication().addApplicationListener(new ApplicationAdapter() { public void handleQuit(ApplicationEvent event) { doHandleQuit(); } - }); + }); */ return null; } }); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lwjgl.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
