Subversion Repositories DevTools

Rev

Rev 4212 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4212 Rev 4280
Line 839... Line 839...
839 
      if ( !ReleaseManager.mUseDatabase )
 839 
      if ( !ReleaseManager.mUseDatabase )
840 
      {
 840 
      {
841 
        mTimestamp = 123456789;
 841 
        mTimestamp = 123456789;
842 
      }
 842 
      }
843
843
- 
 
 844 
      //-----------------------------------------------------------------------
- 
 
 845 
      //    Generate the build file
844 
      do
 846 
      do
845 
      {
 847 
      {
846 
        String buildFileContent = new String( generateBuildFileHeader() );
 848 
        String buildFileContent = new String( generateBuildFileHeader() );
847
849
848 
        for (Iterator<Package> it = mPackageCollection.iterator(); it.hasNext(); )
 850 
        for (Iterator<Package> it = mPackageCollection.iterator(); it.hasNext(); )
Line 857... Line 859...
857 
            buildFileContent += generatePackageProperty(p);
 859 
            buildFileContent += generatePackageProperty(p);
858 
          }
 860 
          }
859 
        }
 861 
        }
860
862
861 
        buildFileContent += generateTaskdef();
 863 
        buildFileContent += generateTaskdef();
862
864 
 
863 
        String set_up = new String("");
 865 
        String set_up = new String("");
864 
        boolean daemonHasTarget = false;
 866 
        boolean daemonHasTarget = false;
865
867
866 
        for (Iterator<Package> it = mPackageCollection.iterator(); it.hasNext(); )
 868 
        for (Iterator<Package> it = mPackageCollection.iterator(); it.hasNext(); )
