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

 ##############################################################################
-# Copyright (c) VIX TECHNOLOGY (AUST) LTD
+# COPYRIGHT - VIX IP PTY LTD ("VIX"). ALL RIGHTS RESERVED.
+#
 # Module name   : makelib.pl2
 # Module type   : Makefile system
+#
 # Description:
     my $local_base_dir = "$ScmRoot/gbe/DIRECTIVES";
     if ( -d $local_base_dir )
+    {
         foreach my $file  ( glob ("$local_base_dir/*.pm") )
+        {
-DebugDumpData("Include: $file",);
             push( @ScmDepends, "$file" );
             require $file;
+        }
+    }
         push( @NODEPDIRS, $_ )
             if ($nodepend);
+    }
+}
+#-------------------------------------------------------------------------------
+# Function        : ExtendIncDir
+#
+# Description     : Allow the directory search paths to be extended into sub
+#                   directories.
+#
+#                   Limit use, but ...
+#
+# Inputs          : $platform       - Active platforms
+#                   ...             - Path extensions
+#
+# Returns         :
+#
+my  %ExtendIncDirSeen;
+sub ExtendIncDir
+{
+    my( $platforms, @paths ) = @_;
+    Debug2( "ExtendIncDir($platforms, @paths)" );
+    return if ( ! ActivePlatform($platforms) );
+    Error ('ExtendIncDir. No extensions listed') unless @paths;
+    #
+    #   Ensure the user only extends the paths once.
+    #   Could silently discard excess - better to force the user to get it right
+    #
+    foreach my $path ( @paths) {
+        ReportError ('ExtendIncDir. Multiple defintions for: ' . $path) if exists $ExtendIncDirSeen{$path};
+        $ExtendIncDirSeen{$path} = 0;
+    }
+    ErrorDoExit();
+    #
+    #   Zip though all the packages and extend the search paths
+    #   Also gets those in the interface directory
+    #
+    for my $package (@{$::ScmBuildPkgRules{$ScmPlatform} })
+    {
+        #DebugDumpData("package", $package);
+        foreach my $path ( @paths)
+        {
+            if ( $package->{PINCDIRS})
+            {
+                my @output;
+                foreach my $pdir ( @{$package->{PINCDIRS}})
+                {
+                    my $tdir = catdir ($pdir, $path);
+                    my $adir = catdir ($package->{ROOT}, $tdir);
+                    if ( -d $adir) {
+                        Verbose("Extending $package->{DNAME} $package->{VERSION}: $tdir");
+                        push @output, $tdir;
+                        $ExtendIncDirSeen{$path}++;
+                    }
+                    push @output, $pdir;
+                }
+              @{$package->{PINCDIRS}} = @output;
+            }
+        }
+    }
+    #
+    #   Report extensions that have not been used
+    #
+    foreach my $path ( @paths) {
+        ReportError ('ExtendIncDir. Search path not extendable: ' . $path) unless $ExtendIncDirSeen{$path};
+    }
+    ErrorDoExit();
+}
 sub AddProg
