WebSVN – DevTools – Diff – /core_devl/trunk/CFG/TOOLSET/VCWCE.PL

-# -*- mode: perl; indent-width: 4; show-tabs: yes; -*-
+#
 # Module name   : vcwce
 # Module type   : Makefile system
 # Compiler(s)   : ANSI C
 # Environment(s): WCE
 my $target_file_exe;
 my $pdb_none;
 ##############################################################################
 #   Toolchain information
-#   Abstarct out minor toolchain differences into a data structure
+#   Abstract out minor toolchain differences into a data structure
+#
 my $toolchain_info;
 my %ToolChainData =
+    (
         'EVC4'      =>  {  'def'        => 'vcwce.def' ,
 #.. Toolset configuration
+#
     $::ScmToolsetVersion = "1.0.0";             # our version
     $::ScmToolsetGenerate = 0;                  # generate optional
+    $::ScmToolsetProgDependancies = 0;          # handle Prog dependancies myself
 #.. Parse arguments
+#
     Debug( "vcwce(ToolsetArgs=@::ScmToolsetArgs)" );
+#
 ###############################################################################
 sub ToolsetCXXDepend
+{
-    MakePrint( "\t\$(CCDEPEND)\n" );
+    ToolsetCCDepend();
+}
 ###############################################################################
 #   ToolsetAS( $source, $obj, \@args )
         my $full = $lib.".$::so";
         my $link_with_def;
     #.. Cleanup rules
+    #
-    #   dep     Dependency file
     #   ld      Linker command file
     #   map     Map file
     #   pdb     Microsoft C/C++ program database
     #   ilk     Microsoft Linker Database
+    #
         ToolsetGenerate( "\$(LIBDIR)/${lib}.ld" );
-        ToolsetGenerate( "\$(LIBDIR)/${lib}.dep" );
         ToolsetGenerate( "\$(LIBDIR)/${lib}.map" );
         ToolsetGenerate( "\$(LIBDIR)/${lib}.exp" );
         ToolsetGenerate( "\$(LIBDIR)/${lib}.ilk" );
         ToolsetGenerate( "\$(LIBDIR)/${full}" );
         PackageShlibAddFiles( $base, "\$(LIBDIR)/${full}" );
+        #
         #   Generate Shared Library dependency information
+        #
-        $io->SHLDDEPEND( $lib, $name, $lib );   # std SHLDDEPEND rules
+        my $dep = $io->SetShldTarget( $lib );
+        #
         #   Generate rules and recipes to create the body of the shared
         #   library. Several build variables are overiden when creating
         #   a shared library.
         $io->Prt( "\$(LIBDIR)/${full}:\tCFLAGS+=\$(SHCFLAGS)\n" );
         $io->Prt( "\$(LIBDIR)/${full}:\tCXXLAGS+=\$(SHCXXFLAGS)\n" );
         $io->Prt( "\$(LIBDIR)/${full}:\t$export_file\n" ) if ($export_file );
         $io->Prt( "\$(LIBDIR)/${full}:\t$res\n" ) if ( $res );
-        $io->Entry( "\$(LIBDIR)/${full}: \\\n\t\t\$(OBJDIR)/${base}",
+        $io->Entry( "\$(LIBDIR)/${full}: $dep \\\n\t\t\$(OBJDIR)/${base}",
             "", " \\\n\t\t", ".$::o", @$pObjs );
         $io->Prt( " \\\n\t\t$def" ) if ( $link_with_def );
-        $io->Prt( " \\\n\t\t\$(LIBDIR)/${lib}.dep\n" );
-        $io->Prt( "\t\$(SHLD)\n" );
+        $io->Prt( "\n\t\$(SHLD)\n" );
         $io->Newline();
         #.. Linker command file
+        #
         $io->LibList( $name, $pLibs, \&ToolsetLibRecipe );
         $io->Newline();
         #.. Dependency link,
+        #   Create a library dependency file
+        #       Create command file to build applicaton dependency list
+        #       from the list of dependent libraries
+        #
-        #       Now piece together a variable $(name_dp) which ends up in
+        #       Create makefile directives to include the dependency
-        #       the command file building the application dependency list.
+        #       list into the makefile.
+        #
-        $io->SetTag( "${lib}_shdp" );          # command tag
-        $io->DepRules( $name, $pLibs,           # library depends rules
-            \&ToolsetLibRecipe, "\$(LIBDIR)/${full}" );
+        $io->DepRules( $pLibs, \&ToolsetLibRecipe, "\$(LIBDIR)/${full}" );
-        $io->Newline();
+        $io->SHLDDEPEND( $name, $lib );
+    }
     ToolsetLibStd( $pLibs )                    # push standard libraries
         unless ( $noaddlibs );
     PCLintSHLIB( @_ );
+}
 ###############################################################################
-#   ToolsetLD( $name, \@args, \@objs, \@libraries )
-#       This subroutine takes the user options and builds the rules
-#       required to link the program 'name'.
-#
-#   Arguments:
-#       (none)
-#
-#   Output:
-#       $(BINDIR)/name: \
-#                       OBJS .... \
-#                       $(BINDIR)/name.dep
-#           $(LD)
-#
-#       $(BINDIR)/name.dep: $(BINDIR)
-#       $(BINDIR)/name.dep: $(GBE_PLATFORM).mk
-#           $(LDDEPEND)
+# Function        : ToolsetLD
-#
-#       ifeq "$(IFLAG)" "3"
-#       -include        "$(BINDIR)/name.dep"
-#       endif
+#
-#       name_ld += ...
+# Description     : Takes the user options and builds the rules required to
-#           :
+#                   link the program 'name'.
+#
-#       name_dp += ...
+# Inputs          : $name           - base name of the program
+#                   $pArgs          - Ref to program arguments
+#                   $pObjs          - Ref to program objects
+#                   $pLibs          - Ref to program library list
+#
-#           :
+# Returns         : Nothing
+#
+# Output:         : Rules and recipes to create a program
+#                       Create program rules and recipes
+#                       Create linker input script
+#                       Create library dependency list
+#                       Include library dependency information
+#
-###############################################################################
 sub ToolsetLD
+{
     my ( $name, $pArgs, $pObjs, $pLibs ) = @_;
-    my ( $full ) = $name."$::exe";
     my ( $res, @reslist );
     my $no_pdb =$pdb_none;
     our( $entry, $noaddlibs );
 #.. Parse arguments
             Message( "vcwce LD: unknown option $_ -- ignored\n" );
+        }
+    }
+#.. Names of important files
+#
+    my $base = "\$(BINDIR)/${name}";
+    my $full = $base . $::exe;
+    my $map  = $base . '.map';
+    my $pdb  = $base . '.pdb';
 #.. Cleanup rules
