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

 #   Options
+#
 my $opt_debug   = $ENV{'GBE_DEBUG'};        # Allow global debug
 my $opt_verbose = $ENV{'GBE_VERBOSE'};      # Allow global verbose
 my $opt_help = 0;                           # Help level
-my $opt_exact = 0;                          # Exact (escrow) build
 my $opt_toPackage;                          # Control recursion
 my $opt_fromPackage;                        # Control recursion
 my @opt_justPackage;                        # Control recursion
 my @opt_ignorePackage;                      # Control recursion
 my $opt_allSandbox;                         # Extend scope to entire sandbox
 #   Reconfigure the options parser to allow subcommands to parse options
+#
 Getopt::Long::Configure('permute');
+#
-#   Determine Sandbox type. Exact or local
-#
-$opt_exact = (-f  $GBE_SANDBOX . '/sandbox_dpkg_archive/.exact' )
-    if ( $GBE_SANDBOX );
-#
 #   Parse the user command and decide what to do
+#
 #   Remove user command from the command line. This will leave command options
 #   in @ARGV so that they can be parsed by the subcommand.
+#
 sub create_sandbox
+{
     GetOptions (
                 "help:+"        => \$opt_help,
                 "manual:3"      => \$opt_help,
-                "exact"         => \$opt_exact,
                 ) || Error ("Invalid command line" );
     SubCommandHelp( $opt_help, "Create Sandbox") if ($opt_help || $#ARGV >= 0 );
     Error ("Cannot create a sandbox within a sandbox",
            "Sandbox base is: $GBE_SANDBOX" ) if ( $GBE_SANDBOX );
     mkdir ('sandbox_dpkg_archive') || Error ("Cannot create the directory: sandbox_dpkg_archive") ;
-    TouchFile( 'sandbox_dpkg_archive/.exact', 'Sandbox marker file')
-        if ($opt_exact);
+    Message ('Sandbox created');
-    Message ('Sandbox created' . ($opt_exact ? ' - With exact version number processing' : ''));
     exit  0;
+}
 #-------------------------------------------------------------------------------
 # Function        : delete_sandbox
     calc_sandbox_info();
+    #
     #   Display information
+    #
-    Message ("Type       : " . ($opt_exact ? 'Exact' : 'Development') );
     Message ("Scope      : " . ($opt_allSandbox ? 'Entire Sandbox' : $packages{$currentPkgTag}{dname} ));
     Message ("Base       : $GBE_SANDBOX");
     Message ("Archive    : $GBE_DPKG_SBOX");
     Message ("BuildFilter: $GBE_BUILDFILTER" . ( (-f $GBE_SANDBOX . '/buildfilter')  ? ' - Local to sandbox' : ''));
+    }
    return 0;
+}
 #-------------------------------------------------------------------------------
+# Function        : locatePreBuiltPackage
+#
+# Description     : Locate a prebuilt package
+#                   Skip the make process if a package with a matching signature
+#                   can be found. ie: We have a pre-built version
+#
+# Inputs          : $fe     - Package Entry
+#
+# Returns         : True - Prebuilt package found
+#                   False - Prebuild package not found
+#
+sub locatePreBuiltPackage
+{
+    my ($fe) = @_;
+    #
+    #   Get the package signature
+    #   This is held in the packages interface directory
+    #
+    my $ifaceDir = getpkgInterface($fe);
+    return 0 unless $ifaceDir;
+    my $sigFile = catdir($ifaceDir, 'Package.sig');
+    return 0 unless -f $sigFile;
+    my $pkgSig = TagFileRead($sigFile);
+    #
+    #   Look in each package archive directory
+    #
+    foreach my $dpkg ( $GBE_DPKG_SBOX,
+                       $GBE_DPKG_LOCAL,
+                       $GBE_DPKG_CACHE,
+                       $GBE_DPKG_REPLICA,
+                       $GBE_DPKG,
+                       $GBE_DPLY,
+                       $GBE_DPKG_STORE )
+    {
+        my $pkgDir = catdir( $dpkg, $fe->{mname}, $pkgSig);
+        if (-d $pkgDir )
+        {
+            Debug("Prebuilt Package found: $pkgSig");
+            return 1;
+        }
+    }
+    return 0;
+}
+#-------------------------------------------------------------------------------
 # Function        : getpkgInterface