867 
        {
 869 
        {
Line 1285... Line 1287...
1285 
  {
 1287 
  {
1286 
    mLogger.debug("generatePackageProperty");
 1288 
    mLogger.debug("generatePackageProperty");
1287 
    String lf = new String( System.getProperty("line.separator") );
 1289 
    String lf = new String( System.getProperty("line.separator") );
1288 
    String retVal = new String("");
 1290 
    String retVal = new String("");
1289 
    retVal +=
 1291 
    retVal +=
1290 
    "<property name=\"" + p.mAlias + "\" value=\"" + p.mName + " " + p.mVersion + p.mExtension + "\"/>" + lf;
 1292 
    "  <property name=\"" + p.mAlias + "\" value=\"" + p.mName + " " + p.mVersion + p.mExtension + "\"/>" + lf;
1291 
    mLogger.info("generatePackageProperty returned " + retVal);
 1293 
    mLogger.info("generatePackageProperty returned " + retVal);
1292 
    return retVal;
 1294 
    return retVal;
1293 
  }
 1295 
  }
1294 
 
 1296 
 
1295 
  /**returns an ant taskdef for the abt ant task
 1297 
  /**returns an ant taskdef for the abt ant task
Line 1297... Line 1299...
1297 
  private String generateTaskdef()
 1299 
  private String generateTaskdef()
1298 
  {
 1300 
  {
1299 
    mLogger.debug("generateTaskdef");
 1301 
    mLogger.debug("generateTaskdef");
1300 
    String lf = new String( System.getProperty("line.separator") );
 1302 
    String lf = new String( System.getProperty("line.separator") );
1301 
    String retVal = new String("");
 1303 
    String retVal = new String("");
- 
 
 1304 
    retVal += "<taskdef name=\"abt\" classname=\"com.erggroup.buildtool.abt.ABT\"/>" + lf;
- 
 
 1305 
 
- 
 
 1306 
    //  The ABTData class is only used in Daemon Mode
1302 
    retVal +=
 1307 
    if ( mDaemon ) {
1303 
    "<taskdef name=\"abt\" classname=\"com.erggroup.buildtool.abt.ABT\"/>" + lf;
 1308 
      retVal += "<taskdef name=\"abtdata\" classname=\"com.erggroup.buildtool.abt.ABTData\"/>" + lf;
- 
 
 1309 
    }
- 
 
 1310 
    return retVal;
- 
 
 1311 
  }
- 
 
 1312 
 
- 
 
 1313 
  /** returns the command abtdata items
- 
 
 1314 
   *  Common machine information
- 
 
 1315 
   *  Common email address
- 
 
 1316 
   */
- 
 
 1317 
  private String generateMachineInfo(Package p, String lf)
- 
 
 1318 
  {
- 
 
 1319 
    String  retVal = new String("");
- 
 
 1320 
    retVal += "<abtdata>" + lf;
- 
 
 1321 
 
- 
 
 1322 
    //
- 
 
 1323 
    //  Iterate over all the machines and create a nice entry
- 
 
 1324 
    //
- 
 
 1325 
    for (Iterator<ReleaseConfig> it = mReleaseManager.mReleaseConfigCollection.iterator(); it.hasNext(); )
- 
 
 1326 
    {
- 
 
 1327 
      ReleaseConfig rc = it.next();
- 
 
 1328 
      retVal += "  " + rc.getMachineEntry() + lf;
- 
 
 1329 
    }
- 
 
 1330 
 
- 
 
 1331 
    //
- 
 
 1332 
    //  Now the email information
- 
 
 1333 
    //
- 
 
 1334 
    retVal += p.emailInfo( lf );
- 
 
 1335 
 
- 
 
 1336 
    // End of this element
- 
 
 1337 
    retVal += "</abtdata>" + lf;
1304 
    return retVal;
 1338 
    return retVal;
1305 
  }
 1339 
  }
1306 
 
 1340 
 
1307 
  /**returns an ant target for the passed Package
 1341 
  /**returns an ant target for the passed Package
1308 
   * in daemon mode:
 1342 
   * in daemon mode:
Line 1319... Line 1353...
1319 
   *  the returned target have only a name attribute (will not build this package)
1353 
   *  the returned target have only a name attribute (will not build this package)
1320 
   */
 1354 
   */
1321 
  private String generateTarget(Package p, int buildFile)
 1355 
  private String generateTarget(Package p, int buildFile)
1322 
  {
 1356 
  {
1323 
    mLogger.debug("generateTarget");
 1357 
    mLogger.debug("generateTarget");
- 
 
 1358 
    String lf = new String( System.getProperty("line.separator") );
- 
 
 1359 
    String retVal = new String("");
1324
1360
- 
 
 1361 
    //-------------------------------------------------------------------------
- 
 
 1362 
    //  Generate a collection of 'BuildStandard's
- 
 
 1363 
    //
1325 
    if ( ( mDaemon && p.mBuildFile == 1 ) || ( !mDaemon && !p.isGeneric() ) )
 1364 
    if ( ( mDaemon && p.mBuildFile == 1 ) || ( !mDaemon && !p.isGeneric() ) )
1326 
    {
 1365 
    {
1327 
      // populate 'missing' BuildStandards
 1366 
      // populate 'missing' BuildStandards
1328 
      boolean solaris = false;
 1367 
      boolean solaris = false;
1329 
      boolean linux = false;
 1368 
      boolean linux = false;
Line 1337... Line 1376...
1337
1376
1338 
        if ( bs.getSolaris() )
 1377 
        if ( bs.getSolaris() )
1339 
        {
 1378 
        {
1340 
          solaris = true;
 1379 
          solaris = true;
1341 
        }
 1380 
        }
1342 
        else
 - 
 
1343 
        if ( bs.getLinux() )
 1381 
        else if ( bs.getLinux() )
1344 
        {
 1382 
        {
1345 
          linux = true;
 1383 
          linux = true;
1346 
        }
 1384 
        }
1347 
        else
 - 
 
1348 
        if ( bs.getWin32() )
 1385 
        else if ( bs.getWin32() )
1349 
        {
 1386 
        {
1350 
          win32 = true;
 1387 
          win32 = true;
1351 
        }
 1388 
        }
1352 
 
 1389 
 
1353 
        if ( !determinedBuildStandard && bs.getBuildStandard(!ReleaseManager.mUseDatabase, true).contains("<jats") )
 1390 
        if ( !determinedBuildStandard && bs.getBuildStandard(!ReleaseManager.mUseDatabase, true).contains("<jats") )
Line 1406... Line 1443...
1406 
        }
 1443 
        }
1407
1444
1408 
        p.mBuildStandardCollection.add(bs);
 1445 
        p.mBuildStandardCollection.add(bs);
1409 
      }
 1446 
      }
1410 
    }
 1447 
    }
- 
 
 1448 
 
- 
 
 1449 
    //---------------------------------------------------------------------
