[csw-devel] SF.net SVN: gar:[6606] csw/mgar/gar/v2

[dmichelsen at users.sourceforge.net]

Revision: 6606
          http://gar.svn.sourceforge.net/gar/?rev=6606&view=rev
Author:   dmichelsen
Date:     2009-09-29 11:32:04 +0000 (Tue, 29 Sep 2009)

Log Message:
-----------
mGAR v2: Fix handling of ISA dirs with +/- included

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/cswproto
    csw/mgar/gar/v2/gar.pkg.mk

Modified: csw/mgar/gar/v2/bin/cswproto
===================================================================
--- csw/mgar/gar/v2/bin/cswproto	2009-09-29 11:00:15 UTC (rev 6605)
+++ csw/mgar/gar/v2/bin/cswproto	2009-09-29 11:32:04 UTC (rev 6606)
@@ -112,6 +112,8 @@
     open F, $common || die "Couldn't open $common";
     while (<F>) {
         chomp; next if /^\s*$/ or /^#/;
+	s/\+/\\+/g;
+	s/\-/\\-/g;
         my @c = split( m!/! );
         my @pc = map { join( '/', @c[0..$_] ) } 1..$#c;
         $alldirs{$_} = 1 foreach (@pc);

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2009-09-29 11:00:15 UTC (rev 6605)
+++ csw/mgar/gar/v2/gar.pkg.mk	2009-09-29 11:32:04 UTC (rev 6606)
@@ -227,7 +227,7 @@
 # between the prefix and the suffix.
 # usage: $(call isadirs,<prefix>,<suffix>)
 # expands to <prefix>/<isa1>/<suffix> <prefix>/<isa2>/<suffix> ...
-isadirs = $(foreach ISA,$(ISALIST),$(1)/$(ISA)/$(2))
+isadirs = $(foreach ISA,$(ISALIST),$(1)/$(subst +,\+,$(subst -,\-,$(ISA)))/$(2))
 
 # This is a helper function just like isadirs, but also contains the
 # prefix and suffix without an ISA subdirectories inserted.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.