[Pkg-cli-apps-commits] r4414 - in /packages/ikvm/trunk/debian: changelog docs patches/02-use_ikvm-key_for_openJDKConfiguration.patch patches/series rules
directhex-guest at users.alioth.debian.org
directhex-guest at users.alioth.debian.org
Wed Jan 7 22:28:55 UTC 2009
Author: directhex-guest
Date: Wed Jan 7 22:28:55 2009
New Revision: 4414
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4414
Log:
IKVM, ready & tested!
(note: no lib split yet. save for next upload IMHO)
Added:
packages/ikvm/trunk/debian/patches/02-use_ikvm-key_for_openJDKConfiguration.patch
Modified:
packages/ikvm/trunk/debian/changelog
packages/ikvm/trunk/debian/docs
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=4414&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/changelog (original)
+++ packages/ikvm/trunk/debian/changelog Wed Jan 7 22:28:55 2009
@@ -1,7 +1,7 @@
ikvm (0.38.0.2+dfsg-1) UNRELEASED; urgency=low
[ Jo Shields ]
- * New upstream release
+ * New upstream release, based on GNU Classpath 0.95 and OpenJDK 6b12
* Repackaged - uses completely generated .orig, see README.source
* Group Policy:
+ get-orig-source target in debian/rules
Modified: packages/ikvm/trunk/debian/docs
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/docs?rev=4414&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/docs (original)
+++ packages/ikvm/trunk/debian/docs Wed Jan 7 22:28:55 2009
@@ -1,1 +1,1 @@
-ikvm-*/THANKYOU
+debian/README.source
Added: packages/ikvm/trunk/debian/patches/02-use_ikvm-key_for_openJDKConfiguration.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/patches/02-use_ikvm-key_for_openJDKConfiguration.patch?rev=4414&op=file
==============================================================================
--- packages/ikvm/trunk/debian/patches/02-use_ikvm-key_for_openJDKConfiguration.patch (added)
+++ packages/ikvm/trunk/debian/patches/02-use_ikvm-key_for_openJDKConfiguration.patch Wed Jan 7 22:28:55 2009
@@ -1,0 +1,86 @@
+Author: Jo Shields
+Description: This patch ensures that Configuration.java uses the
+Description: ikvm-key configured for the build, not a hard-coded value
+===================================================================
+Index: ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/openjdk/Configuration.java.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/openjdk/Configuration.java.in 2009-01-07 21:36:03.000000000 +0000
+@@ -0,0 +1,32 @@
++/*
++ Copyright (C) 2007 Jeroen Frijters
++
++ This software is provided 'as-is', without any express or implied
++ warranty. In no event will the authors be held liable for any damages
++ arising from the use of this software.
++
++ Permission is granted to anyone to use this software for any purpose,
++ including commercial applications, and to alter it and redistribute it
++ freely, subject to the following restrictions:
++
++ 1. The origin of this software must not be misrepresented; you must not
++ claim that you wrote the original software. If you use this software
++ in a product, an acknowledgment in the product documentation would be
++ appreciated but is not required.
++ 2. Altered source versions must be plainly marked as such, and must not be
++ misrepresented as being the original software.
++ 3. This notice may not be removed or altered from any source distribution.
++
++ Jeroen Frijters
++ jeroen at frijters.net
++
++*/
++package gnu.classpath;
++
++/*
++ * This is a temporary class while we're using the GNU Classpath AWT/Swing implementation.
++ */
++public interface Configuration
++{
++ String default_awt_peer_toolkit = "ikvm.awt.NetToolkit, IKVM.AWT.WinForms, Version=0.38.0.2, Culture=neutral, PublicKeyToken=@PUBLICKEYTOKEN@";
++}
+Index: ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/openjdk/openjdk.build
+===================================================================
+--- ikvm-0.38.0.2+dfsg.orig/ikvm-0.38.0.2/openjdk/openjdk.build 2009-01-07 21:13:36.000000000 +0000
++++ ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/openjdk/openjdk.build 2009-01-07 21:35:52.000000000 +0000
+@@ -37,6 +37,7 @@
+ </fileset>
+ </delete>
+ <property name="IKVM.Runtime" value="IKVM.Runtime" />
++ <loadfile file="../tools/pubkeytoken.txt" property="publickeytoken" />
+ <if test="${signoption != ''}">
+ <loadfile file="../tools/pubkey.txt" property="publickey" />
+ <property name="IKVM.Runtime" value="IKVM.Runtime, PublicKey=${publickey}" />
+@@ -48,6 +49,13 @@
+ </replacetokens>
+ </filterchain>
+ </copy>
++ <copy file="Configuration.java.in" tofile="Configuration.java" outputencoding="ascii" overwrite="true">
++ <filterchain>
++ <replacetokens>
++ <token key="PUBLICKEYTOKEN" value="${publickeytoken}" />
++ </replacetokens>
++ </filterchain>
++ </copy>
+ <exec program="javac" commandline="-J-Xmx1536M -g -nowarn -bootclasspath ../classpath/mscorlib.jar${pathsep}../classpath/System.jar${pathsep}../classpath/IKVM.Runtime.jar @allsources.lst" useruntimeengine="false" />
+ </target>
+
+Index: ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/tools/pubkey.cs
+===================================================================
+--- ikvm-0.38.0.2+dfsg.orig/ikvm-0.38.0.2/tools/pubkey.cs 2009-01-07 21:36:20.000000000 +0000
++++ ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/tools/pubkey.cs 2009-01-07 21:43:50.000000000 +0000
+@@ -45,5 +45,14 @@
+ {
+ sw.Write(sb);
+ }
++ sb = new StringBuilder();
++ foreach (byte b in Assembly.GetExecutingAssembly().GetName().GetPublicKeyToken())
++ {
++ sb.AppendFormat("{0:X2}", b);
++ }
++ using (StreamWriter sw = new StreamWriter("pubkeytoken.txt"))
++ {
++ sw.Write(sb.ToString().ToLower());
++ }
+ }
+ }
Modified: packages/ikvm/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/patches/series?rev=4414&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/patches/series (original)
+++ packages/ikvm/trunk/debian/patches/series Wed Jan 7 22:28:55 2009
@@ -1,3 +1,4 @@
+02-use_ikvm-key_for_openJDKConfiguration.patch
03-use_mono.snk_for_ikvm-key.patch
04-decouple_arch_build_from_indep.patch
01-use_system_SharpZipLib.patch
Modified: packages/ikvm/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/rules?rev=4414&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/rules (original)
+++ packages/ikvm/trunk/debian/rules Wed Jan 7 22:28:55 2009
@@ -98,10 +98,12 @@
-exec rm -rvf {} \;
find . -name *.class -exec rm -rvf {} \;
rm -f ikvm-*/tools/pubkey.txt \
+ 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
rename -f 's/\.dist$$//' ikvm-*/classpath/*
-rm -rf $(MONO_SHARED_DIR)/.wapi $(XDG_CONFIG_HOME)/.mono
@@ -217,6 +219,7 @@
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 ikvm_$(UPVERSION)+dfsg.orig.tar.gz ikvm-$(UPVERSION)+dfsg
rm -fr ikvm-$(UPVERSION)+dfsg
More information about the Pkg-cli-apps-commits
mailing list