- 
 
 1450 
    //  Generate the AbtData - common machine and email information
- 
 
 1451 
    //  Only used by the daemon builds
- 
 
 1452 
    //
- 
 
 1453 
    if ( mDaemon && p.mBuildFile == 1 )
- 
 
 1454 
    {
- 
 
 1455 
      retVal += generateMachineInfo(p, lf);
- 
 
 1456 
    }
1411
1457
- 
 
 1458 
    //-------------------------------------------------------------------------
1412 
    String lf = new String( System.getProperty("line.separator") );
 1459 
    //  Generate the <target name=... /> construct
1413 
    String retVal = new String("");
 1460 
    //  There are two types
- 
 
 1461 
    //      1) Simple dummy place holder. Just has the PackageName.PackageExt
- 
 
 1462 
    //      2) Full target. Has all information to build the package including
- 
 
 1463 
    //              AbtSetUp, AbtTearDown and AbtPublish targets
- 
 
 1464 
    //
1414
1465
1415 
    if ( ( mDaemon && p.mBuildFile == 3 ) ||
 1466 
    if ( ( mDaemon && p.mBuildFile == 3 ) ||
1416 
         ( !mDaemon && ( p.mBuildFile < buildFile ) ) )
 1467 
         ( !mDaemon && ( p.mBuildFile < buildFile ) ) )
1417 
    {
 1468 
    {
1418 
      retVal +=
 1469 
      retVal +=
Line 1491... Line 1542...
1491 
          "    </and>" + lf +
 1542 
          "    </and>" + lf +
1492 
          "  </condition>" + lf;
 1543 
          "  </condition>" + lf;
1493 
        }
 1544 
        }
1494 
        else
 1545 
        else
1495 
        {
 1546 
        {
1496 
          retVal += "  <property name=\"" + p.mAlias + ".build\" value=\"\"/>" + lf;
 1547 
          retVal += "    <property name=\"" + p.mAlias + ".build\" value=\"\"/>" + lf;
1497 
        }
 1548 
        }
1498 
      }
 1549 
      }
1499
1550
1500 
      retVal +=
 1551 
      retVal +=
1501 
      "</target>" + lf +
 1552 
      "</target>" + lf +
Line 1509... Line 1560...
1509 
      retVal += ">" + lf;
 1560 
      retVal += ">" + lf;
1510
1561
1511 
      if ( mDaemon && p.mBuildFile == 1 )
 1562 
      if ( mDaemon && p.mBuildFile == 1 )
1512 
      {
 1563 
      {
1513 
        retVal +=
 1564 
        retVal +=
1514 
        "<property name=\"" + p.mAlias + "pkg_id\" value=\"" + p.mPid + "\"/>" + lf +
 1565 
        "  <property name=\"" + p.mAlias + "pkg_id\" value=\"" + p.mPid + "\"/>" + lf +
1515 
        "<property name=\"" + p.mAlias + "pv_id\" value=\"" + p.mId + "\"/>" + lf;
 1566 
        "  <property name=\"" + p.mAlias + "pv_id\" value=\"" + p.mId + "\"/>" + lf;
1516 
      }
 1567 
      }
1517
1568
1518 
      if ( ( mDaemon && p.mBuildFile == 1 ) || !mDaemon )
 1569 
      if ( ( mDaemon && p.mBuildFile == 1 ) || !mDaemon )
