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

 my $opt_allSandbox;                         # Extend scope to entire sandbox
 my $opt_processUsedBy;                      # Process dependants(consumers) not dependents(children)
 my $opt_keepgoing;                          # Ignore errors
 my $opt_reScan;                             # Rescan for buildfiles
 my $opt_multiBuilders = 0;                  # How handle packages with multiple bulders: 0:Error, 1:Report, 2:Ignore
+my $opt_onlyLevel = 0;                      # Single level processing
+#
 #   Globals - Provided by the JATS environment
+#
 my $USER            = $ENV{'USER'};
 my $GBE_DPKG_CACHE      = $ENV{'GBE_DPKG_CACHE'};
 my $GBE_DPKG            = $ENV{'GBE_DPKG'};
 my $GBE_DPLY            = $ENV{'GBE_DPLY'};
 my $GBE_DPKG_STORE      = $ENV{'GBE_DPKG_STORE'};
 my $GBE_DPKG_REPLICA    = $ENV{'GBE_DPKG_REPLICA'};
+my $GBE_DPKG_ESCROW     = $ENV{'GBE_DPKG_ESCROW'};
+#
 #   Globals
+#
 my @stopped = ();                               # Stopped entries
 my $maxDname = 0;                               # Pretty display
+#
 #   Known files
+#
+$GBE_DPKG_SBOX = '' unless defined $GBE_DPKG_SBOX;
 my $cacheFile  = $GBE_DPKG_SBOX . '/location_cache';
 my $depthFile  = $GBE_DPKG_SBOX . '/scanDepth';
 my $filterFile = $GBE_DPKG_SBOX . '/buildfilter';
 #-------------------------------------------------------------------------------
+    #
     #   Process all packages in the sandbox
+    #
     foreach my $linkFile ( glob "$GBE_DPKG_SBOX/*/*.lnk")
