developer.jelix.org is not used any more and exists only for history. Post new tickets on the Github account.
developer.jelix.org n'est plus utilisée, et existe uniquement pour son historique. Postez les nouveaux tickets sur le compte github.

Ticket #167: build.patch

File build.patch, 2.4 KB (added by laurentj, 13 years ago)

patch to fix bug

  • build/buildjtpl.php

     
    5454    $IS_NIGHTLY = false;
    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)
    6259        $PACKAGE_NAME = 'jtpl-nightly';
  • build/buildjbt.php

     
    4848    $IS_NIGHTLY = false;
    4949}
    5050
    51 Env::set('MAIN_TARGET_PATH', '_dist', true);
    52 
    53 
    5451if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){
    5552    if($IS_NIGHTLY)
    5653        $PACKAGE_NAME='jbuildtools-nightly';
  • build/buildapp.php

     
    2828    ),
    2929'VERSION'=> array(
    3030    false,
    31     'SVN',
    3231    '',
     32    '',
    3333    ),
    3434'IS_NIGHTLY'=> array(
    3535    false,
     
    4949$APPDIR = jBuildUtils::normalizeDir($APPNAME);
    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
    5555if($VERSION == 'SVN'){
     
    6161
    6262
    6363if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){
    64     if($NIGHTLY_NAME)
     64    if($IS_NIGHTLY)
    6565        $PACKAGE_NAME=$APPNAME.'-nightly';
    6666    else
    6767        $PACKAGE_NAME=$APPNAME.'-'.$VERSION;
  • build/buildmodules.php

     
    2121    "create a zip package",
    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,
    3030    ),
     31'VERSION'=> array(
     32    false,
     33    'SVN',
     34    '',
     35    ),
    3136);
    3237
    3338include(dirname(__FILE__).'/lib/jBuild.inc.php');
     
    3843
    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
    4454if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){