WebSVN – DevTools – Diff – /core_devl/branches/gitBuilder/TOOLS/makelib.pl2

 #       installed into the 'local header directory' area for public
 #       consumption.  This is generally API files for other modules
 #       to use.
+#
 #       --Strip         Strip directory from source
+#       --Strip=n       Strip part of directory from source
 #       --Full          Install using full path
 #       --Subdir=subdir Install within the specified sub-directory
 #       --Prefix=subdir   "       "     "      "      "     "
+#
 #   InstallLib( 'platform [, ... ]', 'file', ['subdir'] )
         if (/^--Full/) {                        # using full (resolved) path
             $full = 1;
         } elsif (/^--Strip$/) {                 # Strip path from source files
-            $strip = 1;
+            $strip = -1;
+        } elsif (/^--Strip=(\d+)$/) {           # Strip some f the path from source files
+            $strip = $1;
                                                 # Package
         } elsif (/^--Package$/ || /^--Package=(.*)/) {
             $package = 1;
         } elsif (/^--(.*)/) {
                 $dir =~ s~/./~/~g;
                 $dir =~ s~/$~~g;
                 $name = $basename;
+            }
-            $name = $basename
-                if ( $strip );
+            $name = StripPath($name, $strip) if ($strip);
             Debug( "InstallHdr( $dir/$name, src: $srcfile, dest: $dir)" );
             $package_entry{'src'} = $srcfile;
             $package_entry{'dir'} = StripFileExt( "$dir/$name" );
         if (/^--Package$/ || /^--Package=(.*)/) {
             $package = 1;
         } elsif (/^--Strip$/) {                 # Strip path from source files
-            $strip = 1;
+            $strip = -1;
+        } elsif (/^--Strip=(\d+)$/) {           # Strip some f the path from source files
+            $strip = $1;
         } elsif (/^--(.*)/) {
             Message( "InstallLib: unknown option $_ -- ignored\n" );
+        }
+    }
     foreach ( @elements )
+    {
         my %package_entry;
         if ( ! /^--(.*)/ )
+        {
-            $_ = basename ($_)
-                if ( $strip );
+            $_ = StripPath($_, $strip) if ($strip);
             $org_lib = $_;                      # Original name
             if ( $ScmTargetHost eq "Unix" ) {
                 $lib = "lib$_";                 # Prefix "lib" ....
                 $lib =~ s/^liblib/lib/;         # @LIBS already has lib added
+#
     PackageProg( @_ )                           # auto package
         if ( $package );
+}
+#-------------------------------------------------------------------------------
+# Function        : StripPath
+#
+# Description     : Internal function to strip bits from a pathname
+#                   Will never strip the filename, even if asked to strip too much
+#
+# Inputs          : $name       - Name to process
+#                   $stripCount - Strip part
+#                                 <0 - strip all paths
+#                                 =0  - Do nothing
+#                                 >0 - Strip count
+#
+# Returns         : Processed name
+#
+sub StripPath
+{
+    my( $name, $stripCount) = @_;
+    if ($stripCount)
+    {
+        $name =~ s~\\~/~g;
+        $name =~ s~//~~g;
+        my @items = split('/', $name);
+        if ($stripCount > 0)
+        {
+            my $len = scalar @items;
+            my $remove = $stripCount;
+            if ($stripCount >= $len ) {
+                $remove = $len - 1;
+            }
+            splice @items, 0, $remove;
+            $name = join('/', @items);
+        }
+        else
+        {
+            $name = pop @items;
+        }
+    }
+    return $name;
+}
 ###############################################################################
+#
 #   Packaging
+#
         } elsif (/^--Package$/) {               # Package .. call by InstallFile
         } elsif (/^--Package=(.*)/) {
             $dist = "$1";
         } elsif (/^--Strip$/) {                 # Strip path from source files
-            $strip = 1;
+            $strip = -1;
+        } elsif (/^--Strip=(\d+)$/) {                 # Strip path from source files
+            $strip = $1;
         } elsif (/^--Executable$/) {            # Mark the file as executable
             $exefile = "X";
         } elsif (/^--PreserveSymlink/i) {       # Preserve symlink to local file
                 $dir =~ s~/./~/~g;
                 $dir =~ s~/$~~g;
                 $name = $basename;
+            }
-            $name = $basename
-                if ( $strip );
+            $name = StripPath($name, $strip) if ($strip);
             if ( $strip_base )
+            {
                 $name = substr $name, $strip_base;
                 $name =~ s~^/~~;
         } elsif (/^--Package$/) {               # Package .. call by InstallHdr
         } elsif (/^--Package=(.*)/) {
             $dist = "$1";
         } elsif (/^--Strip$/) {                 # Strip path from source files
-            $strip = 1;
+            $strip = -1;
+        } elsif (/^--Strip=(\d+)$/) {           # Strip some f the path from source files
+            $strip = $1;
         } elsif (/^--(.*)/) {
             Message( "PackageHdr: unknown option $_ -- ignored\n" );
+        }
+    }
                 $dir =~ s~/./~/~g;
                 $dir =~ s~/$~~g;
                 $name = $basename;
