WebSVN – DevTools – Diff – /core_devl/branches/gitBuilder/TOOLS/buildlib.pl

 our @BUILD_BADNAME          = ();               # Unknown platforms
 our @GENERIC_TARGETS        = ();               # Generic targets - only one allowed
 our $BUILDNAME              = "";               # BuildName()
 our $BUILDVERSION           = "";               # BuildName()
+our $BUILDBASEVERSION       = "";               # BuildName
 our $BUILDNAME_PACKAGE;                         # Name
 our $BUILDNAME_VERSION;                         # Version
 our $BUILDNAME_PROJECT;                         # Project(optional)
 our $BUILDNAME_SUFFIX;                          # Project (available)
 our $DEPLOY_PATCH           = 0;                # Deplyment patch number
 our $BUILD_UUID             = time() . substr(rand(),2); # Build Unique Identifier
 my  $DeleteDPACKAGE         = 0;                # Must clobber DPACKAGE
 my  $build_source_pkg       = 0;                # Flag to build source package
 my  $opt_help               = 0;
+my  $opt_localCache         = 0;                # Create cache within the interface directory
 my  $pkgFromSandbox         = 0;                # Flags that we have imported a package from a sandbox
 my  $genToolsetPlatform     = 0;                # BuildToolset directive has been seen
 my  $genToolsetActive       = 0;                # TOOLSET platform required:1, Error:2
 my  $toolsetPlatform        = 'NONE';           # TOOLSET Display Value
                              "package"       => \$NoPackageError,
                              "nopackages"    => \$IgnorePkgs,
                              "forcebuildpkg" => \$ForceBuildPkg,
                              "force!"        => \$ForceBuild,
                              "generic!"      => \$GenericBuild,
+                             "localcache!"   => \$opt_localCache,
                              "signature:s"   => \$CheckSignature,
                              );
     Usage() if ( $opt_help || !$result );
     Debug( "Host:          ", $ScmHost );
     Debug( "package:       ", $NoPackageError );
     Debug( "ForcePkg  :    ", $ForceBuildPkg );
     Debug( "ForceBuild :   ", $ForceBuild );
     Debug( "IgnorePkgs :   ", $IgnorePkgs );
     Debug( "GenericTest :  ", $GenericBuild );
+    Debug( "LocalCache :   ", $opt_localCache );
 #.. Command
+#
     $CmdSwitch = (lc shift @ARGV) if @ARGV;
+    #
     #   If we are not performing a ForceBuild, then we don't need to continue
     #   We have updated the interface directory with BuildPkgArchive
     #   information.
+    #
-    unless ( $::GBE_SANDBOX ) {
+    unless ( $::GBE_SANDBOX )
+    {
         TestForForcedBuild();
+    }
+    #
     #   Must inform makelib that its running under buildlib
     $BUILDNAME_PROJECT = $build_info->{BUILDNAME_PROJECT};
     $BUILDNAME_SUFFIX  = $BUILDNAME_PROJECT ? '.' . $BUILDNAME_PROJECT : '';
     $BUILDNAME         = $build_info->{BUILDNAME};
     $BUILDVERSION      = $build_info->{BUILDVERSION};
+    $BUILDBASEVERSION  = $build_info->{BUILDNAME_BASE_VERSION};
     $DEPLOY_PATCH      = $build_info->{DEPLOY_PATCH} || 0;
+    #
     #   Clobber processing done after values have been accumulated
     } else {
         push @createDirs, "$ifdirname/include";
         $BUILDINTERFACE = $ifdirname;
         $::ScmInterface = $ifdirname;
+        #
+        #   Set up the local cache
+        #
+        my $iCache = "$ifdirname/dpkg_cache";
+        if ($BUILDINTERFACE && $opt_localCache) {
+            my $iCache = "$ifdirname/dpkg_cache";
+            push @createDirs, $iCache;
+            $Cache = $opt_localCache;
+            $::GBE_DPKG_CACHE = FullPath($iCache);
+            $ENV{GBE_DPKG_CACHE} = $::GBE_DPKG_CACHE;
+        } elsif (-d  $iCache ){
+            #$Cache = 1 if $Cache == 0;
+            $::GBE_DPKG_CACHE = FullPath($iCache);
+            $ENV{GBE_DPKG_CACHE} = $::GBE_DPKG_CACHE;
+        }
+    }
     unless ($Clobber) {
         push @createDirs, "$ifdirname/bin";
         push @createDirs, "$ifdirname/lib";
         #   version as having been used. Used by cache cleanup algorithms
+        #
         if ( $isa_cache  )
+        {
             TouchFile ( "$pkg/used.cache", "Marks the cache copy as being used");
+            #print( "                  Cached -> $pkg\n" );
+        }
+        #
         #   Use the first suitable package found
         #..
+}
 #-------------------------------------------------------------------------------
 # Function        : LinkEntry
