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

 our $BUILDNAME              = "";               # BuildName()
 our $BUILDVERSION           = "";               # 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 %BUILDALIAS_DELAY       = ();               # Delayed aliases
 our %BUILDALIAS_TARGETS     = ();               # BuildAlias from --Targets
 our %BUILDALIAS             = ();               # BuildAlias
 my  $DeleteDPACKAGE         = 0;                # Must clobber DPACKAGE
 my  $build_source_pkg       = 0;                # Flag to build source package
 my  $opt_help               = 0;
+my  $sandbox_exact          = 0;                # Exact or in-exact sandbox
 BuildLibInit();
 sub BuildLibInit
+{
     my $build_info = parseBuildName( @arguments );
     $BUILDNAME_PACKAGE = $build_info->{BUILDNAME_PACKAGE};
     $BUILDNAME_VERSION = $build_info->{BUILDNAME_VERSION};
     $BUILDNAME_PROJECT = $build_info->{BUILDNAME_PROJECT};
+    $BUILDNAME_SUFFIX  = $BUILDNAME_PROJECT ? '.' . $BUILDNAME_PROJECT : '';
     $BUILDNAME         = $build_info->{BUILDNAME};
     $BUILDVERSION      = $build_info->{BUILDVERSION};
     $DEPLOY_PATCH      = $build_info->{DEPLOY_PATCH} || 0;
+    #
     push @CLOBBERFILES, 'build.log';
     push @CLOBBERFILES, 'ChangeLog', 'ChangeLog.bak' if ( $ScmHost eq "Unix" );
     return if ( $Clobber );
+    #
+    #   Determine type of sandbox
+    #
+    $sandbox_exact = ( -f $::GBE_DPKG_SBOX . '/.exact' )
+        if ( $::GBE_DPKG_SBOX );
 #.. Create the ChangeLog
+#
     if ( -d "CVS" )                             # CVS support subdir
+    {
         System( "$::GBE_PERL $::GBE_TOOLS/cvs2cl.pl --tags --branches --revisions --day-of-week" )
     Log( "DeployPatch. $DEPLOY_PATCH" ) if ($DEPLOY_PATCH);
     Log( "Project .... $BUILDNAME_PROJECT" )if ($BUILDNAME_PROJECT);
     Log( "Project .... ****** Specifically supressed ******" )unless ($BUILDNAME_PROJECT);
     Log( "DateTime ... $::CurrentTime" );
     Log( "AutoBuild... Enabled:$::GBE_ABT" ) if defined($::GBE_ABT) ;
-    Log( "Build dir... $Cwd" ) if defined($::GBE_ABT) ;
+    Log( "Build dir... $Cwd" ) if defined($::GBE_ABT) || $::GBE_DPKG_SBOX;
-    Log( "BIN  ....... $::GBE_BIN" );
     Log( "PERL ....... $::GBE_PERL" );
+    Log( "BIN  ....... $::GBE_BIN" );
     Log( "TOOLS ...... $::GBE_TOOLS" );
     Log( "CONFIG ..... $::GBE_CONFIG" );
     Log( "MACHTYPE ... $::GBE_MACHTYPE" );
     Log( "PLATFORM ... " . PrintList([split(' ', $::GBE_PLATFORM)], $sep) )    if defined ($::GBE_PLATFORM);
     Log( "DPKG_STORE.. $::GBE_DPKG_STORE" );
     Log( "DPKG ....... $::GBE_DPKG" );
     Log( "DPKG_CACHE . $::GBE_DPKG_CACHE" );
     Log( "DPKG_LOCAL . $::GBE_DPKG_LOCAL" );
     Log( "DPKG_SBOX .. $::GBE_DPKG_SBOX" );
+    Log( "Sandbox .... " . ($sandbox_exact ? "Exact" : "Development") );
     Log( "Platforms .. " . PrintPlatforms(\@BUILDPLATFORMS, $sep) );
+    #
     #   Generate a list of platforms that are completely unknown to JATS
 sub PackageLocate
+{
     my ($name, $uversion ) = @_;
     my $pkg;
     my $local = 1;
-    my $sandbox = 1;
+    my $sandbox = ! $sandbox_exact;
     my $isa_cache = 0;
     my $version;
-    my ($pn, $pv, $ps ) = SplitPackage ($name, $uversion );
     Debug( "PackageLocate: ($name/$uversion)" );
+    #
     #   Look in each package archive directory
         #   not used. The Package suffix is still used so that we can
         #   differentiate sysbasetypes.xxxxx.mas and sysbasetypes.xxxxx.syd
+        #
         if ( $sandbox )
+        {
+            my ($pn, $pv, $ps ) = SplitPackage ($name, $uversion );
             $version = 'sandbox';
             $version .= '.' . $ps if ( $ps );
+        }
         else
+        {
+    #
     if ( $target_archive = $::GBE_DPKG_SBOX )
+    {
         $target_archive_name = "sandbox_dpkg_archive";
         $tag = "Sandbox";
+        if ( $sandbox_exact )
+        {
-        $link_file  = 'sandbox';
+            $link_file = "$BUILDVERSION.lnk";
+        }
+        else
+        {
-        $link_file .= '.' . $BUILDNAME_PROJECT if ( $BUILDNAME_PROJECT );
+            $link_file  = 'sandbox' . ${BUILDNAME_SUFFIX} . '.lnk';
-        $link_file .= '.lnk';
+        }
+    }
     elsif ( $target_archive = $::GBE_DPKG_LOCAL )
+    {
         $target_archive_name = "local_dpkg_archive";
         $link_file = "$BUILDVERSION.lnk";
     #   information as this will not be correct
+    #
     #   PACKAGE/sandbox.PRJ.cfg
+    #
     my $link_dir = "$sandbox_dpkg_archive/$BUILDNAME_PACKAGE";
-    my $link_file = 'sandbox';
+    my $link_file;
+    if ( $sandbox_exact )
+    {
-       $link_file .= '.' . $BUILDNAME_PROJECT if ( $BUILDNAME_PROJECT );
+        $link_file = "$BUILDVERSION.cfg";
+    }
+    else
+    {
-       $link_file .= '.cfg';
+        $link_file  = 'sandbox' . ${BUILDNAME_SUFFIX} . '.cfg';
+    }
     my $link_path = "$link_dir/$link_file";
     if ( $Clobber )
+    {
         unlink $link_path;          # Delete the link

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/buildlib.pl – Rev 343 → 359