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

 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Properties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.tools.ant.BuildException;
 import com.erggroup.buildtool.abt.RemoteExecution.LogOutput;
 import com.erggroup.buildtool.smtp.CreateUrls;
 import com.erggroup.buildtool.smtp.Smtpsend;
 import com.erggroup.buildtool.utilities.CommandBuilder;
 import com.erggroup.buildtool.utilities.ElapseTime;
+import com.erggroup.buildtool.utilities.StringAppender;
 import com.erggroup.buildtool.utilities.utilities;
 public class ABT extends Task
+{
     private String ls = System.getProperty( "line.separator" );
     private boolean useTestArchive = false;
     private String loc;
     private String unittests;
     private ArrayList<Depend> dependCollection = new ArrayList<Depend> ();
     private ArrayList<BuildInfo> buildInfoCollection = new ArrayList<BuildInfo>();
-    private StringBuilder owners = new StringBuilder();;
+    private StringAppender owners = new StringAppender(",");
     private Machine mMachine;
     private String logBase;
     // set up in execute
     private BuildStandards packageStandard = BuildStandards.NONE;           // Build standard for the package
             // jats -locatefile=.jats.packageroot etool jats_metrics -mode=init -rootdir=.
             // -locate=.jats.packageroot causes jats to cd to the folder containing the file .jats.packageroot
             // this file is created in the -path folder by jats release -extract
             // DEVI 51370 it is essential for metrics branch calculation the metrics utility is started within a static view
             //
-            command.init("jats" );
+            command.init("jats" )
-            command.add( "-locatefile=.jats.packageroot" );
+                   .add( "-locatefile=.jats.packageroot" )
-            command.add( "etool", "jats_metrics" );
+                   .add( "etool", "jats_metrics" )
-            command.add( "-mode=init" );
+                   .add( "-mode=init" )
-            command.add( "-rootdir=." );
+                   .add( "-rootdir=." );
             runCommand( "Failure to collect metrics" );
+        }
+    }
             command.add( "-out=" + metrics.getAbsolutePath() );
             runCommand( "Failure to collect metrics" );
+        }
+    }
+    /** Generate BuildMetrics
+     *
+     *
+     * @throws Exception
+     */
+    private void genBuildInfo() throws Exception {
+        // Always delete the (possibly created) output file
+        File buildInfo = new File(utilities.catDir(basedir, rtagId + "abtBuildInfo.properties"));
+        if ( buildInfo.exists() )
+        {
+            buildInfo.delete();
+        }
+        //  Generate a complete buildfilter for all the platforms in the build
+        //  Build a unique set of platform names
+        Map<String,Integer> platforms = new HashMap<String,Integer>();
+        for (Iterator<Machine> it=abtData.machineCollection.iterator(); it.hasNext(); )
+        {
+            Machine ma = it.next();
+            String buildFilter[] = ma.getBuildfilter().split("[\\s,]+");
+            for (String platform:buildFilter)
+            {
+                platforms.put( platform, 1 );
+            }
+        }
+        StringAppender buildFilter = new StringAppender(",");
+        buildFilter.append(platforms.keySet().iterator());
+        // Gather build information
+        // jats -buildfilter aaa,bbb,ccc -locatefile=.jats.packageroot build buildinfo -buildinfo=file
+        command.init("jats" );
+        command.add( "-buildfilter", buildFilter.toString());
+        addCommandLocate();
+        if (buildStandard == BuildStandards.JATS )
+        {
+            command.add( "build", "buildinfo" );
+        }
+        else if (buildStandard == BuildStandards.ANT )
+        {
+            command.add( "etool", "antBuildInfo" );
+            command.add( "-java=" + javaVersion.getJavaVersion() );
+        }
+        command.add( "-buildinfo=" + buildInfo.getAbsolutePath() );
+        runCommand( "Failure to generate BuildInfo" );
+    }
     /**
      * Generate the build dependency data file.
+     *
      * @exception Exception
      */
                 logMsg("execute mailSender: ", mailSender);
                 for (Iterator<Owner> it=abtData.ownerCollection.iterator(); it.hasNext(); )
+                {
                     Owner owner = it.next();
-                    if ( owners.length() > 0 )
-                    {
-                        owners.append(",");
-                    }
                     owners.append(owner.getEmail());
                     logMsg("execute owner: ", owner.getEmail());
+                }
                 logMsg("execute owners: ", owners.toString());
+            }
                 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"));
+                File buildDirectory = new File(wd, getProject().getProperty("abt_package_location"));
                 if ( buildDirectory.exists() )
+                {
                     // jats jats_vcsrelease -label pkgTag -root=rtag_id/timestamp -tag=timestamp -noprefix -delete=2
                     command.init("jats", "jats_vcsrelease" );
                 //  Init the metrics gathering process
                 metricsBegin();
                 //  Generate auto.pl or <PackageName>depends.xml file
                 genbuild();
+                //  Generate BuildInfo
+                genBuildInfo();
                 //  Active build
                 //      Build the target package unless we are simply doing metrics generation
                 //
                 if ( !benign )

Subversion Repositories DevTools

(root)/buildtool/trunk/src/main/java/com/erggroup/buildtool/abt/ABT.java – Rev 7186 → 7333