[Pkg-mono-svn-commits] rev 2415 - mono/trunk/debian
D. Moonfire
dmoonfire-guest at costa.debian.org
Sun Apr 9 21:00:28 UTC 2006
Author: dmoonfire-guest
Date: 2006-04-09 21:00:27 +0000 (Sun, 09 Apr 2006)
New Revision: 2415
Added:
mono/trunk/debian/MonoGetAssemblyName.cs
mono/trunk/debian/mono-gac.dirs
mono/trunk/debian/mono-gac.postinst
Removed:
mono/trunk/debian/GetAssemblyName.cs
mono/trunk/debian/mono-gac.posint
Modified:
mono/trunk/debian/changelog
mono/trunk/debian/control
mono/trunk/debian/mono-gac.install
mono/trunk/debian/mono-gac.prerm
mono/trunk/debian/mono.runtime-script
mono/trunk/debian/rules
Log:
Got the mono-gac package to set up the late-GAC installer
properly. Also moved to not needing monop as part of the
installer and fixing a couple minor bugs.
Deleted: mono/trunk/debian/GetAssemblyName.cs
===================================================================
--- mono/trunk/debian/GetAssemblyName.cs 2006-04-09 20:50:29 UTC (rev 2414)
+++ mono/trunk/debian/GetAssemblyName.cs 2006-04-09 21:00:27 UTC (rev 2415)
@@ -1,14 +0,0 @@
-using System;
-using System.Reflection;
-
-public class GetAssemblyName
-{
- public static void Main(string [] args)
- {
- if (args.Length == 0)
- throw new Exception("You must supply an assembly name");
-
- Assembly assembly = Assembly.LoadFile(args[0]);
- Console.WriteLine("{0}", assembly.FullName);
- }
-}
Copied: mono/trunk/debian/MonoGetAssemblyName.cs (from rev 2411, mono/trunk/debian/GetAssemblyName.cs)
Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog 2006-04-09 20:50:29 UTC (rev 2414)
+++ mono/trunk/debian/changelog 2006-04-09 21:00:27 UTC (rev 2415)
@@ -1,3 +1,10 @@
+mono (1.1.13.6-2) unstable; urgency=low
+
+ * Dylan R. E. Moonfire
+ + Included the late-GAC install hooks.
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org> Sun, 09 Apr 2006 14:07:23 -0500
+
mono (1.1.13.6-1) unstable; urgency=high
* New upstream release
Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control 2006-04-09 20:50:29 UTC (rev 2414)
+++ mono/trunk/debian/control 2006-04-09 21:00:27 UTC (rev 2415)
@@ -932,7 +932,7 @@
Package: mono-gac
Section: devel
Architecture: all
-Depends: ${cli:Depends}
+Depends: ${cli:Depends}, cli-common (>= 0.4.0)
Provides: global-assembly-cache-tool
Description: Mono GAC tool
Mono is a platform for running and developing applications based on the
Added: mono/trunk/debian/mono-gac.dirs
===================================================================
--- mono/trunk/debian/mono-gac.dirs 2006-04-09 20:50:29 UTC (rev 2414)
+++ mono/trunk/debian/mono-gac.dirs 2006-04-09 21:00:27 UTC (rev 2415)
@@ -0,0 +1 @@
+usr/share/cli-common/runtimes.d
Modified: mono/trunk/debian/mono-gac.install
===================================================================
--- mono/trunk/debian/mono-gac.install 2006-04-09 20:50:29 UTC (rev 2414)
+++ mono/trunk/debian/mono-gac.install 2006-04-09 21:00:27 UTC (rev 2415)
@@ -1,2 +1,4 @@
debian/tmp/usr/bin/gacutil
debian/tmp/usr/lib/mono/1.0/gacutil.exe
+debian/tmp/usr/share/cli-common/runtimes.d/
+debian/MonoGetAssemblyName.exe /usr/share/mono/
Deleted: mono/trunk/debian/mono-gac.posint
===================================================================
--- mono/trunk/debian/mono-gac.posint 2006-04-09 20:50:29 UTC (rev 2414)
+++ mono/trunk/debian/mono-gac.posint 2006-04-09 21:00:27 UTC (rev 2415)
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-update-alternatives \
- --install /usr/bin/cli-gacutil global-assembly-cache-tool /usr/bin/gacutil 10 \
- --slave /usr/share/man/man1/cli-gacutil.1.gz cli-gacutil.1.gz /usr/share/man/man1/gacutil.1.gz
-
-#DEBHELPER#
Copied: mono/trunk/debian/mono-gac.postinst (from rev 2411, mono/trunk/debian/mono-gac.posint)
===================================================================
--- mono/trunk/debian/mono-gac.posint 2006-04-08 14:02:09 UTC (rev 2411)
+++ mono/trunk/debian/mono-gac.postinst 2006-04-09 21:00:27 UTC (rev 2415)
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+# Install the gac
+/usr/share/cli-common/gac-install mono
+
+# Update the alternatives
+update-alternatives \
+ --install /usr/bin/cli-gacutil global-assembly-cache-tool /usr/bin/gacutil 10 \
+ --slave /usr/share/man/man1/cli-gacutil.1.gz cli-gacutil.1.gz /usr/share/man/man1/gacutil.1.gz
+
+#DEBHELPER#
Modified: mono/trunk/debian/mono-gac.prerm
===================================================================
--- mono/trunk/debian/mono-gac.prerm 2006-04-09 20:50:29 UTC (rev 2414)
+++ mono/trunk/debian/mono-gac.prerm 2006-04-09 21:00:27 UTC (rev 2415)
@@ -2,6 +2,7 @@
if [ "$1" = remove ]; then
update-alternatives --remove global-assembly-cache-tool /usr/bin/gacutil
+ /usr/share/cli-common/gac-remove mono
fi
#DEBHELPER#
Modified: mono/trunk/debian/mono.runtime-script
===================================================================
--- mono/trunk/debian/mono.runtime-script 2006-04-09 20:50:29 UTC (rev 2414)
+++ mono/trunk/debian/mono.runtime-script 2006-04-09 21:00:27 UTC (rev 2415)
@@ -135,29 +135,15 @@
my $dll = shift;
# Open a pipe to monop
- my $cmd = "/usr/bin/monop -r:$dll";
- open PIPE, "$cmd |" or die "E: Cannot open pipe: monop $dll";
+ my $cmd = "/usr/bin/mono /usr/share/mono/MonoGetAssemblyName.exe $dll";
+ open PIPE, "$cmd |" or die "E: Cannot open pipe to assembly builder $dll";
- # Go through the file and get the last four lines when we find
- # PublicKey (which is the end of the block.
- my @p = ();
+ # This generate a single line that produces the desired results
+ $_ = <PIPE>;
+ chomp;
+ my @p = split(/, /);
+ close PIPE;
- while (<PIPE>)
- {
- # Add to the list
- chomp;
- push @p, $_;
-
- # Get rid of elements to keep only the last four lines
- shift @p while (@p > 4);
-
- # Stop if we have the publick key
- last if /PublicKey/;
- }
-
- # Full version
- # return join(",", @p);
-
# Clean up the path and build the mono-specific directory
my %hash = ();
$hash{"Assembly"} = shift @p;
Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules 2006-04-09 20:50:29 UTC (rev 2414)
+++ mono/trunk/debian/rules 2006-04-09 21:00:27 UTC (rev 2415)
@@ -47,6 +47,10 @@
--with-libgdiplus=installed --with-x=yes
$(MAKE)
chmod +x debian/dh_makeclilibs debian/dh_clideps
+ # Build the late-GAC tool
+ mcs/class/lib/default/mcs.exe /t:exe \
+ /out:debian/MonoGetAssemblyName.exe \
+ debian/MonoGetAssemblyName.cs
touch build-stamp
clean: unpatch
@@ -57,7 +61,7 @@
# distclean misses stuff
find -name "*.mdb" | xargs rm -f
-cd debian/detector && $(MAKE) clean
- rm -f cli-wrapper
+ rm -f cli-wrapper debian/MonoGetAssemblyName.exe
rm -rf $(MONO_SHARED_DIR)/.wapi
dh_clean
@@ -85,6 +89,8 @@
# CLI Policy
cd debian && find -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" | xargs chmod -x
cd debian && find -type f -name "*.exe" | xargs chmod +x
+ # Late GAC
+ install -D -m755 debian/mono.runtime-script debian/tmp/usr/share/cli-common/runtimes.d/mono
binary-indep: build install
dh_testdir -i
More information about the Pkg-mono-svn-commits
mailing list