WebSVN – DevTools – Diff – /buildtool/trunk/src/generated/com/erggroup/buildtool/abt/ABT.java

   // System
   private String fs = System.getProperty( "file.separator" );
   private String ls = System.getProperty( "line.separator" );
   private String gbeMachtype = System.getenv("GBE_MACHTYPE");
   private String dpkg_archive = System.getenv("GBE_DPKG");
-  private String deploy_archive = System.getenv("GBE_DPLY");
   // ant built in
   private Project project;
   private String basedir;
   // global
   private boolean master;
   private String packageAlias;
   private String packageName;
   private String packageVersion;
   private String packageExtension;
   private String packageLoc;
-  private String packageLabel;
+  private String packageVcsTag;
   private String directChange;
   private String doesNotRequireSourceControlInteraction;
   private String testBuildInstruction;
   private String generic;
   private String loc;
   private String[] command = new String[100];
   private int commandIndex = 0;
   private String cwd;
   private Execute thread;
   private File wd;
-  private String newLabel;
+  private String newVcsTag;
   private static final Logger mLogger = Logger.getLogger(ABT.class);
   private String fullyPublished = "no";
   private String hostname = new String("unknown");
   private void Log(String message1, String message2)
+  {
     String retVal = "no";
     if (archive == null)
+    {
-      reportErrorException( "GBE_DPKG or GBE_DPLY environment variable not set", 256 );
+      reportErrorException( "GBE_DPKG environment variable not set", 256 );
+    }
     String destination = archive + fs + packageName + fs + packageVersion;
     if ( packageExtension.length() > 0 )
+      {
         break;
+      }
+    }
-    if ( fullyPublished.compareTo("no") == 0 )
-    {
-      // check deploy_archive
-      for (Iterator<Platform> it=platformCollection.iterator(); it.hasNext(); )
-      {
-        Platform platform = it.next();
-        fullyPublished = published( deploy_archive, platform.getGbe_Machtype() );
-        if ( fullyPublished.compareTo("no") == 0 )
-        {
-          break;
-        }
-      }
-    }
     if ( gatherMetricsOnly != null )
+    {
       return;
+    }
+      {
         //
         //  Save modified build files
         //  Label the resultant files
         //  Create a command of the form:
-        //        jats etool jats_save_build
+        //      jats etool jats_vcssave_build
-        //              -locatepkg=zzzz     (Optional)
+        //          -infile     auto.xml/auto.pl
-        //              -infile=aaaa        (Optional)
+        //          -outfile    xxxdepends.xml/build.pl
-        //              -outfile=bbbb       (Optional)
+        //          -pname      package_name
-        //              -pname=xxxx
+        //          -pversion   package_version
-        //              -pversion=yyyy
+        //          -infofile   path_to_info_file
-        //              -wiplabel=ccccc     (Optional)
+        //          -wiplabel   Existing WIP label (optional)
-        //              -infofile=path_name
+        //          -baselabel  View label
-        //
         Log("publish save build files", warn);
         File saveinfo = new File(basedir + fs + rtagId + "abtinfo.txt");
         if ( saveinfo.exists() )
+        {
+        {
           addCommand( "-locatepkg=" + packageLoc );
+        }
         addCommand( "etool" );
-        addCommand( "jats_save_build" );
+        addCommand( "jats_vcssave_build" );
         if ( buildStandard == BuildStandards.ANT )
+        {
           addCommand( "-infile" );
           addCommand( "auto.xml" );
         if ( directChange != null )
+        {
           // its a WIP. Pass in existing Label
           addCommand( "-wiplabel" );
-          addCommand( packageLabel );
+          addCommand( packageVcsTag );
+        }
+          addCommand( "-baselabel" );
+          addCommand( packageVcsTag );
         if ( oldExtension != null && newExtension != null && packageExtension.compareTo( newExtension ) == 0 )
+        {
           // only branch build.pl where its extension is being migrated
           addCommand( "-branch" );
           addCommand( "project_migration_branch" );
         //
         //  The command creates an info file(saveinfo) to pass information back
         //  to the caller (me). This is a 'properties' file
         //  Need to extract the following information
-        //    newLabel
+        //    newVcsTag - which is held as VCS.tag
         //
         Log("publish read info file", info);
         Properties properties = new Properties();
         try
         catch (IOException e)
+        {
           reportErrorException( "Failed to open save_build info file", 262 );
+        }
-        newLabel = properties.getProperty("Label" );
+        newVcsTag = properties.getProperty("VCS.tag" );
-        if ( newLabel == null )
+        if ( newVcsTag == null )
+        {
-          reportErrorException( "Save_build info. Missing property:Label", 262 );
+          reportErrorException( "Save_build info. Missing property:VCS.tag", 262 );
+        }
-        Log("publish read info file. Label:" + newLabel , info);
+        Log("publish read info file. Label:" + newVcsTag , info);
+      }
+    }
+  }
   public void execute()
+      }
       // early target related
       target = getOwningTarget();
       packageAlias = target.getName();