1519 
      {
 1570 
      {
1520 
        retVal +=
 1571 
        retVal +=
1521 
        "<property name=\"" + p.mAlias + "packagename\" value=\"" + p.mName + "\"/>" + lf +
 1572 
        "  <property name=\"" + p.mAlias + "packagename\" value=\"" + p.mName + "\"/>" + lf +
1522 
        "<property name=\"" + p.mAlias + "packageversion\" value=\"" + p.mVersion + "\"/>" + lf +
 1573 
        "  <property name=\"" + p.mAlias + "packageversion\" value=\"" + p.mVersion + "\"/>" + lf +
1523 
        "<property name=\"" + p.mAlias + "packageextension\" value=\"";
 1574 
        "  <property name=\"" + p.mAlias + "packageextension\" value=\"" + p.mExtension + "\"/>" + lf +
1524
- 
 
1525 
        if ( p.mExtension.length() > 0 )
 - 
 
1526 
        {
 - 
 
1527 
          // drop the .
 - 
 
1528 
          retVal += p.mExtension.substring(1);
 - 
 
1529 
        }
 - 
 
1530 
        else
 - 
 
1531 
        {
 - 
 
1532 
          retVal += p.mExtension;
 - 
 
1533 
        }
 - 
 
1534
- 
 
1535 
        retVal += "\"/>" + lf +
 - 
 
1536 
        "<property name=\"" + p.mAlias + "packagevcstag\" value=\"" + p.mVcsTag + "\"/>" + lf;
 1575 
        "  <property name=\"" + p.mAlias + "packagevcstag\" value=\"" + p.mVcsTag + "\"/>" + lf;
1537
1576
1538 
        if ( p.mDirectlyPlanned )
 1577 
        if ( p.mDirectlyPlanned )
1539 
        {
 1578 
        {
1540 
          retVal += "<property name=\"" + p.mAlias + "directchange\" value=\"\"/>" + lf;
 1579 
          retVal += "  <property name=\"" + p.mAlias + "directchange\" value=\"\"/>" + lf;
1541 
        }
 1580 
        }
1542
1581
1543 
        if ( ! p.mRequiresSourceControlInteraction )
 1582 
        if ( ! p.mRequiresSourceControlInteraction )
1544 
        {
 1583 
        {
1545 
          retVal += "<property name=\"" + p.mAlias + "doesnotrequiresourcecontrolinteraction\" value=\"\"/>" + lf;
 1584 
          retVal += "  <property name=\"" + p.mAlias + "doesnotrequiresourcecontrolinteraction\" value=\"\"/>" + lf;
1546 
        }
 1585 
        }
1547
1586
1548 
        mAddendum = "non generic";
 1587 
        mAddendum = "non generic";
1549
1588
1550 
        if ( p.isGeneric() )
 1589 
        if ( p.isGeneric() )
1551 
        {
 1590 
        {
1552 
          mAddendum = "generic";
 1591 
          mAddendum = "generic";
1553 
          retVal += "<property name=\"" + p.mAlias + "generic\" value=\"\"/>" + lf;
 1592 
          retVal += "  <property name=\"" + p.mAlias + "generic\" value=\"\"/>" + lf;
1554 
        }
 1593 
        }
1555
1594
1556 
        retVal += loc(p, p.mAlias + "loc", lf);
 1595 
        retVal += "  " + loc(p, p.mAlias + "loc", lf);
1557
1596
1558 
        if ( p.mHasAutomatedUnitTests && mDaemon )
 1597 
        if ( p.mHasAutomatedUnitTests && mDaemon )
1559 
        {
 1598 
        {
1560 
          retVal +=
1599 
          retVal +=
1561 
          "<property name=\"" + p.mAlias + "unittests\" value=\"\"/>" + lf;
 1600 
          "  <property name=\"" + p.mAlias + "unittests\" value=\"\"/>" + lf;
1562 
        }
 1601 
        }
1563 
      }
 1602 
      }
1564
1603
- 
 
 1604 
      //    Add our own task and associated information
- 
 
 1605 
      //
1565 
      retVal += "<abt>" + lf;
 1606 
      retVal += "  <abt>" + lf;
1566
1607
1567 
      if ( ( mDaemon && p.mBuildFile == 1 ) || !mDaemon )
 1608 
      if ( ( mDaemon && p.mBuildFile == 1 ) || !mDaemon )
1568 
      {
 1609 
      {
1569 
        for (Iterator<Package> it = p.mPackageDependencyCollection.iterator(); it.hasNext(); )
 1610 
        for (Iterator<Package> it = p.mPackageDependencyCollection.iterator(); it.hasNext(); )
1570 
        {
 1611 
        {
1571 
          Package dependency = it.next();
 1612 
          Package dependency = it.next();
1572 
          retVal +=
 1613 
          retVal +=
1573 
          "  <depend package_alias=\"${" + dependency.mAlias + "}\"/>" + lf;
 1614 
          "    <depend package_alias=\"${" + dependency.mAlias + "}\"/>" + lf;
1574 
        }
 1615 
        }
1575 
 
 1616 
 
1576 
        retVal += buildInfo(p, lf, false);
 1617 
        retVal += buildInfo(p, lf, false);
1577 
      }
 1618 
      }
