Subversion Repositories DevTools

Rev

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

Rev 830 Rev 832
Line 944... Line 944...
944
   */
944
   */
945
  private String generateTarget(Package p, int buildFile)
945
  private String generateTarget(Package p, int buildFile)
946
  {
946
  {
947
    mLogger.debug("generateTarget");
947
    mLogger.debug("generateTarget");
948
    
948
    
949
    if ( mDaemon && p.mBuildFile == 1 )
949
    if ( ( mDaemon && p.mBuildFile == 1 ) || ( !mDaemon && !p.isGeneric() ) )
950
    {
950
    {
951
      // populate 'missing' BuildStandards
951
      // populate 'missing' BuildStandards
952
      boolean solaris = false;
952
      boolean solaris = false;
953
      boolean linux = false;
953
      boolean linux = false;
954
      boolean win32 = false;
954
      boolean win32 = false;
Line 1503... Line 1503...
1503
      {
1503
      {
1504
        if ( target.compareTo("AbtSetUppackagelocation") != 0 )
1504
        if ( target.compareTo("AbtSetUppackagelocation") != 0 )
1505
        {
1505
        {
1506
          if (mDaemon)
1506
          if (mDaemon)
1507
          {
1507
          {
1508
            loc += mBaseline + "\\" + mTimestamp + "\\";
1508
            loc += mBaseline + "\\" + mTimestamp + "\\" + p.mLabel;
1509
          }
1509
          }
-
 
1510
          else
1510
          
1511
          {
-
 
1512
          	// mAlias used with jats -extractfiles -view
-
 
1513
          	loc += p.mAlias;
-
 
1514
          }
-
 
1515
 
1511
          loc += p.mLabel + p.mLocation;
1516
          loc += p.mLocation;
1512
        }
1517
        }
1513
        else
1518
        else
1514
        {
1519
        {
1515
          loc = p.mLocation;
1520
          loc = p.mLocation;
1516
        }
1521
        }
Line 1536... Line 1541...
1536
        {
1541
        {
1537
          if (mDaemon)
1542
          if (mDaemon)
1538
          {
1543
          {
1539
            loc += mBaseline + "/" + mTimestamp + "/";
1544
            loc += mBaseline + "/" + mTimestamp + "/";
1540
          }
1545
          }
1541
        
1546
          
-
 
1547
          if (mDaemon)
-
 
1548
          {
-
 
1549
            loc += p.mLabel;
-
 
1550
          	// no vobs in escrow_set_up ie jats -extractfiles
-
 
1551
          	loc += "/vobs";
-
 
1552
          }
-
 
1553
          else
-
 
1554
          {
-
 
1555
          	// mAlias used with jats -extractfiles -view
-
 
1556
          	loc += p.mAlias;
-
 
1557
          }
-
 
1558
          
1542
          loc += p.mLabel + "/vobs" + p.mLocation;
1559
          loc += p.mLocation;
1543
        }
1560
        }
1544
        else
1561
        else
1545
        {
1562
        {
1546
          loc = p.mLocation;
1563
          loc = p.mLocation;
1547
        }
1564
        }
Line 1556... Line 1573...
1556
          if (mDaemon)
1573
          if (mDaemon)
1557
          {
1574
          {
1558
            loc += mBaseline + "/" + mTimestamp + "/";
1575
            loc += mBaseline + "/" + mTimestamp + "/";
1559
          }
1576
          }
1560
 
1577
 
-
 
1578
          if (mDaemon)
-
 
1579
          {
-
 
1580
            loc += p.mLabel;
-
 
1581
          	// no vobs in escrow_set_up ie jats -extractfiles
-
 
1582
          	loc += "/vobs";
-
 
1583
          }
-
 
1584
          else
-
 
1585
          {
-
 
1586
          	// mAlias used with jats -extractfiles -view
-
 
1587
          	loc += p.mAlias;
-
 
1588
          }
-
 
1589
          
1561
          loc += p.mLabel + "/vobs" + p.mLocation;
1590
          loc += p.mLocation;
1562
        }
1591
        }
1563
        else
1592
        else
1564
        {
1593
        {
1565
          loc = p.mLocation;
1594
          loc = p.mLocation;
1566
        }
1595
        }