+#
-#   dep     Dependency file
 #   ld      Linker command file
 #   map     Map file
 #   pdb     Microsoft C/C++ program database
 #   ilk     Microsoft Linker Database
 #   res     Compiled resource script
+#
-    ToolsetGenerate( "\$(BINDIR)/${name}.dep" );
+    ToolsetGenerate( $map );
-    ToolsetGenerate( "\$(BINDIR)/${name}.ld" );
+    ToolsetGenerate( $pdb );
-    ToolsetGenerate( "\$(BINDIR)/${name}.map" );
-    ToolsetGenerate( "\$(BINDIR)/${name}.pdb" );
+    ToolsetGenerate( $base . '.ld' );
-    ToolsetGenerate( "\$(BINDIR)/${name}.ilk" );
+    ToolsetGenerate( $base . '.ilk' );
-#.. Linker command
+#.. Toolset Printer
+#
     my ($io) = ToolsetPrinter::New();
+    my $dep = $io->SetLdTarget( $name );
+#
+#.. Linker command
+#
-    $io->Prt( "\\\n\t\t$res " ) if ( $res );
+    $io->Prt( "$full : $dep " );
+    $io->Entry( "", "", "\\\n\t", ".$::o ", @$pObjs );
-    $io->Prt( "\\\n\t\t\$(BINDIR)/${name}.dep\n".
+    $io->Prt( "\\\n\t$res " ) if ( $res );
-              "\t\$(LD)\n\n" );
+    $io->Prt( "\n\t\$(LD)\n\n" );
-    $io->LDDEPEND( $name );                     # standard LDDEPEND rules
 #.. Linker command file
