Show
Ignore:
Timestamp:
12/05/06 21:35:06 (2 years ago)
Author:
peter
Message:

Merge changes from mainline upto r685.

This branch is now fully merged. Any remaining problems in doxygen, scripts
and tsuite should now be resolved.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • branches/newmole/scripts/dayslow_master.pl

    r324 r687  
    6767#$exe_org = "$c:/projects/cloudy/trunk/release/trunk.exe"; 
    6868# use fast gcc exe 
    69 $exe_org = "$c:/projects/cloudy/trunk/gcc/release/cloudy_gcc.exe"; 
     69$exe_gcc = "$c:/projects/cloudy/trunk/gcc/release/cloudy_gcc.exe"; 
     70$exe_icl = "$c:/projects/cloudy/trunk/icl/release/cloudy_icl.exe"; 
     71$exe_org = $exe_icl; 
    7072system("cp $exe_org $out_dir "); 
    7173#$exe = "c:/projects/Cloudy/trunk/release/trunk.exe"; 
    7274#$exe = "$out_dir"."trunk.exe"; 
    73 $exe = "$out_dir"."cloudy_gcc.exe"; 
     75$exe_gcc = "$out_dir"."cloudy_gcc.exe"; 
     76$exe_icl = "$out_dir"."cloudy_icl.exe"; 
     77$exe = $exe_icl; 
    7478printf(ioLOG "exe is $exe\n"); 
    7579