+#
-# Description     : Scan a package an locate platform specific directories
+# Description     : Scan a package and locate platform specific directories
 #                   Create data structures to capture the information
 #                   This function is used by LinkPkgArchive
 #                   to perfom the bulk of package inclusion work.
+#
 # Inputs          : $platform   - Platform being processed
+#
 # Returns         : Undefined
+#
 sub BuildReleaseFile
+{
+    Warning("BuildReleaseFile directive does nothing and should be removed") unless $Clobber;
+}
 #-------------------------------------------------------------------------------
 # Function        : BuildSnapshot
+#
+#
 # Returns         : Undefined
+#
 sub BuildSnapshot
+{
+    Warning("BuildSnapshot directive does nothing and should be removed") unless $Clobber;
+}
 #-------------------------------------------------------------------------------
 # Function        : BuildSrcArchive
+#
+#
 # Returns         : Undefined
+#
 sub BuildAccessPerms
+{
+    Warning("BuildAccessPerms directive does nothing and should be removed") unless $Clobber;
+}
 sub BuildSetenv
+{
+    Warning("BuildSetenv directive does nothing and should be removed") unless $Clobber;
     push( @BUILDSETENV, @_ );
+}
 #-------------------------------------------------------------------------------
 # Function        : DataDirective
 \$ScmBuildName                  = \"$BUILDNAME\";
 \$ScmBuildPackage               = \"$BUILDNAME_PACKAGE\";
 \$ScmBuildVersion               = \"$BUILDNAME_VERSION\";
 \$ScmBuildProject               = \"$BUILDNAME_PROJECT\";
 \$ScmBuildVersionFull           = \"$BUILDVERSION\";
+\$ScmBuildBaseVersion           = \"$BUILDBASEVERSION\";
 \$ScmBuildPreviousVersion       = \"$BUILDPREVIOUSVERSION\";
 \$ScmLocal                      = \"$BUILDLOCAL\";
 \$ScmDeploymentPatch            = \"$DEPLOY_PATCH\";
 \$ScmSrcDir                     = \"$Srcdir\";
 \$ScmBuildSrc                   = \"$ScmBuildSrc\";
 sub BuildSharedLibFiles_WIN
