[Pkg-cli-apps-commits] r4962 - in /packages/ikvm/trunk/debian: IKVM.OpenJDK.ClassLibrary.dll.config IKVM.OpenJDK.Core.dll.config changelog control ikvm.pc.in rules

Mon Jun 8 13:09:34 UTC 2009

Author: directhex-guest
Date: Mon Jun  8 13:09:34 2009
New Revision: 4962

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4962
Log:
Did I say "sane"? I meant "slightly more insane"

Added:
    packages/ikvm/trunk/debian/IKVM.OpenJDK.Core.dll.config   (props changed)
      - copied unchanged from r4960, packages/ikvm/trunk/debian/IKVM.OpenJDK.ClassLibrary.dll.config
Removed:
    packages/ikvm/trunk/debian/IKVM.OpenJDK.ClassLibrary.dll.config
Modified:
    packages/ikvm/trunk/debian/changelog
    packages/ikvm/trunk/debian/control
    packages/ikvm/trunk/debian/ikvm.pc.in
    packages/ikvm/trunk/debian/rules

Propchange: packages/ikvm/trunk/debian/IKVM.OpenJDK.Core.dll.config
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: packages/ikvm/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/changelog?rev=4962&op=diff
==============================================================================

--- packages/ikvm/trunk/debian/changelog (original)
+++ packages/ikvm/trunk/debian/changelog Mon Jun  8 13:09:34 2009
@@ -1,12 +1,20 @@
 ikvm (0.40.0.1+dfsg-1) UNRELEASED; urgency=low
+
+  PCFILE DECISION - SHOULD WE PULL IN EVERY ASSEMBLY?
 
   * New upstream release
   * debian/control:
     + Fix Vcs-* fields
+    + Bump to standards version 3.8.1
+  * debian/IKVM.OpenJDK.ClassLibrary.dll.config:
+    + Renamed to IKVM.OpenJDK.Core.dll.config
+  * debian/ikvm.pc.in:
+    + Updated for IKVM.OpenJDK.Core.dll
   * debian/rules:
     + Ensure CLI policy folder is actually used for get-orig-source
     + Stop deleting JniInterface.cs
-    + Remove all our bootstrapping nonsense - IKVM build system is sane now!
+    + Build refemit before ikvmc
+    + Add new libraries to messy bootstrapping procedure
     + Update API/ABI version
   * debian/ikvm.installcligac:
     + Update list of assemblies

Modified: packages/ikvm/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/control?rev=4962&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/control (original)
+++ packages/ikvm/trunk/debian/control Mon Jun  8 13:09:34 2009
@@ -15,8 +15,9 @@
  tofrodos,
  libmono-winforms2.0-cil,
  libmono-i18n2.0-cil,
- libmono-sharpzip2.84-cil 
-Standards-Version: 3.8.0
+ libmono-sharpzip2.84-cil,
+ libmono-system-data2.0-cil
+Standards-Version: 3.8.1
 Homepage: http://www.ikvm.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/ikvm/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/

Modified: packages/ikvm/trunk/debian/ikvm.pc.in
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/ikvm.pc.in?rev=4962&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/ikvm.pc.in (original)
+++ packages/ikvm/trunk/debian/ikvm.pc.in Mon Jun  8 13:09:34 2009
@@ -6,4 +6,4 @@
 Name: IKVM.NET
 Description: An implementation of Java for Mono and the Microsoft .NET Framework.
 Version: @VERSION@
-Libs: -r:${libdir}/cli/ikvm- at DEB_CLI_ABI_VERSION@/IKVM.Runtime.dll -r:${libdir}/cli/ikvm- at DEB_CLI_ABI_VERSION@/IKVM.OpenJDK.ClassLibrary.dll
+Libs: -r:${libdir}/cli/ikvm- at DEB_CLI_ABI_VERSION@/IKVM.Runtime.dll -r:${libdir}/cli/ikvm- at DEB_CLI_ABI_VERSION@/IKVM.OpenJDK.Core.dll

Modified: packages/ikvm/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/rules?rev=4962&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/rules (original)
+++ packages/ikvm/trunk/debian/rules Mon Jun  8 13:09:34 2009
@@ -45,6 +45,33 @@
 
 	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
+	$(DEB_CLI_RUNTIME) ikvm-$(UPVERSION)/bin/ikvmstub.exe /usr/lib/mono/2.0/System.Core.dll
+	$(DEB_CLI_RUNTIME) ikvm-$(UPVERSION)/bin/ikvmstub.exe /usr/lib/mono/2.0/System.Data.dll
+	$(DEB_CLI_RUNTIME) ikvm-$(UPVERSION)/bin/ikvmstub.exe /usr/lib/mono/2.0/System.Drawing.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


