Changeset 421

Show
Ignore:
Timestamp:
04/23/07 17:53:53 (2 years ago)
Author:
laurentj
Message:

ticket #167: jtpl and jbuildtools build are not generated at the right place

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildapp.php

    r418 r421  
    2929'VERSION'=> array( 
    3030    false, 
    31     'SVN', 
     31    '', 
    3232    '', 
    3333    ), 
    …… 
    5050$MAIN_TARGET_PATH = jBuildUtils::normalizeDir($MAIN_TARGET_PATH); 
    5151 
    52 Env::setFromFile('VERSION',$APPDIR.'/VERSION', true); 
     52Env::setFromFile('VERSION',$APPDIR.'/VERSION',true); 
    5353$SVN_REVISION = Subversion::revision($APPDIR); 
    5454 
    …… 
    6262 
    6363if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){ 
    64     if($NIGHTLY_NAME) 
     64    if($IS_NIGHTLY) 
    6565        $PACKAGE_NAME=$APPNAME.'-nightly'; 
    6666    else 

  • trunk/build/buildjbt.php

    r418 r421  
    4949} 
    5050 
    51 Env::set('MAIN_TARGET_PATH', '_dist', true); 
    52  
    53  
    5451if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){ 
    5552    if($IS_NIGHTLY) 

  • trunk/build/buildjtpl.php

    r418 r421  
    5555} 
    5656 
    57 Env::set('MAIN_TARGET_PATH', '_dist', true); 
    58 Env::set('JTPL_STANDALONE','1'); 
    59  
    6057if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){ 
    6158    if($IS_NIGHTLY) 

  • trunk/build/buildmodules.php

    r418 r421  
    2222    false, 
    2323    ), 
    24 'NIGHTLY_NAME'=>array( 
    25     "", 
    26     true, 
     24'IS_NIGHTLY'=> array( 
     25    false, 
     26    false, 
    2727    ), 
    2828'SVN_REVISION'=> array( 
    2929    false, 
     30    ), 
     31'VERSION'=> array( 
     32    false, 
     33    'SVN', 
     34    '', 
    3035    ), 
    3136); 
    …… 
    3944$SVN_REVISION = Subversion::revision('lib'); 
    4045 
    41 Env::set('MAIN_TARGET_PATH', '_dist/modules/', true); 
     46if($VERSION == 'SVN'){ 
     47    $VERSION = 'SVN-'.$SVN_REVISION; 
     48    $IS_NIGHTLY = true; 
     49}else{ 
     50    $IS_NIGHTLY = false; 
     51} 
    4252 
    4353 
Download in other formats: Unified Diff Zip Archive