[Pkg-cli-apps-commits] r4961 - in /packages/ikvm/trunk/debian: changelog ikvm.installcligac patches/05-produce-rmi-at-compile-time.patch patches/series rules
directhex-guest at users.alioth.debian.org
directhex-guest at users.alioth.debian.org
Mon Jun 8 11:09:37 UTC 2009
Author: directhex-guest
Date: Mon Jun 8 11:09:37 2009
New Revision: 4961
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4961
Log:
* debian/rules:
+ Stop deleting JniInterface.cs
+ Remove all our bootstrapping nonsense - IKVM build system is sane now!
+ Update API/ABI version
* debian/ikvm.installcligac:
+ Update list of assemblies
* debian/patches/05-produce-rmi-at-compile-time.patch:
+ Patch from upstream to drop the .class files bundled in their
OpenJDK source release - huge thanks to Jeroen Frijters for sorting
this out
Added:
packages/ikvm/trunk/debian/patches/05-produce-rmi-at-compile-time.patch
Modified:
packages/ikvm/trunk/debian/changelog
packages/ikvm/trunk/debian/ikvm.installcligac
packages/ikvm/trunk/debian/patches/series
packages/ikvm/trunk/debian/rules
Modified: packages/ikvm/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/changelog?rev=4961&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/changelog (original)
+++ packages/ikvm/trunk/debian/changelog Mon Jun 8 11:09:37 2009
@@ -1,13 +1,15 @@
ikvm (0.40.0.1+dfsg-1) UNRELEASED; urgency=low
-
- NOT READY YET, UPSTREAM BUNDLING PROBLEMS
* New upstream release
* debian/control:
+ Fix Vcs-* fields
* debian/rules:
+ Ensure CLI policy folder is actually used for get-orig-source
- + Add new refemit build to list of nant files to build
+ + Stop deleting JniInterface.cs
+ + Remove all our bootstrapping nonsense - IKVM build system is sane now!
+ + Update API/ABI version
+ * debian/ikvm.installcligac:
+ + Update list of assemblies
* debian/patches/01-use_system_SharpZipLib.patch,
debian/patches/03-use_mono.snk_for_ikvm-key.patch,
debian/patches/04-decouple_arch_build_from_indep.patch:
@@ -15,6 +17,10 @@
* debian/patches/02-use_ikvm-key_for_openJDKConfiguration.patch,
debian/patches/00-use_ikvm-key_for_JniInterface.patch:
+ Removed, fixed upstream
+ * debian/patches/05-produce-rmi-at-compile-time.patch:
+ + Patch from upstream to drop the .class files bundled in their
+ OpenJDK source release - huge thanks to Jeroen Frijters for sorting
+ this out
-- Jo Shields <directhex at apebox.org> Sat, 06 Jun 2009 11:13:15 +0100
Modified: packages/ikvm/trunk/debian/ikvm.installcligac
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/ikvm.installcligac?rev=4961&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/ikvm.installcligac (original)
+++ packages/ikvm/trunk/debian/ikvm.installcligac Mon Jun 8 11:09:37 2009
@@ -1,4 +1,16 @@
-/usr/lib/cli/ikvm-0.38/IKVM.AWT.WinForms.dll
-/usr/lib/cli/ikvm-0.38/IKVM.OpenJDK.ClassLibrary.dll
-/usr/lib/cli/ikvm-0.38/IKVM.Runtime.JNI.dll
-/usr/lib/cli/ikvm-0.38/IKVM.Runtime.dll
+/usr/lib/cli/ikvm-0.40/IKVM.AWT.WinForms.dll
+/usr/lib/cli/ikvm-0.40/IKVM.OpenJDK.Charsets.dll
+/usr/lib/cli/ikvm-0.40/IKVM.OpenJDK.Corba.dll
+/usr/lib/cli/ikvm-0.40/IKVM.OpenJDK.Core.dll
+/usr/lib/cli/ikvm-0.40/IKVM.OpenJDK.Jdbc.dll
+/usr/lib/cli/ikvm-0.40/IKVM.OpenJDK.Management.dll
+/usr/lib/cli/ikvm-0.40/IKVM.OpenJDK.Misc.dll
+/usr/lib/cli/ikvm-0.40/IKVM.OpenJDK.Security.dll
+/usr/lib/cli/ikvm-0.40/IKVM.OpenJDK.SwingAWT.dll
+/usr/lib/cli/ikvm-0.40/IKVM.OpenJDK.Text.dll
+/usr/lib/cli/ikvm-0.40/IKVM.OpenJDK.Util.dll
+/usr/lib/cli/ikvm-0.40/IKVM.OpenJDK.XML.dll
+/usr/lib/cli/ikvm-0.40/IKVM.Runtime.JNI.dll
+/usr/lib/cli/ikvm-0.40/IKVM.Runtime.dll
+/usr/lib/cli/ikvm-0.40/IKVM.Reflection.Emit.dll
+/usr/lib/cli/ikvm-0.40/IKVM.Reflection.Emit.MdbWriter.dll
Added: packages/ikvm/trunk/debian/patches/05-produce-rmi-at-compile-time.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/patches/05-produce-rmi-at-compile-time.patch?rev=4961&op=file
==============================================================================
--- packages/ikvm/trunk/debian/patches/05-produce-rmi-at-compile-time.patch (added)
+++ packages/ikvm/trunk/debian/patches/05-produce-rmi-at-compile-time.patch Mon Jun 8 11:09:37 2009
@@ -1,0 +1,80 @@
+Index: ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/openjdk/allsources.lst
+===================================================================
+--- ikvm-0.40.0.1+dfsg.orig/ikvm-0.40.0.1/openjdk/allsources.lst 2009-06-08 08:54:09.000000000 +0100
++++ ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/openjdk/allsources.lst 2009-06-08 08:54:24.000000000 +0100
+@@ -1148,8 +1148,6 @@
+ ../../openjdk6-b12/control/build/linux-amd64/gensrc/java/nio/charset/CharsetEncoder.java
+ ../../openjdk6-b12/control/build/linux-amd64/gensrc/java/nio/charset/IllegalCharsetNameException.java
+ ../../openjdk6-b12/control/build/linux-amd64/gensrc/java/nio/charset/UnsupportedCharsetException.java
+-../../openjdk6-b12/control/build/linux-amd64/gensrc/javax/management/remote/rmi/RMIConnectionImpl_Stub.java
+-../../openjdk6-b12/control/build/linux-amd64/gensrc/javax/management/remote/rmi/RMIServerImpl_Stub.java
+ ../../openjdk6-b12/control/build/linux-amd64/gensrc/sun/nio/ch/AlreadyBoundException.java
+ ../../openjdk6-b12/control/build/linux-amd64/gensrc/sun/nio/cs/StandardCharsets.java
+ ../../openjdk6-b12/control/build/linux-amd64/gensrc/sun/util/CoreResourceBundleControl.java
+Index: ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/openjdk/openjdk.build
+===================================================================
+--- ikvm-0.40.0.1+dfsg.orig/ikvm-0.40.0.1/openjdk/openjdk.build 2009-06-08 08:54:40.000000000 +0100
++++ ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/openjdk/openjdk.build 2009-06-08 08:55:59.000000000 +0100
+@@ -8,7 +8,7 @@
+ <property name="pathsep" value=";" />
+ </if>
+
+- <target name="all" depends="classes vfs core">
++ <target name="all" depends="classes rmi vfs core">
+ </target>
+
+ <target name="classes">
+@@ -24,11 +24,7 @@
+ </delete>
+ <delete>
+ <fileset basedir="${OpenJDK.dir}">
+- <include name="jdk/src/share/classes/**.class"/>
+- <include name="jdk/src/solaris/classes/**.class"/>
+- <include name="jdk/src/windows/classes/**.class"/>
+- <include name="control/build/linux-amd64/gensrc/**.class"/>
+- <include name="control/build/linux-amd64/impsrc/**.class"/>
++ <include name="**.class"/>
+ </fileset>
+ </delete>
+ <delete>
+@@ -58,6 +54,28 @@
+ <exec program="javac" commandline="-J-Xmx1536M -g -nowarn -bootclasspath ../classpath/mscorlib.jar${pathsep}../classpath/System.jar${pathsep}../classpath/System.Core.jar${pathsep}../classpath/System.Data.jar${pathsep}../classpath/System.Drawing.jar${pathsep}../classpath/IKVM.Runtime.jar @allsources.lst" useruntimeengine="false" />
+ </target>
+
++ <target name="rmi">
++ <property name="VMARGS" value="-J-client -J-Xmx896m -J-Xms128m -J-XX:PermSize=32m -J-XX:MaxPermSize=160m" />
++ <property name="CLASSPATH" value="${OpenJDK.dir}/jdk/src/share/classes/${pathsep}${OpenJDK.dir}/control/build/linux-amd64/impsrc/${pathsep}." />
++ <property name="OUTPUT" value="${OpenJDK.dir}/control/build/linux-amd64/classes/" />
++ <property name="ARGS" value="${VMARGS} -bootclasspath ${CLASSPATH} -d ${OUTPUT}" />
++ <exec program="rmic" commandline="${ARGS} -v1.1 sun.rmi.registry.RegistryImpl" />
++ <exec program="rmic" commandline="${ARGS} -v1.1 sun.rmi.transport.DGCImpl" />
++ <exec program="rmic" commandline="${ARGS} -v1.2 sun.rmi.server.Activation$ActivationSystemImpl" />
++ <exec program="rmic" commandline="${ARGS} -v1.2 java.rmi.activation.ActivationGroup" />
++ <exec program="rmic" commandline="${ARGS} -v1.2 com.sun.jndi.rmi.registry.ReferenceWrapper" />
++ <exec program="rmic" commandline="${ARGS} -v1.2 javax.management.remote.rmi.RMIConnectionImpl" />
++ <exec program="rmic" commandline="${ARGS} -v1.2 -iiop javax.management.remote.rmi.RMIConnectionImpl" />
++ <exec program="rmic" commandline="${ARGS} -v1.2 -iiop -standardPackage javax.management.remote.rmi.RMIConnectionImpl" />
++ <exec program="rmic" commandline="${ARGS} -v1.2 javax.management.remote.rmi.RMIServerImpl" />
++ <exec program="rmic" commandline="${ARGS} -v1.2 -iiop javax.management.remote.rmi.RMIServerImpl" />
++ <exec program="rmic" commandline="${ARGS} -v1.2 -iiop -standardPackage javax.management.remote.rmi.RMIServerImpl" />
++ <exec program="rmic" commandline="${ARGS} -iiop javax.management.remote.rmi.RMIConnection" />
++ <exec program="rmic" commandline="${ARGS} -iiop -standardPackage javax.management.remote.rmi.RMIConnection" />
++ <exec program="rmic" commandline="${ARGS} -iiop javax.management.remote.rmi.RMIServer" />
++ <exec program="rmic" commandline="${ARGS} -iiop -standardPackage javax.management.remote.rmi.RMIServer" />
++ </target>
++
+ <target name="vfs">
+ <!-- This file is generated here, but it is added as a resource to IKVM.Runtime.dll, because Ref.Emit on .NET 1.1 doesn't support adding a raw resource. -->
+ <zip zipfile="vfs.zip">
+Index: ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/openjdk/response.txt
+===================================================================
+--- ikvm-0.40.0.1+dfsg.orig/ikvm-0.40.0.1/openjdk/response.txt 2009-06-08 08:53:09.000000000 +0100
++++ ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/openjdk/response.txt 2009-06-08 08:53:58.000000000 +0100
+@@ -733,7 +733,6 @@
+ sun/management/*.class
+ ../../openjdk6-b12/control/build/linux-amd64/classes/javax/management/remote/rmi/*.class
+ ../../openjdk6-b12/control/build/linux-amd64/classes/org/omg/stub/javax/management/remote/rmi/*.class
+- ../../openjdk6-b12/control/build/linux-amd64/gensrc/javax/management/remote/rmi/*.class
+ ../../openjdk6-b12/jdk/src/share/classes/com/sun/jmx/defaults/*.class
+ ../../openjdk6-b12/jdk/src/share/classes/com/sun/jmx/interceptor/*.class
+ ../../openjdk6-b12/jdk/src/share/classes/com/sun/jmx/mbeanserver/*.class
Modified: packages/ikvm/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/patches/series?rev=4961&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/patches/series (original)
+++ packages/ikvm/trunk/debian/patches/series Mon Jun 8 11:09:37 2009
@@ -1,3 +1,4 @@
03-use_mono.snk_for_ikvm-key.patch
04-decouple_arch_build_from_indep.patch
01-use_system_SharpZipLib.patch
+05-produce-rmi-at-compile-time.patch
Modified: packages/ikvm/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/rules?rev=4961&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/rules (original)
+++ packages/ikvm/trunk/debian/rules Mon Jun 8 11:09:37 2009
@@ -8,8 +8,8 @@
export MONO_SHARED_DIR=$(CURDIR)/debian
-DEB_CLI_ABI_VERSION = 0.38
-DEB_CLI_API_VERSION = 0.38.0.2
+DEB_CLI_ABI_VERSION = 0.40
+DEB_CLI_API_VERSION = 0.40.0.1
DEB_CLI_RUNTIME = cli
UPVERSION = $(shell dpkg-parsechangelog | grep '^Version: ' | sed -n 's/^Version: \([.0-9]*\).*/\1/p')
CFLAGS = -Wall -g
@@ -45,30 +45,6 @@
cd debian && uudecode < mono.snk.uu
- #First, the unsigned build to replace bootstrap binaries with clean versions
- nant -v -f:ikvm-$(UPVERSION)/tools/tools.build
- nant -v -f:ikvm-$(UPVERSION)/runtime/runtime.build first-pass
- cp ikvm-$(UPVERSION)/bin/IKVM.Runtime.dll ikvm-$(UPVERSION)/classpath/
- nant -v -f:ikvm-$(UPVERSION)/refemit/refemit.build
- nant -v -f:ikvm-$(UPVERSION)/ikvmc/ikvmc.build
- nant -v -f:ikvm-$(UPVERSION)/openjdk/openjdk.build
- nant -v -f:ikvm-$(UPVERSION)/runtime/runtime.build
- nant -v -f:ikvm-$(UPVERSION)/ikvmstub/ikvmstub.build
-
- # We have what we need - now generate new bootstrap binaries
- $(DEB_CLI_RUNTIME) ikvm-$(UPVERSION)/bin/ikvmstub.exe ikvm-$(UPVERSION)/classpath/IKVM.Runtime.dll
- $(DEB_CLI_RUNTIME) ikvm-$(UPVERSION)/bin/ikvmstub.exe /usr/lib/mono/2.0/mscorlib.dll
- $(DEB_CLI_RUNTIME) ikvm-$(UPVERSION)/bin/ikvmstub.exe /usr/lib/mono/2.0/System.dll
-
- # Back up the originals, for great clean-rule justice
- rename -f 's/\.jar$$/\.jar\.dist/' ikvm-$(UPVERSION)/classpath/*
-
- # Pop in the new ones
- mv *.jar ikvm-$(UPVERSION)/classpath
- rm ikvm-$(UPVERSION)/classpath/IKVM.Runtime.dll
- nant -v -f:ikvm-$(UPVERSION)/ikvm.build clean
-
- #Now, the real build
nant -v -f:ikvm-$(UPVERSION)/ikvm.build signed
touch build-indep-stamp
@@ -99,7 +75,6 @@
ikvm-*/tools/pubkeytoken.txt \
ikvm-*/runtime/AssemblyInfo.cs \
ikvm-*/openjdk/AssemblyInfo.java \
- ikvm-*/runtime/JniInterface.cs \
ikvm-*/openjdk/vfs.zip \
ikvm-*/openjdk/Configuration.java \
debian/mono.snk
@@ -215,7 +190,6 @@
rm ikvm-$(UPVERSION)+dfsg/ikvm-*/tools/pubkey.txt \
ikvm-$(UPVERSION)+dfsg/ikvm-*/runtime/AssemblyInfo.cs \
ikvm-$(UPVERSION)+dfsg/ikvm-*/openjdk/AssemblyInfo.java \
- ikvm-$(UPVERSION)+dfsg/ikvm-*/runtime/JniInterface.cs \
ikvm-$(UPVERSION)+dfsg/ikvm-*/openjdk/Configuration.java \
ikvm-$(UPVERSION)+dfsg/ikvm-*/openjdk/vfs.zip
tar cfvz ../tarballs/ikvm_$(UPVERSION)+dfsg.orig.tar.gz ikvm-$(UPVERSION)+dfsg
More information about the Pkg-cli-apps-commits
mailing list