1578
1619
1579 
      if ( mDaemon && p.mBuildFile == 1 )
 - 
 
1580 
      {
 - 
 
1581 
        retVal += p.emailInfo( lf );
 - 
 
1582 
      }
 - 
 
1583
- 
 
1584 
      retVal += "</abt>" + lf +
 1620 
      retVal += "  </abt>" + lf +
1585 
      "</target>" + lf;
 1621 
      "</target>" + lf;
1586
1622
1587 
      if ( mDaemon && p.mBuildFile == 1 )
 1623 
      if ( mDaemon && p.mBuildFile == 1 )
1588 
      {
 1624 
      {
- 
 
 1625 
        //    AbtSetUp
1589 
        retVal +=
 1626 
        retVal +=
1590 
        "<target name=\"AbtSetUp\">" + lf +
 1627 
            "<target name=\"AbtSetUp\">" + lf +
1591 
        "<property name=\"AbtSetUppackagevcstag\" value=\"" + p.mVcsTag + "\"/>" + lf +
 1628 
            "  <property name=\"AbtSetUppackagevcstag\" value=\"" + p.mVcsTag + "\"/>" + lf +
1592 
        "<property name=\"AbtSetUppackagename\" value=\"" + p.mName + "\"/>" + lf;
 1629 
            "  <property name=\"AbtSetUppackagename\" value=\"" + p.mName + "\"/>" + lf;
1593 
 
 1630 
 
1594 
        retVal +=
 1631 
        retVal +=
1595 
        "<abt>" + lf +
 1632 
            "  <abt>" + lf +
1596 
        p.emailInfo( lf ) +
 - 
 
1597 
        "</abt>" + lf +
 1633 
            "  </abt>" + lf +
1598 
        "</target>" + lf;
 1634 
            "  </target>" + lf;
1599 
 
 1635 
 
- 
 
 1636 
        //    AbtTearDown
1600 
        retVal +=
 1637 
        retVal +=
1601 
        "<target name=\"AbtTearDown\">" + lf +
 1638 
            "<target name=\"AbtTearDown\">" + lf +
1602 
        "<property name=\"AbtTearDownpackagevcstag\" value=\"" + p.mVcsTag + "\"/>" + lf +
 1639 
            "  <property name=\"AbtTearDownpackagevcstag\" value=\"" + p.mVcsTag + "\"/>" + lf +
1603 
        "<property name=\"AbtTearDownpackagename\" value=\"" + p.mName + "\"/>" + lf +
 1640 
            "  <property name=\"AbtTearDownpackagename\" value=\"" + p.mName + "\"/>" + lf +
1604 
        "<property name=\"AbtTearDownpackageversion\" value=\"" + p.mVersion + "\"/>" + lf +
 1641 
            "  <property name=\"AbtTearDownpackageversion\" value=\"" + p.mVersion + "\"/>" + lf +
1605 
        "<property name=\"AbtTearDownpackageextension\" value=\"";
 1642 
            "  <property name=\"AbtTearDownpackageextension\" value=\"" + p.mExtension + "\"/>" + lf;
1606
- 
 
1607 
        if ( p.mExtension.length() > 0 )
 - 
 
1608 
        {
 - 
 
1609 
          // drop the .
 - 
 
1610 
          retVal += p.mExtension.substring(1);
 - 
 
1611 
        }
 - 
 
1612 
        else
 - 
 
1613 
        {
 - 
 
1614 
          retVal += p.mExtension;
 - 
 
1615 
        }
 - 
 
1616
1643
1617 
        retVal += "\"/>" + lf;
 - 
 
1618 
 
 - 
 
1619 
        if ( p.isGeneric() )
 1644 
        if ( p.isGeneric() )
1620 
        {
 1645 
        {
1621 
          retVal += "<property name=\"" + p.mAlias + "generic\" value=\"\"/>" + lf;
 1646 
          retVal += "  <property name=\"" + p.mAlias + "generic\" value=\"\"/>" + lf;
1622 
        }
 1647 
        }
1623 
 
 1648 
 
1624 
        retVal +=
1649 
        retVal +=
1625 
        "<abt>" + lf +
 1650 
            "  <abt>" + lf +
1626 
        buildInfo(p, lf, false) +
 1651 
            buildInfo(p, lf, false) +
1627 
        p.emailInfo( lf ) +
 1652 
            "  </abt>" + lf +
1628 
        "</abt>" + lf +
 1653 
            "</target>" + lf;
- 
 
 1654 
 
- 
 
 1655 
        //  AbtPublish
1629 
        "</target>" + lf +
 1656 
        retVal +=
1630 
        "<target name=\"AbtPublish\">" + lf +
 1657 
            "<target name=\"AbtPublish\">" + lf +
1631 
        "<property name=\"AbtPublishpackagevcstag\" value=\"" + p.mVcsTag + "\"/>" + lf +
 1658 
            "  <property name=\"AbtPublishpackagevcstag\" value=\"" + p.mVcsTag + "\"/>" + lf +
1632 
        "<property name=\"AbtPublishpackagename\" value=\"" + p.mName + "\"/>" + lf +
 1659 
            "  <property name=\"AbtPublishpackagename\" value=\"" + p.mName + "\"/>" + lf +
1633 
        "<property name=\"AbtPublishpackageversion\" value=\"" + p.mVersion + "\"/>" + lf +
 1660 
            "  <property name=\"AbtPublishpackageversion\" value=\"" + p.mVersion + "\"/>" + lf +
1634 
        "<property name=\"AbtPublishpackageextension\" value=\"";
 1661 
            "  <property name=\"AbtPublishpackageextension\" value=\"" + p.mExtension + "\"/>" + lf;
1635
- 
 
1636 
        if ( p.mExtension.length() > 0 )
 - 
 
1637 
        {
 - 
 
1638 
          // drop the .
 - 
 
1639 
          retVal += p.mExtension.substring(1);
 - 
 
1640 
        }
 - 
 
1641 
        else
 - 
 
1642 
        {
 - 
 
1643 
          retVal += p.mExtension;
 - 
 
1644 
        }
 - 
 
1645
- 
 
1646 
        retVal += "\"/>" + lf;
 - 
 
1647
1662
- 
 
 1663
1648 
        if ( p.mDirectlyPlanned )
 1664 
        if ( p.mDirectlyPlanned )
1649 
        {
 1665 
        {
1650 
          retVal += "<property name=\"AbtPublishdirectchange\" value=\"\"/>" + lf;
 1666 
          retVal += "  <property name=\"AbtPublishdirectchange\" value=\"\"/>" + lf;
1651 
        }
 1667 
        }
1652
1668
1653 
        if ( ! p.mRequiresSourceControlInteraction )
 1669 
        if ( ! p.mRequiresSourceControlInteraction )
1654 
        {
 1670 
        {
1655 
          retVal += "<property name=\"AbtPublishdoesnotrequiresourcecontrolinteraction\" value=\"\"/>" + lf;
 1671 
          retVal += "  <property name=\"AbtPublishdoesnotrequiresourcecontrolinteraction\" value=\"\"/>" + lf;
1656 
        }
 1672 
        }
1657
1673
1658 
        if ( p.isGeneric() )
 1674 
        if ( p.isGeneric() )
1659 
        {
 1675 
        {
1660 
          retVal += "<property name=\"AbtPublishgeneric\" value=\"\"/>" + lf;
 1676 
          retVal += "  <property name=\"AbtPublishgeneric\" value=\"\"/>" + lf;
1661 
        }
 1677 
        }
1662 
 
 1678 
 
1663 
        retVal += loc(p, "AbtPublishloc", lf);
 1679 
        retVal += "  " + loc(p, "AbtPublishloc", lf);
1664 
        retVal +=
 1680 
        retVal +=
1665 
        "<abt>" + lf +
 1681 
            "  <abt>" + lf +
1666 
        buildInfo(p, lf, true) +
 1682 
            buildInfo(p, lf, true) +
1667 
        p.emailInfo( lf ) +
 - 
 
1668 
        "</abt>" + lf +
 1683 
            "  </abt>" + lf +
1669 
        "</target>" + lf;
 1684 
            "</target>" + lf;
1670 
      }
 1685 
      }
