Ignore:
Timestamp:
2013-11-20T17:34:45+13:00 (10 years ago)
Author:
ak19
Message:

Committing the next installment of code to handle diffcol for GS3. Now it successfully compiles up GS3, while diffcol still works for GS2.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl

    r28609 r28661  
    5050my ($gv_test_os, $gv_model_os); # still just file globals
    5151
    52 $gv_strModelColRoot = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"/model-collect");
    53 $gv_strTestColRoot = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"/collect");
     52if($ENV{'GSDL3SRCHOME'}) {
     53    $gv_strModelColRoot = &FileUtils::filenameConcatenate($ENV{'GSDL3SRCHOME'},"web","sites","localsite","/model-collect");
     54    $gv_strTestColRoot = &FileUtils::filenameConcatenate($ENV{'GSDL3SRCHOME'},"web","sites","localsite","/collect");
     55} else {
     56    $gv_strModelColRoot = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"/model-collect");
     57    $gv_strTestColRoot = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"/collect");
     58}
    5459
    5560$gv_blnErrorStop = "false";
Note: See TracChangeset for help on using the changeset viewer.