+{
     my( $platforms, @progs ) = @_;
 #                                                 be added to the list of recipe prerequisites
 #                       --GeneratedDirectory(xxx)
 #                       --GeneratedCommonDirectory(xxx)
 #                       --GeneratedObjectDirectory(xxx)
 #                       --GeneratedProgDirectory(xxx)
-#                                               - xxx is a generated file, but is not placed
+#                                               - xxx is a generated file
-#                                                 on the command line. It is flagged as
+#                                                 The containing directory will be placed on the command line
-#                                                 a generated files
 #                       --PackageBase(xxx)      - xxx is a package. The keyword will be replaced
 #                                                 with the pathname to the package. If the package
 #                                                 has been copied in the the interface directory
 #                                                 then the interface directory will be used.
 #                       --PackageInfo(xxx,--opt)- xxx is a package. The keyword will be replaced
     ToolsetFiles::AddFile($Makefile);
     open( MAKEFILE, '>', $Makefile ) || Error( "Cannot create $Makefile" );
     ::MakefileHeader( *MAKEFILE,
                       'Auto-generated Platform Dependent Makefile',
                       "$ScmMakelib (version $ScmVersion)",
-                      "# Copyright (c) VIX TECHNOLOGY (AUST) LTD",
+                      "# COPYRIGHT - VIX IP PTY LTD (\"VIX\"). ALL RIGHTS RESERVED.",
                       '#',
                       "# Located in $::Cwd",
                       "# Platform $::ScmPlatform",
                       '#' . ('-' x 79),
                       );
+#
+#
     MakeHeader ("Defines, flags and file sets");
     # Flags
-    foreach my $opt ( keys %ScmCompilerOpts )
+    foreach my $opt ( sort keys %ScmCompilerOpts )
+    {
         MakeDefEntry ( $opt, "=", $ScmCompilerOpts{$opt} );
+    }
     MakeDefEntry( "CFLAGS",         "=", \@CFLAGS, \@CFLAGS_PROD, \@CFLAGS_DEBUG );
+    {
     MakePrint( "export PERL5LIB\n" );
+    }
 #-------------------------------------------------------------------------------
-#   Internal Helper Functions
-#   Creating INCLUDE and LIBRARY paths
-#
-# Assist in creating a list paths
-#   $pList  - Reference to an array to which $data will be added
-#   $pSeen  - Hash Ref to track tags that have been seen
-#   $data   - Data item to add, if tag is defined, but not seen
-#   $tag    - Resolved name for item
-#
-    sub PushPath
-    {
-        my ($pList, $pSeen, $data, $tag) = @_;
-        if ( $tag )
-        {
-            unless ( exists $pSeen->{$tag} )
-            {
-                $pSeen->{$tag} = 1;
-                push @{$pList}, $data;
-            }
-        }
-    }
-    #
-    # Search paths for include files and libraries
-    # Currently symbolic paths are created, but there is very little need for this
-    #
-    sub MakePaths
-    {
-        my( $root ) = @_;
-        my @pathlist;
-        my %seen;
-        #
-        #   Interface and Local directories are now treated quite
-        #   diffently. The Local is under our control.
-        #
-        if ( $root =~ /INTERFACE/ ) {
-            #   eg. SCA_WIN32   and SCA_WIN32       and SCA_SOLARIS
-            #       SCA             WIN32_i386          SPARC
-            #       WIN32           SCA                 SCA
-            #       .               WIN32               SOLARIS
-            #                       .                   .
-            #..
-            #
-            #   For Interface Path List use the 'PARTS' as calculated within
-            #   the build file. Its good enough for everthing else in JATS
-            #
-            foreach ( @{$::BUILDINFO{$ScmPlatform}{PARTS}} ) {
-                PushPath( \@pathlist, \%seen, "$root/$_",   $_ );
-            }
-        }
-        else
-        {
-            #
-            #   Local directory
-            #   The user can (should) only install stuff into a few known
-            #   locations.
-            #
-            foreach ( $ScmPlatform, $ScmProduct, $ScmTarget ) {
-                PushPath( \@pathlist, \%seen, "$root/$_",   $_ );
-            }
-        }
-        #
-        #   Add OS Common Directory
-        ### May need more testing before being added
-        #
-        #if ( exists($::BUILDINFO{$ScmPlatform}{OS_COMMON}) )
-        #{
-        #    my $os_common = $::BUILDINFO{$ScmPlatform}{OS_COMMON};
-        #    PushPath( \@pathlist, \%seen, "$root/$os_common", $os_common );
-        #}
-        #
-        #   Add the root directory too
-        #
-        push @pathlist, "$root";
-        return \@pathlist;
-    }
-#-------------------------------------------------------------------------------
+#
+#
     MakeHeader ("Include Search Paths",
                 "Package Include Paths for header files and libraries" );
-    MakeDefEntry( 'PINCDIRS', '=', '# includes');
+    MakeDefEntry( 'PINCDIRS'  , '=', '# includes');
+    MakeDefEntry( 'PINCDIRS_INTERFACE', '=', '# Interface includes');
+    MakeDefEntry( 'PINCDIRS_LOCAL', '=', '# Local includes');
-    MakeDefEntry( 'PLIBDIRS', '=', '# libraries');
+    MakeDefEntry( 'PLIBDIRS'  , '=', '# libraries');
+    MakeDefEntry( 'PLIBDIRS_INTERFACE', '=', '# Interface libraries');
+    MakeDefEntry( 'PLIBDIRS_LOCAL', '=', '# Local libraries');
     for my $package (@{$::ScmBuildPkgRules{$ScmPlatform} })
+    {
+        #
         #   Skip the pseudo package that encapsulates the interface
+        #
         #   Just comment out the lines so that the data is visible
         #   Its a hint to make use of the data
+        #
         my $prefix = '';
-        $prefix = '# ' if ( $package->{'TYPE'} eq 'interface' );
+        my $suffix = '';
         $prefix = '# ' if ( $package->{'TYPE'} eq 'build' );
+        #
+        #   The interface directory is a little bit different
+        #
+        my ($name,$base);
+        if ( $package->{'TYPE'} eq 'interface' ) {
+            $base = '$(INTERFACEDIR)';
+            $name = 'Interface Directory';
+            $suffix = '_INTERFACE';
+        } else {
-        my $name = $package->{'NAME'} . '/' . $package->{'VERSION'};
+            $name = $package->{'NAME'} . '/' . $package->{'VERSION'};
-        my $base = $package->{'ROOT'};
+            $base = $package->{'ROOT'};
+        }
         my @doc;
         push (@doc, "From: $base");
         push (@doc, 'BuildPkgArchive via Interface' )if $package->{'TYPE'} eq 'build' ;
-        push (@doc, 'Is Interface' ) if $package->{'TYPE'} eq 'interface' ;
         MakeHeader ("Source: $name", @doc);
+        #
         #   List include and library directories
         #   Note: Need the True Path for windows.
         #       Some makefile functions (wildcard) only work as expected
         #       if the case of the pathname is correct. Really only a problem
-        #       with badly formed legecy packages where the Windows user
+        #       with badly formed legacy packages where the Windows user
         #       guessed at the package format.
+        #
         #       The conversion to a TruePath is done when ScmBuildPkgRules
-        #       is created. Create one, use many time.
+        #       is created. Create once, use many time.
-        #
+        #
-        for my $type (qw (PINCDIRS PLIBDIRS) )
+        for my $type (qw (PINCDIRS PLIBDIRS) ) {
-        {
-            for my $path ( @{$package->{$type}} )
+            for my $path ( @{$package->{$type}} ) {
-            {
-                MakeDefEntry ( "$prefix$type", "+=", $base . $path);
+                MakeDefEntry ( "$prefix$type$suffix", "+=", $base . $path);
+            }
+        }
+    }
+    #
+    #   Local Paths
+    #   These are a little bit special
+    #
+    MakeHeader ('Source: Local',  'From: Package Local');
+    sub MakeLocalPaths
+    {
+        my ($name, $root, $addRoot) = @_;
+        my @pathlist;
+        foreach my $tag ( $ScmPlatform, $ScmProduct, $ScmTarget ) {
+            UniquePush( \@pathlist, "$root/$tag" ) if ( $tag );
+        }
+        #   Add the root directory too
+        UniquePush( \@pathlist, $root) if $addRoot;
+        MakeDefEntry ( $name , "+=", \@pathlist);
+    }
+    MakeLocalPaths ( 'PINCDIRS_LOCAL', '$(INCDIR_LOCAL)', 1 );
+    MakeLocalPaths ( 'PLIBDIRS_LOCAL', '$(LIBDIR_LOCAL)', 0 );
 #-------------------------------------------------------------------------------
+#
+#
     MakeHeader ("Include Search Paths",
                 "Local Include Paths",
     #       BuildPkgArchive
     #       LinkPkgArchive
     #   user-global
+    #
-    MakeDefEntry ( "\nLINCDIRS",    "= ", \@L_INCDIRS );     # .. Local
+    MakeDefEntry ( "\nLINCDIRS",    "= ", \@L_INCDIRS );                    # .. Local
-    MakeDefEntry ( "LINCDIRS",      "+=", MakePaths( '$(INCDIR_LOCAL)' ));     # .. Sandbox interface
+    MakeDefEntry ( "LINCDIRS",      "+=", '$(PINCDIRS_LOCAL)');             # .. Sandbox local
-    MakeDefEntry ( "LINCDIRS",      "+=", MakePaths( '$(INCDIR_INTERFACE)' )); # .. Sandbox interface
+    MakeDefEntry ( "LINCDIRS",      "+=", '$(PINCDIRS_INTERFACE)');         # .. Sandbox interface
-    MakeDefEntry ( "LINCDIRS",      "+=", \@G_INCDIRS );    # .. Global
+    MakeDefEntry ( "LINCDIRS",      "+=", \@G_INCDIRS );                    # .. Global
-    MakeDefEntry ( "INCDIRS",  "= ", '$(LINCDIRS)' );               # Local
+    MakeDefEntry ( "INCDIRS",  "= ", '$(LINCDIRS)' );                       # Local
-    MakeDefEntry ( "INCDIRS",  "+=", '$(PINCDIRS)' );               # Package
+    MakeDefEntry ( "INCDIRS",  "+=", '$(PINCDIRS)' );                       # Package
-    MakeDefEntry ( "LINCDIRS", "+=", \@S_INCDIRS );                 # System
+    MakeDefEntry ( "LINCDIRS", "+=", \@S_INCDIRS );                         # System
     # Source search path
     MakeDefEntry( "\nNODEPDIRS",        "=", \@NODEPDIRS );
-    MakeDefEntry( "\nSRCDIRS","= "  , [ @L_SRCDIRS, @G_SRCDIRS ] ); # Local
+    MakeDefEntry( "\nSRCDIRS","= "  , [ @L_SRCDIRS, @G_SRCDIRS ] );         # Local
-    MakeDefEntry ( "SRCDIRS", "+=" , '$(PINCDIRS)' );               # Package
+    MakeDefEntry ( "SRCDIRS", "+=" , '$(PINCDIRS)' );                       # Package
-    MakeDefEntry ( "SRCDIRS", "+=" , \@S_INCDIRS );                 # System
+    MakeDefEntry ( "SRCDIRS", "+=" , \@S_INCDIRS );                         # System
     # Library search path
+    #
     #   user-local
     #   local
     #   interface
     #       BuildPkgArchive
     #       LinkPkgArchive
     #   user-global
+    #
+    #   Kludge Note:
+    #       The LIBDIRS path needs an element with a directory seperator in it
+    #       Needed by (broken) cmdfile o determine the file seperator to use
+    #
     MakeDefEntry( "\nLIBDIRS",  "= ", '$(LIBDIR)' );                    # User Local
     MakeDefEntry( "LIBDIRS",    "+=", \@L_LIBDIRS );                    # Local
+    MakeDefEntry( "LIBDIRS",    "+=", '$(PLIBDIRS_LOCAL)' );            # Sandbox/local
-    MakeDefEntry( "LIBDIRS",    "+=", MakePaths( '$(LIBDIR_LOCAL)' ));  # Sandbox/interface
+    MakeDefEntry( "LIBDIRS",    "+=", '$(PLIBDIRS_INTERFACE)' );        # Sandbox/interface
-    MakeDefEntry( "LIBDIRS",    "+=", MakePaths( '$(LIBDIR_INTERFACE)' ));
+    MakeDefEntry( "LIBDIRS",    "+=", '$(LIBDIR_INTERFACE)' );          # Kludge. See note above
     MakeDefEntry( "LIBDIRS",    "+=", \@G_LIBDIRS );                    # Global
     MakeDefEntry( "LIBDIRS",    "+=", '$(PLIBDIRS)' );                  # Package
     MakeDefEntry( "LIBDIRS",    "+=", \@S_LIBDIRS );                    # System
 #-------------------------------------------------------------------------------
 #   Deletion is done AFTER the toolset functions have been invoked to create the
 #   build artifacts so that the toolsets can create directories too
     MakeHeader ("Subdir creation");
     CreateMkdirRules();
-    MkdirRule( '$(OBJDIR)', 'OBJDIR', '--Extra=depend,depend.err' );  # Object build directory
+    MkdirRule( '$(OBJDIR)', 'OBJDIR', '--Extra=depend,depend.err' );    # Object build directory
     MkdirRule( '$(OBJDIR)/'.$_ ) foreach (@SHLIBS);                     # Shared library build directory
     MkdirRule( '$(LIBDIR)', 'LIBDIR' );                                 # Library directory
     MkdirRule( '$(BINDIR)', 'BINDIR' );                                 # Binary directory
+    #
+    {
         my $tname = "\$(BINDIR)/" . StripDir( $i );
         MakePrint( "$i:\t\tmakefile.pl\n" .
-            "\t\$(XX_PRE)if [ ! -f \"$i\" ]; then echo Script [$i] not found; exit 2; fi\n\n" );
+            "\t\$(XX_PRE)if [ ! -f \"$i\" ]; then echo 'Script [$i] not found'; exit 2; fi\n\n" );
+        #
         #   Create a rule to copy the script into the BIN directory
         #   Mark the script as executable - It can't hurt and its there
         #   to be run as part of a test.
         foreach (  @SHLIB_TARGETS )
+        {
             next test_copy_in if ( $i eq $_ );
+        }
         MakePrint( "\n$i:\t\tmakefile.pl\n" .
-            "\t\@if [ ! -f \"$i\" ]; then echo ERROR: CopyIn Script [$i] not found; exit 2; fi\n" );
+            "\t\@if [ ! -f \"$i\" ]; then echo 'ERROR: CopyIn Script [$i] not found'; exit 2; fi\n" );
+    }
 #-------------------------------------------------------------------------------
 #   Deploy rules
+#
+        {
             MakeEntry ( "", "", " \\\n\t\t", "", @{$i->{'preq'}} );
             MakeEntry ( "", "", " \\\n\t\t", "", "phony_generate" ) if $i->{'preq_sus'};
             MakeEntry ( "", "", " \\\n\t\t", "", "\$(SCM_MAKEFILE)" );
-            MakePrint ("\n\t" . "\@\$(echo) [$i->{'text'}] generating.." );
+            MakePrint ("\n\t" . "\@\$(echo) '[$i->{'text'}] generating..'" );
             if ( $i->{'predelete'}  )
+            {
                 MakePrint ("\n\t" . "\$(XX_PRE)\$(call RmFiles,generate_gen_$gen_tag)" );
+            }
             MakePrint ("\n\t" . "\$(XX_PRE)\$(call generate_$gen_tag,)" );
 depend:			\$(OBJDIR)/depend
 \$(OBJDIR)/depend:	\$(SCM_MAKEFILE) \$(GBE_OBJDIR)
 \$(OBJDIR)/depend:	\$(CSRCS) \$(CXXSRCS)
 ifeq (\$(NODEPEND),0)
-	\@echo [\$@] Doing a make depend..
+	\@echo '[\$@] Doing a make depend..'
 	-\$(XX_PRE)\$(rm) -f \$(OBJDIR)/depend
 EOF
     $if->CCDepend( "\$(OBJDIR)/depend", "\$(CSRCS)" )
         if ( @CSRCS );
     $if->CXXDepend( "\$(OBJDIR)/depend", "\$(CXXSRCS)" )
         if ( @CXXSRCS );
     MakePrint
         "\t-\@\$(touch) -f \$(OBJDIR)/depend\n";
     print MAKEFILE <<EOF;
 else
-	\@echo [\$@] Skipping make depend..
+	\@echo '[\$@] Skipping make depend..'
 	-\$(XX_PRE)\$(rm) -f \$(OBJDIR)/depend
 endif
 EOF
+}
 else
 # Inputs          : $subdir     - Symbolic name of the subdir $(OBJDIR)
 #                   $alias      - Optional script alias for the dir 'OBJDIR' --> GBE_OBJDIR
 #                   Options:
 #                       --Path=path             Optional value of $subdir '$(GBE_PLATFORM)$(GBE_TYPE).OBJ'
 #                       --RemoveAll             Remove all files on clean
-#                       --Extra=file[,file]     Additiona files to remove
+#                       --Extra=file[,file]     Additional files to remove
 #                       --NoCreate              Do not Create the Directory, just delete it
+#
 # Returns         : Nothing
+#

Subversion Repositories DevTools

(root)/core_devl/branches/gitBuilder/TOOLS/makelib.pl2 – Rev 7299 → 7300