WebSVN – DevTools – Diff – /core_devl/trunk/TOOLS/makelib.pl2

 #                                                 Refer to ExpandGenVar function for details
 #                                                 of Name and available options
 #                                                 The expanded text will be replaced with an
 #                                                 suitable makefile variables that will be
 #                                                 replaced at run-time.
+#
+#                       --Tool(Name,opt)        - Name is the name of a 'tool' found withnin a package
+#                                                 The argument is replaced with the full path of the
+#                                                 tool. opt may be
+#                                                   --dir
+#                                                   --file
+#                                                   --abspath
+#                                                   --absdrive
+#
 #                   The keyword will be replaced with the resolved name. This may be a file,
 #                   a directory or other text.
+#
 #                   Options do not alter command line text. They do affect the way the command is
+    #
     my ( $platforms, $tool, @args) = grep defined, @_;
     return if ( ! ActivePlatform($platforms) );
-    Debug2( "GenerateFiles:($platforms, $tool, @args)" );
+    Debug( "GenerateFiles:($platforms, $tool, @args)" );
     my @preq_files;
     my $preq_unknown;
     my @gen_files;
     my $shell_script;
+            {
                 $fn = GetPackageInfo( "GenerateFiles", $raw_arg );
+            }
             elsif ( $cmd =~ /^Var/ )
+            {
+                # --Var(...)
                 ($fnp, $fn, $is_path) = ExpandGenVar( "GenerateFiles", $raw_arg, @var_opts );
                 $flags = '';
                 if ( $raw_arg eq 'ObjDir' ) {
                     UniquePush (\@preq_files, '$(GBE_OBJDIR)');
                 } elsif ( $raw_arg eq 'BinDir' ) {
                     UniquePush (\@preq_files, '$(GBE_BINDIR)');
                 } elsif ( $raw_arg eq 'LibDir' ) {
                     UniquePush (\@preq_files, '$(GBE_LIBDIR)');
+                }
+            }
+            elsif ( $cmd =~ /^Tool/ ) {
+                # --Tool(toolName)
+                ($fn, $is_path) = ExpandTool( "GenerateFiles", $raw_arg );
+            }
             else
+            {
                 Warning ("GenerateFiles: Unknown replacement command: $cmd");
                 $fn = $ufn;
+            }
     return $prefix , $expansion, $is_path ? 1 : 0, $is_abs;
+}
 #-------------------------------------------------------------------------------
+# Function        : ExpandTool
+#
+# Description     : Locate a 'tool' and provide the complete path
+#
+# Inputs          : $dname         - Directive name     (Reporting)
+#                   $arg           - Name of the tool to locate (no extension) with
+#                                    embedded options. Options are:
+#                                       --dir
+#                                       --file
+#                                       --abspath
+#                                       --absdrive
+#
+#
+# Returns         : Path/Value      - Path/Value of the component
+#                   is_path         - Above is a path
+#                   is_abs          - Path is absolute
+#
+sub ExpandTool
+{
+    my ($dname, $args) = @_;
+    my ($toolName, @opts) = split('\s*,\s*', $args);
+    my $is_abs = 1;
+    my $is_path = 1;
+    #
+    #   Locate the tool in one of the dependent packages
+    #
+    my @extension_list;
+    push @extension_list, '.exe' if ( $::ScmHost ne "Unix" );
+    my $toolFullPath =  ToolExtensionProgram( $toolName, @extension_list );
+    if ($toolFullPath) {
+        $toolName = $toolFullPath;
+    } else {
+            Warning("$dname. Tool not found: $toolName", "Searched:", ToolExtensionPaths());
+    }
+    #
+    #   Process options
+    #
+    foreach my $opt ( @opts )
+    {
+        if ( $opt =~ m/^--dir/i ) {
+            $toolName = StripFileExt($toolName);
+        } elsif ( $opt =~ m/^--file/i ) {
+            $toolName = StripDir($toolName);
+            $is_abs = 0;
+            $is_path = 0;
+        } elsif ( $opt =~ m/^--abspath/i ) {
+            $toolName = AbsPath($toolName);
+        } elsif ( $opt =~ m/^--absdrive/i ) {
+            $toolName = FullPath($toolName);
+        } else {
+            Error ("$dname: Unsupported option($opt) for --Tool(@_)");
+        }
+    }
+    Debug ("ExpandTool: $args --> $toolName");
+    return $toolName, $is_path ? 1 : 0, $is_abs;
+}
+#-------------------------------------------------------------------------------
 # Function        : isAnAlias
+#
 # Description     : Internal Helper
 #                   Determine if this platform is an alias for ...
+#
 #                   that also includes the toolset extension
+#
 # Inputs          : program             - Name of program
 #                   elist               - An array of possible program extensions
+#
-# Returns         : Full path the to program or an empty elelent (not undef)
+# Returns         : Full path the to program or an empty element (not undef)
+#
 sub ToolExtensionProgram
+{
     my ($program, @elist ) = @_;
             elsif ( $cmd =~ /^Var/ )
+            {
                 ($fnp, $fn, $is_path, $is_abs) = ExpandGenVar( "RunTest", $raw_arg );
                 $flags = '';
+            }
+            elsif ( $cmd =~ /^Tool/ )
+            {
+                ($fn, $is_path, $is_abs) = ExpandTool( "RunTest", $raw_arg );
+                $flags = '';
+            }
             elsif ( $cmd =~ /^Local/ )
+            {
                 $fn = '$(LOCALDIR)/' . $ufn ;
                 UniquePush (\@preq_files, $fn);
+            }
     if (scalar @found > 1)
+    {
         Warning("Duplicates for '$source'. Using the first", @found);
+    }
-    return $found[0] || "";
+    return $found[0] || $source;
+}
 #-------------------------------------------------------------------------------
 # Function        : MakeSrcResolve
+#
     MakeHeader ("Tool Search Path",
                 "Extend the PATH seen by all the tools to include",
                 "The tools/bin directories discovered in Packages" );
     my $put_PATH;
     my $put_LD_LIBRARY_PATH;
+    MakePrint( "PATH := \$(BINDIR_LOCAL_PATH)$::ScmPathSep\$(PATH)\n" );
+    $put_PATH = 1;
     for my $path ( ToolExtensionPaths() )
+    {
         MakePrint( "PATH := $path$::ScmPathSep\$(PATH)\n" );
         $put_PATH = 1;

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/makelib.pl2 – Rev 6469 → 6504