-      packageLabel = project.getProperty(packageAlias + "packagelabel");
+      packageVcsTag = project.getProperty(packageAlias + "packagevcstag");
-      Log("execute packageLabel: ", packageLabel);
+      Log("execute packageVcsTag: ", packageVcsTag);
-      if ( packageLabel == null )
+      if ( packageVcsTag == null )
+      {
         // this abt task has no properties, by design
         // future use to estimate build completion time
         Log("execute packageAlias: " + packageAlias, info);
         return;
       Log("execute owners: ", owners);
       if ( packageAlias.compareTo("AbtSetUp") == 0 )
+      {
-        String packageSrcPath = project.getProperty(packageAlias + "packageSrcPath");
-        if ( packageSrcPath != null )
-        {
-          Log("execute packageSrcPath: ", packageSrcPath);
-          // create rtag_id directory from scratch
+        // create rtag_id directory from scratch
-          File rId = new File( rtagId );
+        File rId = new File( rtagId );
-          deleteDirectory( rId );
+        deleteDirectory( rId );
-          rId.mkdirs();
+        rId.mkdirs();
-          // jats release -extract pkgLabel -path=src_path -root=rtag_id/timestamp -tag=timestamp -noprefix
+        // jats jats_vcsrelease -extract -label=pkgVcsTag -path=src_path -root=rtag_id/timestamp -tag=timestamp -noprefix
-          initCommand();
+        initCommand();
-          addCommand( "jats" );
+        addCommand( "jats" );
-          addCommand( "release" );
+        addCommand( "jats_vcsrelease" );
-          addCommand( "-extract" );
+        addCommand( "-extract" );
-          addCommand( packageLabel );
-          addCommand( "-path=" + packageSrcPath );
+        addCommand( "-label=" + packageVcsTag );
-          addCommand( "-root=" + rtagId );
+        addCommand( "-root=" + rtagId );
-          addCommand( "-tag=" + daemon );
+        addCommand( "-tag=" + daemon );
-          addCommand( "-noprefix" );
+        addCommand( "-noprefix" );
-          addCommand( "-verbose" );
-          addCommand( "-verbose" );
+        addCommand( "-verbose=2" );
-          runCommand( "Failure to extract source code from source control" );
+        runCommand( "Failure to extract source code from source control" );
-        }
         return;
+      }
       // target related
       packageVersion = project.getProperty(packageAlias + "packageversion");
       Log("execute packageVersion: ", packageVersion);
+        }
+      }
       if ( packageAlias.compareTo("AbtTearDown") == 0 )
+      {
-        // tear the ClearCase view down, regardless of build error
+        // tear the build view down, regardless of build error
         wd = new File( basedir );
         // only now change the thread working directory back
         thread.setWorkingDirectory( wd );
         File buildDirectory = new File(wd + getProject().getProperty("abt_package_location"));
         if ( buildDirectory.exists() )
+        {
-          // jats release -extract pkgLabel -root=rtag_id/timestamp -tag=timestamp -noprefix -delete
+          // jats jats_vcsrelease -label pkgTag -root=rtag_id/timestamp -tag=timestamp -noprefix -delete
           initCommand();
           addCommand( "jats" );
-          addCommand( "release" );
+          addCommand( "jats_vcsrelease" );
-          addCommand( "-extract" );
-          addCommand( packageLabel );
+          addCommand( "-label=" + packageVcsTag );
           addCommand( "-root=" + rtagId );
           addCommand( "-tag=" + daemon );
           addCommand( "-noprefix" );
-          addCommand( "-delete" );
+          addCommand( "-delete=2" );
-          addCommand( "-verbose" );
-          addCommand( "-verbose" );
+          addCommand( "-verbose=2" );
           runCommand( "Failure to remove source code extraction" );
+        }
         // delete the rtag directory
         deleteDirectory( new File( rtagId ) );
       for (Iterator<Ant> it=antCollection.iterator(); it.hasNext(); )
+      {
         Ant ant = it.next();
         Log("execute ant: ", ant.getJava());
+      }
-      newLabel = packageName + "_" + packageVersion;
+      // Set newVsTag to the existing VcsTag
-      if ( packageExtension.length() > 0 )
+      // Will be used when rebuilding a package that already exists
-      {
-        newLabel += "." + packageExtension;
+      newVcsTag = packageVcsTag;
-      }
       loc = project.getProperty(packageAlias + "loc");
       Log("execute loc: ", loc);
       cwd = basedir + loc;
       Log("execute cwd: ", cwd);
       wd = new File( cwd );
         if ( daemon != null )
+        {
           // set properties to drive BuildThread attributes
           // these are used to determine what ant did
           getProject().setProperty("abt_fully_published", fullyPublished);
-          getProject().setProperty("abt_new_label", newLabel);
+          getProject().setProperty("abt_new_vcstag", newVcsTag);
+        }
         return;
+      }
         // recognise an escrow will be run multiple times on a build stage
         // do not force continuous rebuilding each time
         // has this package version already been published on this platform
         String published = published( dpkg_archive, gbeMachtype );
-        if ( published.compareTo("no") == 0 )
-        {
-          published = published( deploy_archive, gbeMachtype );
-        }
         if ( published.compareTo("no") != 0 )
+        {
           Log( "execute package has been published on this platform - skipping", info);
           propertyValue = "257";
           throw new Exception();

Subversion Repositories DevTools

(root)/buildtool/trunk/src/generated/com/erggroup/buildtool/abt/ABT.java @ 924 – Rev 922 → 924