+    {
-        my $pkg = TagFileRead($linkFile);
+        my $pkg = getPackageLink( TagFileRead($linkFile) );
-        $pkg =~ s~\\~/~g;
-        if ($pkg =~ s~^GBE_SANDBOX/~$GBE_SANDBOX/~)
-        {
-                # If the target sandbox is in the 'deploymode' then the package
-                # will not be in the expected location. It will be in a 'build/deploy'
-                # subdir. Remove the pkg/name dir to get to the root of the package
-                my @dirs = File::Spec->splitdir( $pkg );
-                splice(@dirs, -2);
-                my $deployBox = catdir(@dirs, 'build', 'deploy');
-                $pkg = $deployBox if ( -d $deployBox);
-        }
         unless ( -d $pkg )
+        {
             if ($opt_delete)
+            {
                 Message ("Delete: $linkFile");
     exit (0);
+}
 #-------------------------------------------------------------------------------
+# Function        : getPackageLink
+#
+# Description     : Read a package link file and process the data to generate
+#                   the link to the package
+#
+# Inputs          : $linkFile   - File that contains the link
+#
+# Returns         : The resolved link
+#
+sub getPackageLink
+{
+    my ($linkFile) = @_;
+    my $pkg = TagFileRead($linkFile);
+    $pkg =~ s~\\~/~g;
+    if ($pkg =~ s~^GBE_SANDBOX/~$GBE_SANDBOX/~)
+    {
+            # If the target sandbox is in the 'deploymode' then the package
+            # will not be in the expected location. It will be in a 'build/deploy'
+            # subdir. Remove the pkg/name dir to get to the root of the package
+            my @dirs = File::Spec->splitdir( $pkg );
+            splice(@dirs, -2);
+            my $deployBox = catdir(@dirs, 'build', 'deploy');
+            $pkg = $deployBox if ( -d $deployBox);
+    }
+    return $pkg;
+}
+#-------------------------------------------------------------------------------
 # Function        : setScanDepth
+#
 # Description     : Set the depth of the build file scan usd in this sandbox
+#
 # Inputs          : Command line arguments
     #   Look in each package archive directory
+    #
     foreach my $dpkg ( $GBE_DPKG_SBOX,
                        $GBE_DPKG_LOCAL,
                        $GBE_DPKG_CACHE,
+                       $GBE_DPKG_ESCROW,
+                       '--NotEscrow',
                        $GBE_DPKG_REPLICA,
                        $GBE_DPKG,
                        $GBE_DPLY,
                        $GBE_DPKG_STORE )
+    {
         next unless ( $dpkg );
+        if ( $dpkg eq '--NotEscrow' )
+        {
+            last if ($GBE_DPKG_ESCROW);
+            next;
+        }
         if ( -d "$dpkg/$name/$ver" )
+        {
             return 1;
+        }
+    }
 #                   Operation will be modified by
 #                       $opt_toPackage
 #                       $opt_fromPackage
 #                       @opt_justPackage
 #                       @opt_ignorePackage
+#                       $opt_onlyLevel
+#
 # Inputs          : quiet       undef - noisy
 #                               1 - quiet
+#
 # Returns         : Will exit if not in a sandbox
             next if ( $pname =~ m~^\.~ );
             next if ( $pname =~ m~dpkg_archive$~ );
             next if ( $pname eq 'CSV' );
             next if ( $pname eq 'lost+found' );
             next unless ( -d $pname );
+            if ( -d $pname . '/sandbox_dpkg_archive' ) {
+                Warning("Nested sandbox ignored: $pname");
+                next ;
+            }
             Verbose ("Package discovered: $pname");
             if ( -f "$pname/stop" || -f "$pname/stop.$GBE_MACHTYPE" )
+            {
                 push @stopped, $pname;
                 Warning("Package marked for skip: $fe->{dname}, $fe->{dir}") unless $quiet;
                 $scan_add = 0;
                 $fe->{buildSkip} = 1;
+            }
+            #
+            #   Select one level
+            #
+            if ($opt_onlyLevel && $opt_onlyLevel != $level) {
+                $scan_add = 0;
+            }
             $fe->{level} = $level;
             $fe->{buildActive} = $scan_add;
             $packages{$build} = $fe;
             push (@build_order, $fe);
             delete $depends{$build};
         'entireSandBox!'    => \$opt_allSandbox,
         'users!'            => \$opt_processUsedBy,
         'keepgoing!'        => \$opt_keepgoing,
         'rescan!'           => \$opt_reScan,
         'multiBuilders:s'   => $parseMulti,
+        'onlylevel:i'       => \$opt_onlyLevel,
         );
+    #
     #   Merge in the user options
+    #
 #-------------------------------------------------------------------------------
 # Function        : addBuildInfo
+#
 # Description     : Add some build info status
 #                   It will have a .sig file if its been sucessfully built
+#
+#                   StatusFlags
+#                   Position 1: S - Build Skipped, s - Build Suppressed
+#                   Position 2: Blank - Not processed  , - = NoBuild, B - Built * - Current package
+#                   Position 3: E - Exists in dPkg, L - Local, M - Both local and dPkg
+#                   Position 4: G - Good Fingerprint, b - Bad Fingerprint
+#
 # Inputs          : $fe     - Package info
+#
-# Returns         : True - sig file present
+# Returns         : StatusFlags
+#                   StatusText
+#
 sub addBuildInfo
+{
     my ($fe, $args) = @_;
     my $txt = '';
+    my $statusS = ' ';
     my $statusB = ' ';
+    my $statusP = ' ';
     my $statusF = ' ';
-    my $statusS = ' ';
     unless ($fe->{buildActive}) {
         $txt .= ($fe->{buildSkip}) ? ' (Build Skipped)' : ' (Build Suppressed)';
         $statusS = ($fe->{buildSkip}) ? 'S' : 's';
+    }
+    {
         $statusB = '*';
         $txt .= ' (Current Package)';
+    }
-    my $sigFile = getPkgFingerPrintFile($fe);
+    my $fpFile = getPkgFingerPrintFile($fe);
-    my $tagFile = $sigFile;
-    if (-f $sigFile)
+    if (-f $fpFile)
+    {
+        my $nobFile = $fpFile;
-        $sigFile =~ s~ffp$~nob~;
+        $nobFile =~ s~ffp$~nob~;
-        if (-f $sigFile) {
+        if (-f $nobFile) {
             $txt .= ' [NoBuild]';
             $statusB = '-';
-#        } elsif (locatePreBuiltPackage($fe)) {
-#            $txt .= ' [PreBuilt]';
-#            $statusB = 'P';
         } else {
             $txt .= ' [Built]';
             $statusB = 'B';
+        }
         if ($args->{testFingerPrint})
+        {
-            if ( TagFileMatch($tagFile, genPkgFingerPrint($fe, 'Test')) )
+            if ( TagFileMatch($fpFile, genPkgFingerPrint($fe, 'Test')) )
+            {
                 $txt .= ' [GoodFinger]';
                 $statusF = 'G';
             } else {
                 $txt .= ' [BadFinger]';
                 $statusF = 'b';
+            }
+        }
+    }
+    my $preBuilt = check_package_existance($fe->{name}, $fe->{version});
+    if ($preBuilt) {
+        $txt .= ' [dPkg]';
+        $statusP = 'E';
+    }
+    my $plink = catdir( $GBE_DPKG_SBOX, $fe->{name}, 'sandbox.' . $fe->{prj} . '.lnk' );
+    my $linkTarget = getPackageLink ($plink);
+    Verbose ("Sandbox link: $plink -> $linkTarget");
+    if (-d $linkTarget) {
+        $txt .= ' [Local]';
+        if ($preBuilt) {
+            $statusP = 'M';
+        } else {
+            $statusP = 'L';
+        }
+    }
-    return "$statusS$statusB$statusF", $txt ;
+    return "$statusS$statusB$statusP$statusF", $txt ;
+}
 #-------------------------------------------------------------------------------
 # Function        : opts_add2List
 #                   faster as there is no file i/o.
+#
 #                   It does assume that the file metadata will change if the file is changed
 #                   Will also detect the addition / deletion of files
+#
-#                   Note: This siganture is not machine - type safe
+#                   Note: This signature is not machine - type safe
 #                         It will vary between machines (windows/Linux/...)
+#                         At the moment the Sandbox is really a single machine tool
+#
 # Inputs          : $fe            - Package entry of the package to process
 #                   $mode          - Diagnostic: mode
+#
 # Returns         : A SHA1 hash over all the files
+    #
     my @dirList = ToolsetFiles::GetSubTrees($ifaceDir);
     Error ("Internal:ToolsetFiles::GetDirList for $fe->{dname} not populated" ) unless @dirList;
+    #
+    #   Generate a hash of toolset files and toolset-internal directories
+    #       These won't be included in the finger print as they are subject
+    #       to change by a 'build'.
+    #
+    my %toolsetFiles = map { $_ => 1 } ToolsetFiles::GetFiles($ifaceDir, 1);
+    my %toolsetDirs  = map { $_ => 1 } ToolsetFiles::GetBuildDirs($ifaceDir);
+    #
     #   Create the hash
+    #
     $genPkgFingerPrintSha1 = Digest->new("SHA-1");
     push @fpdata, $mode;
         #       Kill of the last access time - not useful
+        #
         #       Need to exclude files that change during a null build
         #           /interface/GbeFiles.cfg
         #           /build.log
+        #           These files are tracked in GbeBuild.cfg
+        #       Need to directories that change during a null build
+        #           These files are tracked in GbeBuild.cfg
+        #
         #       Symlinks present problems.
         #       Some packages generate symlinks as they create file system images. The
         #       links are not designed to be interpreted in the context of the current
         #       computer. As a result.
+        #
         #       Current solution: Do not include 'stat' data for ANY symlink or directory
+        #
         my @data = stat($item);
         my $text;
-        if ( $item =~ m~/build.log$~ || $item =~ m~/GbeFiles.cfg$~) {
+        if ( exists $toolsetFiles{$item}) {
             $text = "$item : SKIPPED FILE : ";
         }  elsif (-d $item ) {
-                $text = "$item : DIRECTORY"
+            $text = "$item : DIRECTORY";
+            if ( exists $toolsetDirs{$item}) {
+                $File::Find::prune = 1;
+                $text = "$item : SKIP INTERNAL DIRECTORY";
+            }
         }  elsif (-l $item ) {
             if ( ! @data) {
                 $text = "$item : BROKEN SYMLINK : ";
             } else {
                 my $linkTarget = readlink($item) || 'Read Error';
     -help[=n]                  - Display help with specified detail
     -help -help                - Detailed help message
     -man                       - Full documentation
  Options for recursion control:
+    -onlyLevel=number          - Limit building to one level
     -toPackage=name            - Stop building after package
     -fromPackage=name          - Start building from package
     -justPackage=name[,name]   - Build named packages
     -ignorePackage=name[,name] - Do not build named packages
     -entireSandbox             - Process the entire sandbox
 =item B<-man>
 Prints the manual page and exits. This is the same a -help=3
+=item B<-onlyLevel=number>
+This option is available in all commands that process multiple packages.
+Package processing will be limited to the specified level.
+This can be used to perform a multi-machine build. Level-1 builds are performed
+on all machines and the results merged into the common package store, then Level-2 builds
+are performed on all machines.
+Level-1 packages have no dependencies.
+Level-2 packages only have dependancies on Level-1 packages
+Level-N packages only have dependancies on packages below Level N-1
 =item B<-toPackage=name>
 This option is available in all commands that process multiple packages.
 Package processing will stop at the named package.
 jats sandbox populate [command options] [packageName packageVersion]
  Common Options:
     -help[=n], -man            - Command specific help, [n=1,2,3]
+    -onlyLevel=number          - Limit building to one level
     -toPackage=name            - Stop building after package
     -fromPackage=name          - Start building from package
     -justPackage=name[,name]   - Build named packages
     -ignorePackage=name[,name] - Do not build named packages
     -entireSandbox             - Process the entire sandbox
 jats sandbox info [command options]
  Common Options:
     -help[=n], -man            - Command specific help, [n=1,2,3]
+    -onlyLevel=number          - Limit building to one level
     -toPackage=name            - Stop building after package
     -fromPackage=name          - Start building from package
     -justPackage=name[,name]   - Build named packages
     -ignorePackage=name[,name] - Do not build named packages
     -entireSandbox             - Process the entire sandbox
 jats sandbox all [command options] [arguments]
  Common Options:
     -help[=n], -man            - Command specific help, [n=1,2,3]
+    -onlyLevel=number          - Limit building to one level
     -toPackage=name            - Stop building after package
     -fromPackage=name          - Start building from package
     -justPackage=name[,name]   - Build named packages
     -ignorePackage=name[,name] - Do not build named packages
     -entireSandbox             - Process the entire sandbox
 jats sandbox build [command options] [arguments]
  Common Options:
     -help[=n], -man            - Command specific help, [n=1,2,3]
+    -onlyLevel=number          - Limit building to one level
     -toPackage=name            - Stop building after package
     -fromPackage=name          - Start building from package
     -justPackage=name[,name]   - Build named packages
     -ignorePackage=name[,name] - Do not build named packages
     -entireSandbox             - Process the entire sandbox
 jats sandbox clean|clobber [command options]
  Common Options:
     -help[=n], -man            - Command specific help, [n=1,2,3]
+    -onlyLevel=number          - Limit building to one level
     -toPackage=name            - Stop building after package
     -fromPackage=name          - Start building from package
     -justPackage=name[,name]   - Build named packages
     -ignorePackage=name[,name] - Do not build named packages
     -entireSandbox             - Process the entire sandbox
 jats sandbox make [command options] [arguments]
  Common Options:
     -help[=n], -man            - Command specific help, [n=1,2,3]
+    -onlyLevel=number          - Limit building to one level
     -toPackage=name            - Stop building after package
     -fromPackage=name          - Start building from package
     -justPackage=name[,name]   - Build named packages
     -ignorePackage=name[,name] - Do not build named packages
     -entireSandbox             - Process the entire sandbox
 jats sandbox cmd [command options] [arguments]
  Common Options:
     -help[=n], -man            - Command specific help, [n=1,2,3]
+    -onlyLevel=number          - Limit building to one level
     -toPackage=name            - Stop building after package
     -fromPackage=name          - Start building from package
     -justPackage=name[,name]   - Build named packages
     -ignorePackage=name[,name] - Do not build named packages
     -entireSandbox             - Process the entire sandbox

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/jats_sandbox.pl – Rev 6198 → 6276