+#
 #       Now piece together a variable $(name_ld) which ends up in
 #       the command file linking the application.
+#
     $io->SetTag( "${name}_ld" );                # macro tag
     $io->Label( "Linker commands", $name );     # label
-    $io->Cmd( "-out:\$(subst /,\\\\,\$(BINDIR)/${full})" );
+    $io->Cmd( "-out:\$(subst /,\\\\,$full)" );
-    $io->Cmd( "-pdb:\$(subst /,\\\\,\$(BINDIR)/${name}).pdb" ) unless ($no_pdb);
+    $io->Cmd( "-pdb:\$(subst /,\\\\,$pdb)" )        unless ($no_pdb);
     $io->Cmd( "-debug:none" )                                  if ($no_pdb);
     $io->Cmd( "-pdb:none" )                                    if ($no_pdb);
     $io->Cmd( "-entry:$entry" )                                if ($entry);
-    $io->Cmd( "-map:\$(subst /,\\\\,\$(BINDIR)/${name}).map" );
+    $io->Cmd( "-map:\$(subst /,\\\\,$map)" );
-    $io->Cmd( "\$(subst /,\\\\,$res)" ) if ( $res );
+    $io->Cmd( "\$(subst /,\\\\,$res)" )             if ( $res );
-    ToolsetLibStd( $pLibs )                     # push standard libraries
-        unless ( $noaddlibs );
-                                                # object list
-    $io->ObjList( $name, $pObjs, \&ToolsetObjRecipe );
-                                                # library list
-    $io->LibList( $name, $pLibs, \&ToolsetLibRecipe );
+    ToolsetLibStd( $pLibs ) unless ( $noaddlibs );      # push standard libraries
+    $io->ObjList( $name, $pObjs, \&ToolsetObjRecipe );  # object list
+    $io->LibList( $name, $pLibs, \&ToolsetLibRecipe );  # library list
     $io->Newline();
-#.. Dependencies
+    #.. Dependency link,
-#
-#       Now piece together a variable $(name_dp) which ends up in
+    #   Create a library dependency file
-#       the command file building the application dependency list.
+    #       Create command file to build applicaton dependency list
+    #       from the list of dependent libraries
-#
+    #
-    $io->SetTag( "${name}_dp" );                # macro tag
+    #       Create makefile directives to include the dependency
+    #       list into the makefile.
+    #
-    $io->DepRules( $name, $pLibs,               # library depends rules
+    $io->DepRules( $pLibs, \&ToolsetLibRecipe, $full );
-        \&ToolsetLibRecipe, "\$(BINDIR)/${full}" );
-    $io->Newline();
+    $io->LDDEPEND();
 #.. Compile up the resource file
+#
     ToolsetRCrecipe( $res, @reslist )
         if ( $res );
 #.. Package up the PDB file with the program
+#
+    PackageProgAddFiles ( $name, $full );
-    PackageProgAddFiles ( $name, "\$(BINDIR)/${name}.pdb", "Class=debug" ) unless ( $no_pdb );
+    PackageProgAddFiles ( $name, $pdb, "Class=debug" ) unless ( $no_pdb );
+#
 #   Track the name of the possible target file
 #   Used when creating Visual Studio projects
+#
-    $target_file_exe = "\$(BINDIR)/${full}";
+    $target_file_exe = $full;
+}
 ###############################################################################
 #   ToolsetLD( $name, \@args, \@objs, \@libraries, \@csrc, \@cxxsrc )
     push @result, "\$(OBJDIR)/$name.res";
+    #
     #   Process each user file
+    #
-    for (split( ',', $files ))
+    for (split( '\s*,\s*', $files ))
+    {
+        #
         #   Locate the file.
         #   If it is a generate file so it will be in the SRCS hash
         #   Other wise the use will have to use Src to locate the file

Subversion Repositories DevTools

(root)/core_devl/trunk/CFG/TOOLSET/VCWCE.PL – Rev 317 → 335