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

     Debug( "Name:      $name" );
     Debug( "Version:   $version" );
     DataDirective("LinkPkgArchive");            # This directive allowed here
-    if ( $IgnorePkgs )
+#   if ( $IgnorePkgs )
-    {
+#   {
-        Log( "LinkPkgArchive .. $name ($version) - Ignored" );
+#       Log( "LinkPkgArchive .. $name ($version) - Ignored" );
-        return;
+#       return;
-    }
+#   }
+    #
     #   Ensure that we have do not have multiple definitions
+    #
     if ( PackageEntry::Exists( $name, $version ) )
     $ifaceDir = TagFileRead($ifaceDir);
     $ifaceDir =~ s~\\~/~g;
     $ifaceDir =~ s~GBE_SANDBOX/~$::GBE_SANDBOX/~;
     my $pkgSigFile = catfile( $ifaceDir, 'Package.sig');
+    # Temp: Remove when we no longer have package-versions
     return unless -f $pkgSigFile;
     Error("Package signature not found for $name/$version", "You must 'build' the package before using it")
         unless ( -f $pkgSigFile);
     $pkgSig = TagFileRead($pkgSigFile);
+    #
     #   Package not found
     #   This is an error, although it can be bypassed
+    #
-    #Error ("Required package not found by signature: '$name/$version'" ) unless ( $NoPackageError );
+    Error ("Required package not found by signature: '$name/$version'" ) unless ( $NoPackageError );
-    #
-    #Log( "WARNING .... Package not available: '$name/$version'" );
+    Log( "WARNING .... Package not available: '$name/$version'" );
     return;
+}
 #-------------------------------------------------------------------------------
 # Function        : LinkEntry
     Debug( "Name:      $name" );
     Debug( "Version:   $version" );
     DataDirective("BuildPkgArchive");           # This directive allowed here
-    if ( $IgnorePkgs )
+#   if ( $IgnorePkgs )
-    {
+#   {
-        Log( "BuildPkgArchive . $name ($version) - Ignored" );
+#       Log( "BuildPkgArchive . $name ($version) - Ignored" );
-        return;
+#       return;
-    }
+#   }
+    #
     #   Ensure that we have do not have multiple definitions
+    #
     if ( PackageEntry::Exists( $name, $version ) )
     if ($gitEnabled)
+    {
+        #
         #   Include the sha1 of all 'git' tree items that form the complete source image
+        #   Warn user if not all components are version controlled
+        #
         my @relDirList = map { my $relName = $_; $relName =~ s~^$::GBE_SANDBOX/~~; $relName  } ToolsetFiles::GetSubTrees();
         my @cmdList = map { 'HEAD:' . $_  } @relDirList;
-Debug0(" GIT DIR: @relDirList" );
-Debug0(" GIT CMD: " . "git rev-parse @cmdList" );
+        Debug3(" GIT CMD: " . "git rev-parse", @cmdList );
-        my $index = 0;
+        #
+        #   Callback function to process the output of the Git parse
+        #   Expect one line for each HEAD: item
+        #
+        my $index = 0;
+        my @notControlled;
         my $callback = sub {
             my ($cdata, $line) = @_;
             $line =~ s~\s+$~~;
-Debug0(" GIT OUT: " . $line  );
+            Debug3(" GIT OUT: " . $line  );
+            if ($line =~ m~^HEAD:(.*)~) {
+                push @notControlled, $1;
+            }
             $BuildSignatureSha1->add($line);
             push @sigList, "PKGSRC: $relDirList[$index++]: $line: " . $BuildSignatureSha1->clone->hexdigest;
             return 0;
         };
-        GitCmd('rev-parse', @cmdList, { process => $callback } );
+        my $rv = GitCmd('rev-parse', @cmdList, { process => $callback } );
+        Debug2("GitCmd Result: $rv");
         $BUILDSIGNATURE =  $BuildSignatureSha1->hexdigest;
+        if (@notControlled) {
+            Warning('The folling paths are not version controlled:', @notControlled);
+        }
+    }
     else
+    {
         $BUILDSIGNATURE = 'MSG: Sandbox is not git enabled';
+    }
     FileCreate( $signatureFile, $BUILDSIGNATURE );
     FileCreate( $sigDebugFile, @sigList );
 Debug0("sigDebugFile: $sigDebugFile");
+    #
+    #   See if the package exists in one of the package stores
+    #   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, $BUILDNAME_PACKAGE . $BUILDNAME_SUFFIX, $BUILDSIGNATURE);
+        if (-d $pkgDir ) {
+            Message("PreBuild: $pkgDir");
+            last;
+        }
+    }
+    #
     #   Create the descpkg file - to include the signature
+    #
     BuildDescpkg('Internal');
+}
 #-------------------------------------------------------------------------------
 # Function        : GitCmd
+#
 # Description     : Run a Git Command and capture/process the output
+#
-#                   Based on JatsSvnCore:GitCmd
+#                   Based on JatsSvnCore:SvnCmd
+#
 # Inputs          : Command
 #                   Command arguments
 #                   Last argument may be a hash of options.
 #                       nosavedata  - Don't save the data
     #   Monitor the output from the utility
     #   Have used stdmux to multiplex stdout and stderr
+    #
     #   Note: IO::Select doesn't work on Windows :(
     #   Note: Open3 will cause blocking unless both streams are read
-    #         Can read both streams becsue IO::Select doesn't work
+    #         Can't read both streams because IO::Select doesn't work
+    #
     #   Observation:
     #       svn puts errors to STDERR
     #       svn puts status to STDOUT
+    #

Subversion Repositories DevTools

(root)/core_devl/branches/gitBuilder/TOOLS/buildlib.pl – Rev 7311 → 7312