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

 our $GBE_CORE           = $ENV{'GBE_CORE'}           || '';
 our $GBE_BIN            = $ENV{'GBE_BIN'}            || '';
 our $GBE_CONFIG         = $ENV{'GBE_CONFIG'}         || '';
 our $GBE_DPLY           = $ENV{'GBE_DPLY'}           || '';
 our $GBE_DPKG           = $ENV{'GBE_DPKG'}           || '';
+our $GBE_DPKG_REPLICA   = $ENV{'GBE_DPKG_REPLICA'}   || '';
 our $GBE_DPKG_STORE     = $ENV{'GBE_DPKG_STORE'}     || '';
 our $GBE_DPKG_LOCAL     = $ENV{'GBE_DPKG_LOCAL'}     || '';
 our $GBE_DPKG_CACHE     = $ENV{'GBE_DPKG_CACHE'}     || '';
 our $GBE_DPKG_SBOX      = $ENV{'GBE_DPKG_SBOX'}      || '';
 our $GBE_SANDBOX        = $ENV{'GBE_SANDBOX'}        || '';
 TestDirectoryConfig( 'GBE_DPLY' );
 TestDirectoryConfig( 'GBE_DPKG' );
 TestDirectoryConfig( 'GBE_DPKG_CACHE' );
 TestDirectoryConfig( 'GBE_DPKG_LOCAL' );
 TestDirectoryConfig( 'GBE_DPKG_STORE' );
+TestDirectoryConfig( 'GBE_DPKG_REPLICA' );
 TestDirectoryConfig( 'GBE_DPKG_SBOX' );
 TestDirectoryConfig( 'GBE_SANDBOX' );
 ################################################################################
 #   Setup the Machine Type
 #   If we want to run an alternate version of JATS, then don't attempt to
 #   cache the initial version of JATS.
+#
 if ( $ENV{GBE_CACHE_JATS} && ! $GBE_JATS_SANE && ! $GBE_JATS_VERSION)
