Changeset 826
- Timestamp:
- 03/20/08 18:37:06 (9 months ago)
- Files:
-
- trunk/build/buildapp.php (modified) (1 diff)
- trunk/build/buildapp.php (modified) (1 diff)
- trunk/build/buildapp.php (modified) (1 diff)
- trunk/build/buildjelix.php (modified) (2 diffs)
- trunk/build/buildjelix.php (modified) (2 diffs)
- trunk/build/buildjelix.php (modified) (2 diffs)
- trunk/lib/jelix/VERSION (modified) (1 diff)
- trunk/lib/jelix/VERSION (modified) (1 diff)
- trunk/lib/jelix/VERSION (modified) (1 diff)
- trunk/Makefile (modified) (1 diff)
- trunk/Makefile (modified) (1 diff)
- trunk/Makefile (modified) (1 diff)
- trunk/testapp/VERSION (modified) (1 diff)
- trunk/testapp/VERSION (modified) (1 diff)
- trunk/testapp/VERSION (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/build/buildapp.php
r816 r826 53 53 $SVN_REVISION = Subversion::revision($APPDIR); 54 54 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 57 if($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 } 63 else { 64 $PACKAGE_NAME=$APPNAME.'-'.$VERSION; 60 65 } 61 66 62 67 63 68 if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){ 64 if($IS_NIGHTLY)65 $PACKAGE_NAME=$APPNAME.'-nightly';66 else67 $PACKAGE_NAME=$APPNAME.'-'.$VERSION;68 69 //$MAIN_TARGET_PATH = jBuildUtils::normalizeDir($MAIN_TARGET_PATH).$PACKAGE_NAME; 69 70 } trunk/build/buildapp.php
r816 r826 53 53 $SVN_REVISION = Subversion::revision($APPDIR); 54 54 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 57 if($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 } 63 else { 64 $PACKAGE_NAME=$APPNAME.'-'.$VERSION; 60 65 } 61 66 62 67 63 68 if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){ 64 if($IS_NIGHTLY)65 $PACKAGE_NAME=$APPNAME.'-nightly';66 else67 $PACKAGE_NAME=$APPNAME.'-'.$VERSION;68 69 //$MAIN_TARGET_PATH = jBuildUtils::normalizeDir($MAIN_TARGET_PATH).$PACKAGE_NAME; 69 70 } trunk/build/buildapp.php
r816 r826 53 53 $SVN_REVISION = Subversion::revision($APPDIR); 54 54 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 57 if($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 } 63 else { 64 $PACKAGE_NAME=$APPNAME.'-'.$VERSION; 60 65 } 61 66 62 67 63 68 if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){ 64 if($IS_NIGHTLY)65 $PACKAGE_NAME=$APPNAME.'-nightly';66 else67 $PACKAGE_NAME=$APPNAME.'-'.$VERSION;68 69 //$MAIN_TARGET_PATH = jBuildUtils::normalizeDir($MAIN_TARGET_PATH).$PACKAGE_NAME; 69 70 } trunk/build/buildjelix.php
r730 r826 122 122 $SVN_REVISION = Subversion::revision(); 123 123 124 if($LIB_VERSION == 'SVN'){ 125 $LIB_VERSION = 'SVN-'.$SVN_REVISION; 126 $IS_NIGHTLY = true; 127 }else{ 128 $IS_NIGHTLY = false; 129 } 130 131 132 124 $IS_NIGHTLY = (strpos($LIB_VERSION,'SVN') !== false); 125 126 if($IS_NIGHTLY){ 127 $PACKAGE_NAME='jelix-'.str_replace('SVN', '', $LIB_VERSION); 128 if(substr($PACKAGE_NAME,-1,1) == '.') 129 $PACKAGE_NAME = substr($PACKAGE_NAME,0,-1); 130 $LIB_VERSION = str_replace('SVN', $SVN_REVISION, $LIB_VERSION); 131 } 132 else { 133 $PACKAGE_NAME='jelix-'.$LIB_VERSION; 134 } 133 135 134 136 if($PHP_VERSION_TARGET){ … … 178 180 179 181 if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){ 180 if($IS_NIGHTLY)181 $PACKAGE_NAME='jelix-nightly';182 else183 $PACKAGE_NAME='jelix-'.$LIB_VERSION;184 182 185 183 if($EDITION_NAME_x != '') trunk/build/buildjelix.php
r730 r826 122 122 $SVN_REVISION = Subversion::revision(); 123 123 124 if($LIB_VERSION == 'SVN'){ 125 $LIB_VERSION = 'SVN-'.$SVN_REVISION; 126 $IS_NIGHTLY = true; 127 }else{ 128 $IS_NIGHTLY = false; 129 } 130 131 132 124 $IS_NIGHTLY = (strpos($LIB_VERSION,'SVN') !== false); 125 126 if($IS_NIGHTLY){ 127 $PACKAGE_NAME='jelix-'.str_replace('SVN', '', $LIB_VERSION); 128 if(substr($PACKAGE_NAME,-1,1) == '.') 129 $PACKAGE_NAME = substr($PACKAGE_NAME,0,-1); 130 $LIB_VERSION = str_replace('SVN', $SVN_REVISION, $LIB_VERSION); 131 } 132 else { 133 $PACKAGE_NAME='jelix-'.$LIB_VERSION; 134 } 133 135 134 136 if($PHP_VERSION_TARGET){ … … 178 180 179 181 if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){ 180 if($IS_NIGHTLY)181 $PACKAGE_NAME='jelix-nightly';182 else183 $PACKAGE_NAME='jelix-'.$LIB_VERSION;184 182 185 183 if($EDITION_NAME_x != '') trunk/build/buildjelix.php
r730 r826 122 122 $SVN_REVISION = Subversion::revision(); 123 123 124 if($LIB_VERSION == 'SVN'){ 125 $LIB_VERSION = 'SVN-'.$SVN_REVISION; 126 $IS_NIGHTLY = true; 127 }else{ 128 $IS_NIGHTLY = false; 129 } 130 131 132 124 $IS_NIGHTLY = (strpos($LIB_VERSION,'SVN') !== false); 125 126 if($IS_NIGHTLY){ 127 $PACKAGE_NAME='jelix-'.str_replace('SVN', '', $LIB_VERSION); 128 if(substr($PACKAGE_NAME,-1,1) == '.') 129 $PACKAGE_NAME = substr($PACKAGE_NAME,0,-1); 130 $LIB_VERSION = str_replace('SVN', $SVN_REVISION, $LIB_VERSION); 131 } 132 else { 133 $PACKAGE_NAME='jelix-'.$LIB_VERSION; 134 } 133 135 134 136 if($PHP_VERSION_TARGET){ … … 178 180 179 181 if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){ 180 if($IS_NIGHTLY)181 $PACKAGE_NAME='jelix-nightly';182 else183 $PACKAGE_NAME='jelix-'.$LIB_VERSION;184 182 185 183 if($EDITION_NAME_x != '') trunk/lib/jelix/VERSION
r85 r826 1 SVN1 1.1a1pre.SVN trunk/lib/jelix/VERSION
r85 r826 1 SVN1 1.1a1pre.SVN trunk/lib/jelix/VERSION
r85 r826 1 SVN1 1.1a1pre.SVN trunk/Makefile
r783 r826 42 42 $(PHP) build/buildjbt.php -D $(DISTPATHSWITCH) build/config/jbt-dist.ini 43 43 $(PHP) build/buildjtpl.php -D $(DISTPATHSWITCH) build/config/jtpl-dist.ini 44 $(PHP) build/buildapp.php -D $(DISTPATHSWITCH) build/config/myapp-dist.ini45 44 $(PHP) build/buildmodules.php -D $(DISTPATHSWITCH) build/config/modules-dist.ini 46 45 $(PHP) build/buildfonts.php -D $(DISTPATHSWITCH) build/config/jelix-fonts-dist.ini trunk/Makefile
r783 r826 42 42 $(PHP) build/buildjbt.php -D $(DISTPATHSWITCH) build/config/jbt-dist.ini 43 43 $(PHP) build/buildjtpl.php -D $(DISTPATHSWITCH) build/config/jtpl-dist.ini 44 $(PHP) build/buildapp.php -D $(DISTPATHSWITCH) build/config/myapp-dist.ini45 44 $(PHP) build/buildmodules.php -D $(DISTPATHSWITCH) build/config/modules-dist.ini 46 45 $(PHP) build/buildfonts.php -D $(DISTPATHSWITCH) build/config/jelix-fonts-dist.ini trunk/Makefile
r783 r826 42 42 $(PHP) build/buildjbt.php -D $(DISTPATHSWITCH) build/config/jbt-dist.ini 43 43 $(PHP) build/buildjtpl.php -D $(DISTPATHSWITCH) build/config/jtpl-dist.ini 44 $(PHP) build/buildapp.php -D $(DISTPATHSWITCH) build/config/myapp-dist.ini45 44 $(PHP) build/buildmodules.php -D $(DISTPATHSWITCH) build/config/modules-dist.ini 46 45 $(PHP) build/buildfonts.php -D $(DISTPATHSWITCH) build/config/jelix-fonts-dist.ini trunk/testapp/VERSION
r292 r826 1 SVN1 1.1a1pre.SVN trunk/testapp/VERSION
r292 r826 1 SVN1 1.1a1pre.SVN trunk/testapp/VERSION
r292 r826 1 SVN1 1.1a1pre.SVN
