[Pkg-mono-svn-commits] rev 2866 - in cli-common/trunk: . debian

[Mirco Bauer]

Author: meebey-guest
Date: 2006-11-22 23:36:23 +0100 (Wed, 22 Nov 2006)
New Revision: 2866

Modified:
   cli-common/trunk/debian/rules
   cli-common/trunk/dh_clideps
Log:
- little refactoring for resolving clilibs



Modified: cli-common/trunk/debian/rules
===================================================================
--- cli-common/trunk/debian/rules	2006-11-22 10:44:18 UTC (rev 2865)
+++ cli-common/trunk/debian/rules	2006-11-22 22:36:23 UTC (rev 2866)
@@ -48,5 +48,7 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
+binary-arch:
+
 binary: binary-indep
-.PHONY: clean build binary-indep install binary
+.PHONY: clean build install binary-indep binary-arch binary

Modified: cli-common/trunk/dh_clideps
===================================================================
--- cli-common/trunk/dh_clideps	2006-11-22 10:44:18 UTC (rev 2865)
+++ cli-common/trunk/dh_clideps	2006-11-22 22:36:23 UTC (rev 2866)
@@ -397,6 +397,42 @@
    }
 }
 
+sub loadOverrides {
+   my $package = shift;
+   our $overridedata = shift;
+   
+   # load clideps overrides
+   verbose_print("Loading clideps-override for $package...");
+   my $fh;
+   open($fh, "cat $pwd/debian/$package.clideps-override 2> /dev/null |");
+   while (<$fh>) {
+     /(\S+)\s+(\S+)(?:\s+(\(\S+\s+\S+\)))?\n?/;
+     my ($type, $package, $version);
+     $type = $1;    
+     $package = $2; 
+     $version = $3 if defined($3);
+     if ($version) {
+       $overridedata->{$package} = $type." ".$version;
+     } else {
+       $overridedata->{$package} = $type;
+     }
+   }
+   close($fh);
+}
+
+sub resolveClilibRefs {
+   my $package = shift;
+   my $assembly_filename = shift;
+   my %ret = ( depends => [],
+               recommends => [],
+               suggests => [] );
+
+   my %overridedata;
+   loadOverrides($package, \%overridedata);
+   
+   # TODO: finish me
+}
+
 sub resolveShlibRefs {
    my $package = shift;
    my $assembly_filename = shift;
@@ -416,25 +452,10 @@
    loadDllMap("/etc/mono/config", \%dllmapdata);
    loadDllMap("$pwd/debian/tmp/etc/mono/config", \%dllmapdata);
    loadDllMap($config_filename, \%dllmapdata);
-    
-   # load clideps overrides
-   verbose_print("Loading clideps-override...");
-   my %clideps_override;
-   open($fh, "cat $pwd/debian/$package.clideps-override 2> /dev/null |");
-   while (<$fh>) {
-     /(\S+)\s+(\S+)(?:\s+(\(\S+\s+\S+\)))?\n?/;
-     my ($type, $package, $version);
-     $type = $1;    
-     $package = $2; 
-     $version = $3 if defined($3);
-     if ($version) {
-       $clideps_override{$package} = $type." ".$version;
-     } else {
-       $clideps_override{$package} = $type;
-     }
-   }
-   close($fh);
    
+   my %overridedata;
+   loadOverrides($package, \%overridedata);
+   
    # parse modulerefs
    my (undef, $tmpfile) = File::Temp::tempfile("/tmp/".basename($0).".XXXX", UNLINK => 1);
    my $command = "LANG=C $cli_parser_paths $cli_parser --moduleref $assembly_filename 2>&1 > $tmpfile";
@@ -495,10 +516,10 @@
        $pkg = "libc6 $ver | libc6.1 $ver";
      }
      
-     if (defined($clideps_override{$pkgname})) {
+     if (defined($overridedata{$pkgname})) {
        verbose_print("Found clideps-overidde: $pkgname for: $package");
 
-       my $override = $clideps_override{$pkgname};
+       my $override = $overridedata{$pkgname};
        $override =~ m/(\S+)(?:\s+(\(\S+\s+\S+\)))?/;
        if ($1 eq "suggests" ||
            $1 eq "recommends") {
@@ -514,6 +535,7 @@
          $pkg = $pkgref;
        }
      }
+     
      push(@{$ret{$type}}, $pkg);
    } 
    close(F);