+{
+    Debug0("Caching JATS");
     my $state = "Not Cached: Not running from dpkg_archive";
+    #
     #   Must have the DPKG_ARCHIVE cache
     #   Must be running from DPKG_ARCHIVE - prevent messing with local copies
+    #
         #       GBE_NOT_RELEASED being set
         #       Lack of descpkg file
+        #
         if ( ! $GBE_NOT_RELEASED  && -f "$GBE_CORE/descpkg" )
+        {
-            my ($archive, $package) = LocateJatsVersion( $GBE_VERSION );
+            my ($archive, $package, $aName) = LocateJatsVersion( $GBE_VERSION );
             if ( $archive )
+            {
-                Verbose ("Update cached version of JATS: $GBE_VERSION");
+                #
-                #   Attempt to cache the package
+                #   If the required version is found in the cache, then use it
-                #   Need enough JATS environment to run the cache_dpkg utility
+                #   This will bypass the slowish process of invoking cache_dpkg
+                #   at the expense of not being able to handle situations where
+                #   version is updated on the fly
+                #
+                if (($aName ne 'GBE_DPKG_CACHE') && ( $ENV{GBE_CACHE_JATS} < 2))
+                {
+                    Verbose ("Update cached version of JATS: $GBE_VERSION");
+                    #
+                    #   Attempt to cache the package
+                    #   Need enough JATS environment to run the cache_dpkg utility
+                    #
+                    {
-                    local %ENV = %ENV;
+                        local %ENV = %ENV;
+                        $ENV{GBE_TOOLS} = "$GBE_CORE/TOOLS";
+                        $ENV{PERL5LIB} = "$GBE_CORE/TOOLS/LIB" ;
+                        $ENV{GBE_BIN}  = "$GBE_CORE/BIN.$GBE_MACHTYPE";
+                        $ENV{GBE_VERBOSE}  = $GBE_VERBOSE;
-                    $ENV{GBE_TOOLS} = "$GBE_CORE/TOOLS";
+                        etool ( 'cache_dpkg.pl', $package );
-                    $ENV{PERL5LIB} = "$GBE_CORE/TOOLS/LIB" ;
+                    }
+                }
-                    $ENV{GBE_BIN}  = "$GBE_CORE/BIN.$GBE_MACHTYPE";
+                else
-                    $ENV{GBE_VERBOSE}  = $GBE_VERBOSE;
+                {
-                    etool ( 'cache_dpkg.pl', $package );
+                    Verbose("Required version found in cache");
+                }
                 my $tgt = "$GBE_DPKG_CACHE/$package";
                 if ( -d $tgt )
+                {
 Error ("GBE_DPKG_STORE is not a directory : $GBE_DPKG_STORE")
     if ( $GBE_DPKG_STORE && ! -d $GBE_DPKG_STORE );
 Error ("GBE_DPLY is not a directory : $GBE_DPLY")
     if ( $GBE_DPLY && ! -d $GBE_DPLY );
+Error ("GBE_DPKG_REPLICA is not a directory : $GBE_DPKG_REPLICA")
+    if ( $GBE_DPKG_REPLICA && ! -d $GBE_DPKG_REPLICA );
 ########################################################################
+#
 #       Locate a local_dpkg_archive directory, by searching from the CWD
 #       to the root of the file system
     $ENV{'GBE_CONFIG'}        = $GBE_CONFIG;
     $ENV{'GBE_DPLY'}          = $GBE_DPLY;
     $ENV{'GBE_DPKG'}          = $GBE_DPKG;
     $ENV{'JATS_HOME'}         = $GBE_DPKG;
     $ENV{'GBE_DPKG_CACHE'}    = $GBE_DPKG_CACHE;
+    $ENV{'GBE_DPKG_REPLICA'}  = $GBE_DPKG_REPLICA;
     $ENV{'GBE_DPKG_STORE'}    = $GBE_DPKG_STORE;
     $ENV{'GBE_DPKG_LOCAL'}    = $GBE_DPKG_LOCAL;
     $ENV{'GBE_SANDBOX'}       = $GBE_SANDBOX;
     $ENV{'GBE_DPKG_SBOX'}     = $GBE_DPKG_SBOX;
     $ENV{'GBE_PERL'}          = $GBE_PERL;
 # Description     : Scan archives looking for a specified version of JATS
 #                   Complicated by the name change from core_devl to jats
 #                   that occurred circa version 2.71.7.
 #                   The required version may be in either of the packages
+#
+#                   Ensure that package is complete
+#                   The caching process will write built.cache during the creation process
+#
 # Inputs          : $version            - Version to locate
+#
 # Returns         : undef               - if not found
 #                   Array of:
 #                       Repository
+{
     my ($version) = @_;
     my $package;
     my $path;
-    foreach my $archive (qw ( GBE_DPKG_LOCAL GBE_DPKG_CACHE GBE_DPKG GBE_DPKG_STORE ))
+    foreach my $archive (qw ( GBE_DPKG_LOCAL GBE_DPKG_CACHE GBE_DPKG_REPLICA GBE_DPKG GBE_DPKG_STORE ))
+    {
         no strict 'refs';
         $path = ${$archive};
         use strict 'refs';
         next unless ( $path );
         foreach my $package (qw( jats core_devl ))
+        {
             Verbose2( "ExamineDir: $path/$package/$version" );
             if ( -d "$path/$package/$version" )
+            {
+                unless (-f "$path/$package/$version/built.cache")
+                {
-                return $path, "$package/$version";
+                    return $path, "$package/$version", $archive;
+                }
+            }
+        }
+    }
     return;
+}
     Error ("Jar not found: $ANT_HOME/lib/ant-launcher.jar") unless ( -e "$ANT_HOME/lib/ant-launcher.jar" );
     Error ("Directory not found: $ANT_HOME") unless ( -d "$ANT_HOME" );
     Error ("Directory not found: $ANT_HOME/lib") unless ( -d "$ANT_HOME/lib" );
+    #
+    #   Documented KLUDGE
+    #   The 'ant-using' mechanism only understands GBE_DPKG
+    #   This is not good in a cloud build configuration where GBE_DPKG_REPLICA is the fastest repository
+    #   Solution: In an GBE_ABT environment IFF GBE_DPKG_REPLIA exists then set GBE_DPKG
+    #
+    if ($GBE_ABT && $GBE_DPKG_REPLICA)
+    {
+        $ENV{GBE_DPKG_ORIGINAL} = $ENV{GBE_DPKG};
+        $ENV{GBE_DPKG} = $ENV{GBE_DPKG_REPLICA};
+        Message("Setting GBE_DPKG to GBE_DPKG_REPLICA");
+    }
+    #
     #   Use the ant-launcher to invoke ant directly
+    #
     $RESULT = System ( "$JAVA_HOME/bin/java",
+                       #"-agentlib:jdwp=transport=dt_socket,server=y,address=8000,suspend=y",      # Enable Remote Debug
                        "-classpath","$ANT_HOME/lib/ant-launcher.jar",
                        "-Dant.home=$ANT_HOME",
                        "org.apache.tools.ant.launch.Launcher",
                        "-lib","$ANT_HOME/lib",
                        @user_args
 =item B<-version=xxx>
 When this option is invoked JATS will attempt to use the specified version to
 perform all processing. JATS will search the GBE_DPKG_LOCAL, GBE_DPKG_CACHE,
-GBE_DPKG, GBE_DPKG_STORE in order to locate the specified version of the package.
+GBE_DPKG_REPLICA, GBE_DPKG, GBE_DPKG_STORE in order to locate the specified
+version of the package.
 The entire command line will be passed to the JATS wrapper script within that
 version. This bypasses the jats.bat or jats.sh startup scripts.
 JATS will attempt to transfer the target version to the local cache in an

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/jats.pl – Rev 4192 → 4688