Changeset 826 for trunk/build/buildapp.php

Show
Ignore:
Timestamp:
03/20/08 18:37:06 (10 months ago)
Author:
laurentj
Message:

BUILD: changed version number in the trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/build/buildapp.php

    r816 r826  
    5353$SVN_REVISION = Subversion::revision($APPDIR); 
    5454 
    55 if($VERSION == 'SVN'){ 
    56     $VERSION = 'SVN-'.$SVN_REVISION; 
    57     $IS_NIGHTLY = true; 
    58 }else{ 
    59     $IS_NIGHTLY = false; 
     55$IS_NIGHTLY = (strpos($VERSION,'SVN') !== false); 
     56 
     57if($IS_NIGHTLY){ 
     58    $PACKAGE_NAME=$APPNAME.'-'.str_replace('SVN', '', $VERSION); 
     59    if(substr($PACKAGE_NAME,-1,1) == '.') 
     60      $PACKAGE_NAME = substr($PACKAGE_NAME,0,-1); 
     61    $VERSION = str_replace('SVN', $SVN_REVISION, $VERSION); 
     62
     63else { 
     64    $PACKAGE_NAME=$APPNAME.'-'.$VERSION; 
    6065} 
    6166 
    6267 
    6368if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){ 
    64     if($IS_NIGHTLY) 
    65         $PACKAGE_NAME=$APPNAME.'-nightly'; 
    66     else 
    67         $PACKAGE_NAME=$APPNAME.'-'.$VERSION; 
    6869    //$MAIN_TARGET_PATH = jBuildUtils::normalizeDir($MAIN_TARGET_PATH).$PACKAGE_NAME; 
    6970} 
  • trunk/build/buildapp.php

    r816 r826  
    5353$SVN_REVISION = Subversion::revision($APPDIR); 
    5454 
    55 if($VERSION == 'SVN'){ 
    56     $VERSION = 'SVN-'.$SVN_REVISION; 
    57     $IS_NIGHTLY = true; 
    58 }else{ 
    59     $IS_NIGHTLY = false; 
     55$IS_NIGHTLY = (strpos($VERSION,'SVN') !== false); 
     56 
     57if($IS_NIGHTLY){ 
     58    $PACKAGE_NAME=$APPNAME.'-'.str_replace('SVN', '', $VERSION); 
     59    if(substr($PACKAGE_NAME,-1,1) == '.') 
     60      $PACKAGE_NAME = substr($PACKAGE_NAME,0,-1); 
     61    $VERSION = str_replace('SVN', $SVN_REVISION, $VERSION); 
     62
     63else { 
     64    $PACKAGE_NAME=$APPNAME.'-'.$VERSION; 
    6065} 
    6166 
    6267 
    6368if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){ 
    64     if($IS_NIGHTLY) 
    65         $PACKAGE_NAME=$APPNAME.'-nightly'; 
    66     else 
    67         $PACKAGE_NAME=$APPNAME.'-'.$VERSION; 
    6869    //$MAIN_TARGET_PATH = jBuildUtils::normalizeDir($MAIN_TARGET_PATH).$PACKAGE_NAME; 
    6970} 
  • trunk/build/buildapp.php

    r816 r826  
    5353$SVN_REVISION = Subversion::revision($APPDIR); 
    5454 
    55 if($VERSION == 'SVN'){ 
    56     $VERSION = 'SVN-'.$SVN_REVISION; 
    57     $IS_NIGHTLY = true; 
    58 }else{ 
    59     $IS_NIGHTLY = false; 
     55$IS_NIGHTLY = (strpos($VERSION,'SVN') !== false); 
     56 
     57if($IS_NIGHTLY){ 
     58    $PACKAGE_NAME=$APPNAME.'-'.str_replace('SVN', '', $VERSION); 
     59    if(substr($PACKAGE_NAME,-1,1) == '.') 
     60      $PACKAGE_NAME = substr($PACKAGE_NAME,0,-1); 
     61    $VERSION = str_replace('SVN', $SVN_REVISION, $VERSION); 
     62
     63else { 
     64    $PACKAGE_NAME=$APPNAME.'-'.$VERSION; 
    6065} 
    6166 
    6267 
    6368if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){ 
    64     if($IS_NIGHTLY) 
    65         $PACKAGE_NAME=$APPNAME.'-nightly'; 
    66     else 
    67         $PACKAGE_NAME=$APPNAME.'-'.$VERSION; 
    6869    //$MAIN_TARGET_PATH = jBuildUtils::normalizeDir($MAIN_TARGET_PATH).$PACKAGE_NAME; 
    6970} 
Download in other formats: Unified Diff Zip Archive