+#
 # Description     : Locate the packages interface directory
+#
 # Inputs          : $fe     - Package Entry
     my %multi;
     foreach my $be ( @build_list )
+    {
         Verbose( DisplayPath ("Build file: " . $be->{dir} . " Name: " . $be->{file} ));
+        #
-        #   Sandbox vs Exact processing
+        #   Sandbox
         #       Set a suitable display name
         #       Set a suitable tag
+        #
-        $be->{dname} = $opt_exact ? $be->{full}    : $be->{mname};
+        $be->{dname} = $be->{mname};
-        $be->{tag}   = $opt_exact ? $be->{fullTag} : $be->{package};
+        $be->{tag}   = $be->{package};
         $be->{fname} = join ('_', $be->{name}, $be->{version});
 #        DebugDumpData ("be", $be );
+        #
             } else {
                     $mustBuild = 2;
                     $sigMatch = -1;
+            }
-#Debug0("Skip: $opt_skip, sigMatch: $sigMatch, Build: $mustBuild, Opts: @make_opts",);
+Debug0("Skip: $opt_skip, sigMatch: $sigMatch, Build: $mustBuild, Opts: @make_opts",);
             if ($mustBuild)
+            {
                 if (1)
+                {
                     unlink $tagFile;
+                    #
                     #   Skip make if we have a prebuilt package
+                    #
                     my $mustMake = 1;
+                    if ($mustBuild == 2)
+                    {
+                        my $pbFound = locatePreBuiltPackage($fe);
+                        Debug0("Prebuilt: $pbFound");
+                        $mustMake = 0 if $pbFound;
+                    }
                     if ($mustMake)
+                    {
                         JatsCmd( "-cd=$dir", 'make', 'clean') if $opt_clean;
                         $result = JatsCmd( "-cd=$dir", 'make',  @make_opts);
+    {
         $sigFile =~ s~ffp$~nob~;
         if (-f $sigFile) {
             $txt .= ' [NoBuild]';
             $statusB = '-';
-#        } elsif (locatePreBuiltPackage($fe)) {
+        } elsif (locatePreBuiltPackage($fe)) {
-#            $txt .= ' [PreBuilt]';
+            $txt .= ' [PreBuilt]';
-#            $statusB = 'P';
+            $statusB = 'P';
         } else {
             $txt .= ' [Built]';
             $statusB = 'B';
+        }
+    #
     #   Debugging - delete later
     #   Save FP data to a file
+    #
-#   my $fpDebugFile = catdir($GBE_SANDBOX, 'sandbox_dpkg_archive', $fe->{name} . '.' . $fe->{prj} . '_' . time() . '.fpd');
+    my $fpDebugFile = catdir($GBE_SANDBOX, 'sandbox_dpkg_archive', $fe->{name} . '.' . $fe->{prj} . '_' . time() . '.fpd');
-#   Debug0("fpDebugFile: $fpDebugFile");
+Debug0("fpDebugFile: $fpDebugFile");
-#   FileCreate($fpDebugFile, @fpdata);
+    FileCreate($fpDebugFile, @fpdata);
     return $genPkgFingerPrintSha1->hexdigest;
+}
 jats sandbox create [command options]
  Command Options
     -help[=n]               - Command specific help, [n=1,2,3]
     -verbose[=n]            - Verbose operation
-    -exact                  - Create sandbox to reproduce exact versions
 =head2 OPTIONS
-The 'create' command takes the following options:
+The 'create' command takes no options.
-=over 8
-=item -exact
-When this option is specified the sandbox is marked for exact processing of
-package versions. In this mode the version numbers of the packages in the
-sandbox are significant. This is ideal for recreating a package-version.
-The default is for in-exact processing, in which the version numbers of packages
-within the sandbox are not significant. The is ideal for development.
-=back
 =head2 DESCRIPTION
 The 'create' command will create a sandbox in the users current directory. It is
 not possible to create a sandbox within a sandbox.

Subversion Repositories DevTools

(root)/core_devl/branches/gitBuilder/TOOLS/jats_sandbox.pl – Rev 7300 → 7301