+{
     foreach my $platform ( @BUILD_ACTIVEPLATFORMS )
+    {
+        my @pathList;
-        next unless ( exists $BUILDINFO{$platform}{EXT_SHARED} );
+        if (exists $BUILDINFO{$platform}{EXT_SHARED} ) {
-        my @dos_paths = BuildSharedLibFiles_list( $platform, $BUILDINFO{$platform}{EXT_SHARED} );
+            push @pathList, reverse BuildSharedLibFiles_list( $platform, $BUILDINFO{$platform}{EXT_SHARED} );
+        }
+        push @pathList, @BUILDTOOLS;
+        #
         #   Create a .bat file for WIN32
         #   This may be consumed by user wrapper programs
+        #
+        #
         my $fh = ::ConfigurationFile::New( "$BUILDINTERFACE/set_$platform.bat", '--NoEof', '--Type=bat' );
         $fh->Write ( "\@echo off\n");
         $fh->Header( "Buildlib ($BuildVersion)","Shared Library Paths" );
         $fh->Write ( "\nSETLOCAL\n");
-        foreach ( reverse @dos_paths )
+        foreach ( @pathList ) {
-        {
             $_ =~ s~/~\\~g;
             $fh->Write ( "PATH=$_;\%PATH\%\n" );
+        }
         $fh->Write ( "\n%*\n" );
         $fh->Write ( "\nENDLOCAL\n");
         #   Create a .sh file for WIN32
         #   This may be consumed by a shell - as used within JATS
+        #
         $fh = ::ConfigurationFile::New( "$BUILDINTERFACE/set_$platform.sh", '--NoEof', '--Type=sh' );
         $fh->Header( "Buildlib ($BuildVersion)","Shared Library Paths" );
-        foreach ( reverse @dos_paths )
+        foreach ( @pathList ) {
-        {
             tr~\\/~/~s;
             $fh->Write ( "PATH=$_\\;\$PATH\n" );
+        }
         $fh->Write ( "\n" . '[ -n "$*" ] && "$@"'  ."\n" );
         $fh->Close();
+#
 sub BuildSharedLibFiles_Unix
+{
     foreach my $platform ( @BUILD_ACTIVEPLATFORMS )
+    {
+        my @unix_paths;
-        next unless ( exists $BUILDINFO{$platform}{EXT_SHARED} );
+        if ( exists $BUILDINFO{$platform}{EXT_SHARED} ) {
-        my @unix_paths = BuildSharedLibFiles_list( $platform, $BUILDINFO{$platform}{EXT_SHARED} );
+            @unix_paths = BuildSharedLibFiles_list( $platform, $BUILDINFO{$platform}{EXT_SHARED} );
-        #
+            #
-        #   Create sonames for all shared libraries
+            #   Create sonames for all shared libraries
-        #   Append to the begging of the search list - so that it will rendered last
+            #   Append to the begging of the search list - so that it will rendered last
-        #
+            #
-        my $sodir = BuildSoNameLinks_Unix($platform, @unix_paths);
+            my $sodir = BuildSoNameLinks_Unix($platform, @unix_paths);
-        unshift( @unix_paths, $sodir ) if defined $sodir;
+            unshift( @unix_paths, $sodir ) if defined $sodir;
+        }
+        #
         #   Create a .sh file for Unix
+        #
         my $file = "$BUILDINTERFACE/set_$platform.sh";
         my $fh = ::ConfigurationFile::New( $file , '--NoEof', '--Type=sh' );
         $fh->Header( "Buildlib ($BuildVersion)","Shared Library Paths" );
-        foreach ( reverse @unix_paths )
+        foreach ( reverse @unix_paths, @BUILDTOOLS ) {
-        {
             $fh->Write ( "export LD_LIBRARY_PATH=$_:\$LD_LIBRARY_PATH\n" );
+        }
+        #
+        #   Extend the search path to allow tools to be located
+        #   Have already extended LD_LIBRARY_PATH to allow for tools shared libaraies
+        #
+        $fh->Write ( "\n# Extend Tool Search Path\n" );
+        foreach ( @BUILDTOOLS ) {
+            tr~\\/~/~s;
+            $fh->Write ( "PATH=$_:\$PATH\n" );
+        }
         $fh->Write ( "\n\"\$\@\"\n" );
         $fh->Close();
+        #
         #   Make the file executable under unix
     -help -help    - Display verbose usage
     -man           - Display internal manual
     -verbose[=n]   - Set level of progress verbosity
     -debug[=n]     - Set the debug level
     -cache         - Cache packages in the local dpkg_package cache
+    -localcache    - Cache packages into the interface directory
     -cache -cache  - Forced refresh dependent packages in the local cache
     -package       - Ignore packages that are not available and continue
     -nopackages    - Ignore package processing directives
     -forcebuildpkg - Treat LinkPkgArchive directives as BuildPkgArchive
                      Also suppress the use of symlinks so that the physical
 If an argument is provided, then it will be used to set the level, otherwise the
 existing level will be incremented. This option may be specified multiple times.
 =item B<-cache>
-This option will cause dependent packages to be cached in the local
+This option will cause dependent packages to be cached in the users local
+dpkg_archive cache as defined via GBE_DPKG_CACHE
+If the option is used twice then the packages will be forcibly refreshed.
-dpkg_archive cache.
+=item B<-localcache>
+This option will cause dependent packages to be cached into the interface
+directory. This option simplifies the use of a cache when building single
+packages.
 If the option is used twice then the packages will be forcibly refreshed.
 =item B<-package>

Subversion Repositories DevTools

(root)/core_devl/branches/gitBuilder/TOOLS/buildlib.pl – Rev 7321 → 7322