[Pkg-mono-svn-commits] rev 1633 - cli-common/trunk

[Mirco Bauer]

Author: meebey-guest
Date: 2005-04-16 18:49:53 +0000 (Sat, 16 Apr 2005)
New Revision: 1633

Modified:
   cli-common/trunk/dh_clideps
   cli-common/trunk/dh_makeclilibs
Log:
- where there is no /usr/bin/cli, just give out a warning, not error (CIL parser may not need a CLR).



Modified: cli-common/trunk/dh_clideps
===================================================================
--- cli-common/trunk/dh_clideps	2005-04-16 18:09:04 UTC (rev 1632)
+++ cli-common/trunk/dh_clideps	2005-04-16 18:49:53 UTC (rev 1633)
@@ -53,6 +53,10 @@
 This option can be used to specify a relaxed dependency on the VM
 by-hand in the control file, eg. "mono-jit | cli-virtual-machine".
 
+=item B<--internal-mono>                             
+
+Uses the mono runtime in . (used for bootstrapping mono packages)  
+
 =cut
 
 init();
@@ -62,7 +66,7 @@
 my $cli_version = `$cli --version 2>&1`;
 my $cli_parser;
 
-if (-x "/usr/bin/monodis" ) {
+if (-x "/usr/bin/monodis") {
     $clr = "mono";
     $cli_parser = "/usr/bin/monodis";
     verbose_print("Will use Mono (/usr/bin/monodis) for CIL parsing.");
@@ -85,21 +89,23 @@
 }
 
 if (!defined $cli_version || $cli_version eq "" ) {
-    error( "No CLR is installed, aborting. (Probably forgot to Build-Depend on cli-virtual-machine.)");
-} elsif ($clr eq "mono") {
+    warning("Warning! No CLR is installed. (Probably forgot to Build-Depend on cli-virtual-machine.)");
+} else {
+  if ($clr eq "mono") {
     if ($cli_version =~ /(mint|version)\ ([\d\.]+)/) {
       $cli_version = "$2";
     } else {
       error("Unable to parse Mono version out of \"$cli_version\".");
     }
-} elsif ($clr eq "pnet") {
+  } elsif ($clr eq "pnet") {
     if ($cli_version =~ /ILRUN\ ([\d\.]+)/) {
       $cli_version = "$1";
     } else {
       error("Unable to parse Portable.NET version out of \"$cli_version\".");
     }
-} else {
+  } else {
     error("Unable to detect CLR, aborting.");
+  }
 }
 
 # Cleaning the paths given on the command line

Modified: cli-common/trunk/dh_makeclilibs
===================================================================
--- cli-common/trunk/dh_makeclilibs	2005-04-16 18:09:04 UTC (rev 1632)
+++ cli-common/trunk/dh_makeclilibs	2005-04-16 18:49:53 UTC (rev 1633)
@@ -75,6 +75,10 @@
 Exclude files that contain "item" anywhere in their filename or directory 
 from being treated as shared libraries.
 
+=item B<--internal-mono>
+
+Uses the mono runtime in . (used for bootstrapping mono packages)
+
 =back
 
 =head1 EXAMPLES
@@ -121,7 +125,11 @@
 
 if (-x "/usr/bin/monodis") {
     $clr = "mono";
-    $cli_parser = "/usr/bin/monodis";
+    if (defined($dh{INTERNAL_MONO_FLAG})) {
+      $cli_parser = "";
+    } else {
+      $cli_parser = "/usr/bin/monodis";
+    }
     verbose_print("Will use Mono (/usr/bin/monodis) for CIL parsing.");
 } elsif (-x "/usr/bin/ildasm") {
     $clr = "pnet";