1671 
    }
 1686 
    }
1672 
    mLogger.info("generateTarget returned " + retVal);
 1687 
    mLogger.info("generateTarget returned " + retVal);
1673 
    return retVal;
 1688 
    return retVal;
1674 
  }
 1689 
  }
Line 1907... Line 1922...
1907 
 
 1922 
 
1908 
    mLogger.info("loc returned " + retVal);
 1923 
    mLogger.info("loc returned " + retVal);
1909 
    return retVal;
 1924 
    return retVal;
1910 
  }
 1925 
  }
1911 
 
 1926 
 
1912 
  /**returns the buildInfo
 1927 
  /**returns the buildInfo
- 
 
 1928 
   *    p       - Package to process
- 
 
 1929 
   *    lf      - End of Line terminator
- 
 
 1930 
   *    filter  - False: Include all build standards
- 
 
 1931 
   *              True: Only include build standards relevent to the package
1913 
   */
 1932 
   */
1914 
  private String buildInfo(Package p, String lf, boolean filter)
 1933 
  private String buildInfo(Package p, String lf, boolean filter)
1915 
  {
 1934 
  {
1916 
    mLogger.debug("buildInfo");
 1935 
    mLogger.debug("buildInfo");
1917 
 
 1936 
 
1918 
    String platforms = new String();
 1937 
    String platforms = new String();
1919 
    String standards = new String();
 1938 
    String standards = new String();
1920
1939
- 
 
 1940 
    //
- 
 
 1941 
    //  Create two (related) xlm sequences
- 
 
 1942 
    //      platforms - <platform gbe_machtype="linux_i386"/>
- 
 
 1943 
    //      standards - <jats target="all"/>
- 
 
 1944 
    //
1921 
    for (Iterator<BuildStandard> it = p.mBuildStandardCollection.iterator(); it.hasNext(); )
 1945 
    for (Iterator<BuildStandard> it = p.mBuildStandardCollection.iterator(); it.hasNext(); )
1922 
    {
 1946 
    {
1923 
      BuildStandard bs = it.next();
 1947 
      BuildStandard bs = it.next();
1924
1948
1925 
      if ( !filter )
 1949 
      if ( !filter  || !bs.getBuildStandard(!ReleaseManager.mUseDatabase, true).contains("\"none\"") )
1926 
      {
 1950 
      {
1927 
        String platform = bs.getPlatform(!ReleaseManager.mUseDatabase, true);
 1951 
        String platform = bs.getPlatform(!ReleaseManager.mUseDatabase, true);
1928
- 
 
1929 
        if ( platform.length() > 0 )
 1952 
        if ( platform.length() > 0 )
1930 
        {
 1953 
        {
1931 
          platforms += platform + lf;
 1954 
          platforms += platform + lf;
1932 
        }
 1955 
        }
1933 
 
 1956 
 
1934 
        String standard = bs.getBuildStandard(!ReleaseManager.mUseDatabase, true);
 1957 
        String standard = bs.getBuildStandard(!ReleaseManager.mUseDatabase, true);
1935
- 
 
1936 
        if ( standard.length() > 0 )
 1958 
        if ( standard.length() > 0 )
1937 
        {
 1959 
        {
1938 
          standards += standard + lf;
 1960 
          standards += standard + lf;
1939 
        }
 1961 
        }
1940 
      }
 1962 
      }
1941 
      else
 - 
 
1942 
      {
 - 
 
1943 
        if ( !bs.getBuildStandard(!ReleaseManager.mUseDatabase, true).contains("\"none\"") )
 - 
 
1944 
        {
 - 
 
1945 
          String platform = bs.getPlatform(!ReleaseManager.mUseDatabase, true);
 - 
 
1946
- 
 
1947 
          if ( platform.length() > 0 )
 - 
 
1948 
          {
 - 
 
1949 
            platforms += platform + lf;
 - 
 
1950 
          }
 - 
 
1951
- 
 
1952 
          String standard = bs.getBuildStandard(!ReleaseManager.mUseDatabase, true);
 - 
 
1953
- 
 
1954 
          if ( standard.length() > 0 )
 - 
 
1955 
          {
 - 
 
1956 
            standards += standard + lf;
 - 
 
1957 
          }
 - 
 
1958 
        }
 - 
 
1959 
      }
 - 
 
1960 
    }
 1963 
    }
1961
1964
1962 
    mLogger.info("buildInfo returned " + platforms + standards);
 1965 
    mLogger.info("buildInfo returned " + platforms + standards);
1963 
    return platforms + standards;
 1966 
    return platforms + standards;
1964 
  }
 1967 
  }