+            }
-            $name = $basename
-                if ( $strip );
+            $name = StripPath($name, $strip) if ($strip);
             Debug( "PackageHdr( $dir/$name, " .
                 "src: $srcfile, dest: $dir, dist: $dist )" );
             $package_entry{'src'} = $srcfile;
                 $extras{$elem} = 1;
+            }
             %extras = () if ( $extras{'all'} );
         } elsif (/^--Strip$/) {                 # Strip path from source files
-            $strip = 1;
+            $strip = -1;
+        } elsif (/^--Strip=(\d+)$/) {           # Strip some f the path from source files
+            $strip = $1;
         } elsif (/^--(.*)/) {
             Message( "PackageLib: unknown option $_ -- ignored\n" );
+        }
+    }
     foreach ( @elements )
+    {
         my %package_entry;
         if ( ! /^--(.*)/ )
+        {
-            $_ = StripDir( $_ )
+            $_ = StripPath($_, $strip) if ($strip);
-                if ( $strip );
             $org_lib = $_;                      # Original name
             if ( $ScmTargetHost eq "Unix" ) {
                 $lib = "lib$_";                 # Prefix "lib" ....
                 $lib =~ s/^liblib/lib/;         # @LIBS already has lib added
                 $extras{$elem} = 1;
+            }
             %extras = () if ( $extras{'all'} );
         } elsif (/^--Strip$/) {                 # Strip path from source files
-            $strip = 1;
+            $strip = -1;
+        } elsif (/^--Strip=(\d+)$/) {           # Strip some f the path from source files
+            $strip = $1;
         } elsif (/^--(.*)/) {
             Message( "PackageProg: unknown option $_ -- ignored\n" );
+        }
+    }
         my %package_entry;
         if ( m~descpkg~ ) {
             PackageFile($platforms, @elements);
         } elsif ( ! /^--(.*)/ ) {
-            $_ = StripDir( $_ )
+            $_ = StripPath($_, $strip) if ($strip);
-                if ( $strip );
             my $ext = "";
             $prog = $_;
+            #
+    {
         Warning( "Unable to resolve '$source' path" ) unless -f $source;
         return $source;
+    }
+    my @found;
+    # Search the local path first
+    push (@found, $source ) if -f ($source);
-#.. search local path first
-#
-    $count = 0;
-    $first = "";
-    $first = "$source"                              # was ./$source
-        if (-r "$source");
-#.. search directory paths
-#
     foreach my $dir (@$dirs)
+    {
         next if ( $dir eq '.' );
-        my $temp = "$dir/$source";                  # was ./$dir/$source
+        my $temp = $dir . '/' . $source;
         Debug2( "MakeResolve: Looking in: $temp" );
-        if (-r "$temp")
-        {
-            if ($first eq "") {
-                $first = $temp;
+        push (@found, $temp) if (-f $temp);
-            } else {
-                Warning( "Duplicate '$source' image - '$temp'" );
-                $count++;
-            }
-        }
-        Debug3( "MakeResolve: $count, $temp" );
+    }
-    if ($first eq "") {
+    Warning( "Unable to resolve path to '$source'" ) unless $found[0];
-        $first = $source;
+    if (scalar @found > 1)
-        Warning( "Unable to resolve '$source' path" );
-    } else {
+    {
-        Warning( "          using '$first'" )
+        Warning("Duplicates for '$source'. Using the first", @found);
-            if ($count);
+    }
-    return $first;
+    return $found[0] || "";
+}
 #-------------------------------------------------------------------------------
 # Function        : MakeSrcResolve
+#
     #       Process additive rules before removal rules
     #       If there are no additive rules, then assume all protaforms
+    #
     my %calcList;
     @add = @::BUILDPLATFORMS unless @add;
-    $calcList{$_} = 1 foreach (@add);
+    $calcList{uc $_} = 1 foreach (@add);
-    delete $calcList{$_} foreach (@remove);
+    delete $calcList{uc $_} foreach (@remove);
 #DebugDumpData("Add", \@add);
 #DebugDumpData("Remove", \@remove);
 #DebugDumpData("calcList", \%calcList);
+    #
                 "Extend the PERL5LIB seen by invocations of perl");
     my $perl_module_found;
     for my $path ( ToolExtensionPaths() )
+    {
-        if (glob( "$path/*.pm"))
+        if (my @results =  glob( "$path/*.pm"))
+        {
-        MakePrint( "PERL5LIB := $path$::ScmPathSep\$(PERL5LIB)\n" );
+            MakePrint( "PERL5LIB := $path$::ScmPathSep\$(PERL5LIB)\n" );
             $perl_module_found = 1;
+        }
+    }
     if ( $perl_module_found  )
+    {

Subversion Repositories DevTools

(root)/core_devl/branches/gitBuilder/TOOLS/makelib.pl2 – Rev 7310 → 7320