WebSVN – DevTools – Diff – /core_devl/trunk/TOOLS/buildlib.pl

 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  $sandbox_exact          = 0;                # Exact or in-exact sandbox
 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
                              "package"       => \$NoPackageError,
                              "nopackages"    => \$IgnorePkgs,
                              "forcebuildpkg" => \$ForceBuildPkg,
                              "force!"        => \$ForceBuild,
                              "generic!"      => \$GenericBuild,
+                             "localcache!"   => \$opt_localCache,
                              );
     Usage() if ( $opt_help || !$result );
     Debug( "Host:          ", $ScmHost );
     Debug( "Cwd:           ", $CwdFull );
     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;
     } 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
         #..
+#
 # 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
     -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/trunk/TOOLS/buildlib.pl – Rev 6511 → 6619