Changeset 418

Show
Ignore:
Timestamp:
04/16/07 14:41:21 (2 years ago)
Author:
laurentj
Message:

changed some build options
prepared beta2 release

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildapp.php

    r386 r418  
    1414    '',                                             // regexp pour la valeur ou vide=tout (seulement pour option non booleene) 
    1515    ),  
    16 'VERSION'=> array( 
    17     "Version number you want to set for this package", 
    18     '', 
    19     '', 
    20     ), 
    2116'APPNAME'=> array( 
    2217    "The name of the app you want to generate (demoxul, myapp, testapp)", 
    …… 
    3227    false, 
    3328    ), 
    34 'NIGHTLY_NAME'=>array( 
    35     "", 
    36     true, 
     29'VERSION'=> array( 
     30    false, 
     31    'SVN', 
     32    '', 
     33    ), 
     34'IS_NIGHTLY'=> array( 
     35    false, 
     36    false, 
    3737    ), 
    3838'SVN_REVISION'=> array( 
    …… 
    5353$SVN_REVISION = Subversion::revision($APPDIR); 
    5454 
    55 if($VERSION == 'SVN') 
     55if($VERSION == 'SVN'){ 
    5656    $VERSION = 'SVN-'.$SVN_REVISION; 
     57    $IS_NIGHTLY = true; 
     58}else{ 
     59    $IS_NIGHTLY = false; 
     60} 
     61 
    5762 
    5863if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){ 

  • trunk/build/buildjbt.php

    r386 r418  
    1414    '',                                             // regexp pour la valeur ou vide=tout (seulement pour option non booleene) 
    1515    ),  
    16 'VERSION'=> array( 
    17     "Version number you want to set for this package", 
    18     '', 
    19     '', 
    20     ), 
    2116'PACKAGE_TAR_GZ'=>array( 
    2217    "create a tar.gz package", 
    …… 
    2722    false, 
    2823    ), 
    29 'NIGHTLY_NAME'=>array( 
    30     "", 
    31     true, 
     24'VERSION'=> array( 
     25    false, 
     26    'SVN', 
     27    '', 
     28    ), 
     29'IS_NIGHTLY'=> array( 
     30    false, 
     31    false, 
    3232    ), 
    3333'SVN_REVISION'=> array( 
    …… 
    4242$SVN_REVISION = Subversion::revision('build/'); 
    4343 
    44 if($VERSION == 'SVN') 
     44if($VERSION == 'SVN'){ 
    4545    $VERSION = 'SVN-'.$SVN_REVISION; 
     46    $IS_NIGHTLY = true; 
     47}else{ 
     48    $IS_NIGHTLY = false; 
     49} 
    4650 
    4751Env::set('MAIN_TARGET_PATH', '_dist', true); 
    …… 
    4953 
    5054if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){ 
    51     if($NIGHTLY_NAME) 
     55    if($IS_NIGHTLY) 
    5256        $PACKAGE_NAME='jbuildtools-nightly'; 
    5357    else 

  • trunk/build/buildjelix.php

    r386 r418  
    1919    '5.0' 
    2020    ), 
    21 'LIB_VERSION'=> array( 
    22     "Version of jelix you want to declare (default : SVN)", 
     21'EDITION_NAME'=> array( 
     22    "The edition name of the version (optional)", 
    2323    '', 
    2424    ), 
    …… 
    5656    false, 
    5757    ), 
    58 'NIGHTLY_NAME'=>array( 
    59     "", 
    60     true, 
    61     ), 
    6258'ENABLE_OLD_CLASS_NAMING'=>array( 
    6359    "old module class naming (jelix <= 1.0a5) can be used", 
    …… 
    8783    false, 
    8884    ), 
     85'LIB_VERSION'=> array( 
     86    false, 
     87    '', 
     88    ), 
     89'IS_NIGHTLY'=> array( 
     90    false, 
     91    false, 
     92    ), 
     93'BUILD_FLAGS'=> array( 
     94    false, 
     95    '', 
     96    ), 
     97'EDITION_NAME_x'=> array( 
     98    false, 
     99    '', 
     100    ), 
    89101/*''=> array( 
    90102    "", 
    …… 
    103115$SVN_REVISION = Subversion::revision(); 
    104116 
    105 if($LIB_VERSION == 'SVN') 
     117if($LIB_VERSION == 'SVN'){ 
    106118    $LIB_VERSION = 'SVN-'.$SVN_REVISION; 
     119    $IS_NIGHTLY = true; 
     120}else{ 
     121    $IS_NIGHTLY = false; 
     122} 
     123 
     124 
     125 
    107126 
    108127if($PHP_VERSION_TARGET){ 
    …… 
    122141} 
    123142 
     143$BUILD_FLAGS = ''; 
     144if($ENABLE_PHP_JELIX)  $BUILD_FLAGS.='j'; 
     145if($ENABLE_PHP_JSON)  $BUILD_FLAGS.='s'; 
     146if($ENABLE_PHP_XMLRPC)  $BUILD_FLAGS.='x'; 
     147if($ENABLE_PHP_FILTER)  $BUILD_FLAGS.='f'; 
     148if($ENABLE_OLD_CLASS_NAMING)  $BUILD_FLAGS.='c'; 
     149switch($WITH_BYTECODE_CACHE){ 
     150    case 'auto': $BUILD_FLAGS.='o'; break; 
     151    case 'apc': $BUILD_FLAGS.='a'; break; 
     152    case 'eaccelerator': $BUILD_FLAGS.='e'; break; 
     153} 
     154 
     155if($EDITION_NAME ==''){ 
     156    $EDITION_NAME_x='userbuild'; 
     157    if($BUILD_FLAGS !=''){ 
     158        $EDITION_NAME_x.='-'.$BUILD_FLAGS; 
     159    } 
     160    if($PHP_VERSION_TARGET){ 
     161        $EDITION_NAME_x.='-p'.$PHP_VERSION_TARGET; 
     162    } 
     163}else{ 
     164    $EDITION_NAME_x = $EDITION_NAME; 
     165} 
     166 
     167 
     168 
    124169if(!$ENABLE_OPTIMIZED_SOURCE) 
    125170    $STRIP_COMMENT=''; 
    126171 
    127172if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){ 
    128     if($NIGHTLY_NAME) 
     173    if($IS_NIGHTLY) 
    129174        $PACKAGE_NAME='jelix-nightly'; 
    130175    else 
    131176        $PACKAGE_NAME='jelix-'.$LIB_VERSION; 
    132177 
    133     if($PHP_VERSION_TARGET) 
    134         $PACKAGE_NAME.='-php'.$PHP_VERSION_TARGET; 
    135  
    136     if($ENABLE_OPTIMIZED_SOURCE && $ENABLE_DEVELOPER) 
    137         $PACKAGE_NAME.='-optdev'; 
    138     elseif($ENABLE_OPTIMIZED_SOURCE) 
    139         $PACKAGE_NAME.='-opt'; 
    140     elseif($ENABLE_DEVELOPER) 
    141         $PACKAGE_NAME.='-dev'; 
    142  
     178    if($EDITION_NAME_x != '') 
     179        $PACKAGE_NAME.='-'.$EDITION_NAME_x; 
    143180 
    144181    $BUILD_TARGET_PATH = jBuildUtils::normalizeDir($MAIN_TARGET_PATH).$PACKAGE_NAME.'/'; 
    …… 
    169206jManifest::process('build/manifests/jelix-others.mn','.', $BUILD_TARGET_PATH , ENV::getAll()); 
    170207 
     208if($ENABLE_PHP_JELIX && ($PACKAGE_TAR_GZ || $PACKAGE_ZIP)){ 
     209   jManifest::process('build/manifests/jelix-ext-php.mn', '.', $BUILD_TARGET_PATH , ENV::getAll()); 
     210} 
    171211 
    172212file_put_contents($BUILD_TARGET_PATH.'lib/jelix/VERSION', $LIB_VERSION); 
    173213 
    174214// creation du fichier d'infos sur le build 
    175 $view = array('PHP_VERSION_TARGET', 'SVN_REVISION', 'ENABLE_PHP_FILTER', 
    176     'ENABLE_PHP_JSON', 'ENABLE_PHP_XMLRPC', 'WITH_BYTECODE_CACHE', 'ENABLE_DEVELOPER', 
     215$view = array('EDITION_NAME', 'PHP_VERSION_TARGET', 'SVN_REVISION', 'ENABLE_PHP_FILTER', 
     216    'ENABLE_PHP_JSON', 'ENABLE_PHP_XMLRPC','ENABLE_PHP_JELIX', 'WITH_BYTECODE_CACHE', 'ENABLE_DEVELOPER', 
    177217    'ENABLE_OPTIMIZED_SOURCE', 'STRIP_COMMENT', 'ENABLE_OLD_CLASS_NAMING' ); 
    178218 
    179 $infos = '; --- build date:  '.date('Y-m-d H:i')."\n; --- lib version: ".$LIB_VERSION."\n".ENV::getIniContent($view); 
     219$infos = '; --- build date:  '.date('Y-m-d H:i')."\n; --- lib version: $LIB_VERSION\n".ENV::getIniContent($view); 
    180220 
    181221file_put_contents($BUILD_TARGET_PATH.'lib/jelix/BUILD', $infos); 

  • trunk/build/buildjtpl.php

    r386 r418  
    1515    '',                                             // regexp pour la valeur ou vide=tout (seulement pour option non booleene) 
    1616    ),  
    17 'VERSION'=> array( 
    18     "Version number you want to set for this package", 
    19     '', 
    20     '', 
    21     ), 
    2217'PACKAGE_TAR_GZ'=>array( 
    2318    "create a tar.gz package", 
    …… 
    2823    false, 
    2924    ), 
    30 'NIGHTLY_NAME'=>array( 
    31     "", 
    32     true, 
     25'VERSION'=> array( 
     26    false, 
     27    'SVN', 
     28    '', 
     29    ), 
     30'IS_NIGHTLY'=> array( 
     31    false, 
     32    false, 
    3333    ), 
    3434'SVN_REVISION'=> array( 
    …… 
    4848$SVN_REVISION = Subversion::revision(); 
    4949 
    50 if($VERSION == 'SVN') 
     50if($VERSION == 'SVN'){ 
    5151    $VERSION = 'SVN-'.$SVN_REVISION; 
     52    $IS_NIGHTLY = true; 
     53}else{ 
     54    $IS_NIGHTLY = false; 
     55} 
    5256 
    5357Env::set('MAIN_TARGET_PATH', '_dist', true); 
    …… 
    5559 
    5660if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){ 
    57     if($NIGHTLY_NAME) 
     61    if($IS_NIGHTLY) 
    5862        $PACKAGE_NAME = 'jtpl-nightly'; 
    5963    else 

  • trunk/build/buildmodules.php

    r386 r418  
    4444if($PACKAGE_TAR_GZ || $PACKAGE_ZIP ){ 
    4545    $BUILD_SUBPATH = 'additionnal-modules/'; 
    46     if($NIGHTLY_NAME) 
     46    if($IS_NIGHTLY) 
    4747        $PACKAGE_NAME='additionnal-modules-nightly'; 
    4848    else 

  • trunk/build/config/jelix-dist-dev.ini

    r357 r418  
    11MAIN_TARGET_PATH = _dist 
     2EDITION_NAME = dev 
    23PHP_VERSION_TARGET = 
    3 PACKAGE_TAR_GZ = 1 
    4 PACKAGE_ZIP = 1 
    5 STRIP_COMMENT = 
    6 ENABLE_OPTIMIZED_SOURCE = 
    7 ENABLE_DEVELOPER = 1 
     4 
    85ENABLE_PHP_FILTER = 
    96ENABLE_PHP_JSON = 
    107ENABLE_PHP_XMLRPC = 
     8ENABLE_PHP_JELIX = 
     9ENABLE_DEVELOPER = 1 
     10WITH_BYTECODE_CACHE = auto 
     11 
     12STRIP_COMMENT = 
     13ENABLE_OPTIMIZED_SOURCE = 
    1114ENABLE_OLD_CLASS_NAMING = 1 
     15 
     16PACKAGE_TAR_GZ = 1 
     17PACKAGE_ZIP = 1 
     18 

  • trunk/build/config/jelix-dist-opt.ini

    r357 r418  
    11MAIN_TARGET_PATH = _dist 
     2EDITION_NAME = opt 
    23PHP_VERSION_TARGET = 
     4 
    35ENABLE_PHP_FILTER = 
    46ENABLE_PHP_JSON = 
    57ENABLE_PHP_XMLRPC = 
     8ENABLE_PHP_JELIX = 
    69ENABLE_DEVELOPER = 
    7 PACKAGE_TAR_GZ = 1 
    8 PACKAGE_ZIP = 1 
     10WITH_BYTECODE_CACHE = auto 
     11 
    912STRIP_COMMENT = 1 
    1013ENABLE_OPTIMIZED_SOURCE = 1 
    1114ENABLE_OLD_CLASS_NAMING = 1 
     15 
     16PACKAGE_TAR_GZ = 1 
     17PACKAGE_ZIP = 1 

  • trunk/build/config/jelix-test.ini

    r357 r418  
    11MAIN_TARGET_PATH = _dev 
     2EDITION_NAME =  
    23PHP_VERSION_TARGET = 
     4 
    35ENABLE_PHP_FILTER = 
    46ENABLE_PHP_JSON = 
    57ENABLE_PHP_XMLRPC = 
     8ENABLE_PHP_JELIX = 
    69ENABLE_DEVELOPER = 1 
    7 PACKAGE_TAR_GZ = 
    8 PACKAGE_ZIP = 
     10WITH_BYTECODE_CACHE = auto 
     11 
    912STRIP_COMMENT = 
    1013ENABLE_OPTIMIZED_SOURCE = 
    1114ENABLE_OLD_CLASS_NAMING = 1 
     15 
     16PACKAGE_TAR_GZ = 
     17PACKAGE_ZIP = 

  • trunk/build/lib/jBuild.inc.php

    r386 r418  
    194194 
    195195    $sws = array('-v'=>false, '-h'=>false, '-ini'=>false, '-D'=>2); 
    196     $params = array('ini'=>true); 
     196    $params = array('ini'=>false); 
    197197 
    198198    list($switches, $parameters) = jCmdUtils::getOptionsAndParams($_SERVER['argv'], $sws, $params); 
    …… 
    217217        exit(0); 
    218218    } 
     219    if(!isset($parameters['ini'])){ 
     220        throw new Exception("ini file name forgotten\n"); 
     221    } 
     222 
    219223    if(isset($switches['-ini'])){ 
    220224        echo ENV::getIniContent(); 
    221225        exit(0); 
    222226    } 
     227 
     228 
     229 
    223230} 
    224231 
    …… 
    245252}catch(Exception $e){ 
    246253    echo "\n\njBuildTools error : " , $e->getMessage(),"\n"; 
    247     echo "  options :  [-vh] [-D foo=bar]* fichier.ini 
     254    echo "  options :  [-vh] [-D foo=bar]* file.ini 
    248255      -v  : verbose mode 
    249256      -D  : declare a variable and its value 

  • trunk/build/manifests/jbuildtools.mn

    r292 r418  
    55  VERSION 
    66  LICENCE 
    7   README.TXT 
     7  README.txt 
     8  LISEZMOI.txt 
    89  CREDITS 
    910 

  • trunk/build/README.txt

    r292 r418  
    1 jBuildTools : scripts de g�ration et de distribution de sources 
     1jBuildTools: 
     2============= 
     3 
     4These are scripts  
     5 
     6- to generate final source file from source file which needs a preprocessing step. 
     7- to generate package to distribute sources 
     8- to create "makefile" like in PHP 
    29 
    310 
    411preprocess.php 
    5     pr�rocesseur de fichier texte (PHP, HTML ou autre..) 
    6     voir http://developer.jelix.org/wiki/fr/preprocesseur 
     12   This is a tool to preprocess source file. It generates source file from other source file which 
     13   contain preprocessing instruction. So you can generate source file according to parameters  
     14   (environment variables). 
     15   see http://developer.jelix.org/wiki/en/preprocessor 
     16 
    717   usage : 
    8      php preprocess.php fichier_source fichier_cible 
    9  
     18     php preprocess.php source_file target_file 
    1019 
    1120mkdist.php 
    12    g�rateur d'arborescence 
    13    voir http://developer.jelix.org/wiki/fr/mkdist 
     21   Copy some source file from a directory to another, according to a "manifest" file.  
     22   So it can be used to generate packages. 
     23   In the manifest, you write the list of files, and indicates where it should be copied, 
     24   if a preprocessor should be applied etc.. 
     25   see http://developer.jelix.org/wiki/en/mkdist 
    1426   usage : 
    15       php mkdist.php [-v] fichier_manifest.mn repertoire_source repertoire_cible 
     27      php mkdist.php [-v] manifest_file.mn source_dir target_dir 
    1628 
    1729mkmanifest.php 
    18    g�rateur de fichier manifest pour mkdist 
    19    php mkmanifest.php [-v] repertoire_source [base_chemin] fichier.mn 
     30   generate a manifest file 
     31   php mkmanifest.php [-v] source_dir [base_path] file.mn 
    2032 
     33jBuild.inc.php 
     34   library to use in a script, to create a build file (a makefile like) 

  • trunk/lib/jelix/INSTALL

    r347 r418  
    1111Jelix supports mysql 4.0+ and postgresql 8.0+. 
    1212 
    13 php.ini : magic_quotes_gpc, magic_quotes_runtime, 
    14 and session_auto_start should be off. It is recommanded to set register_globals, asp_tags and short_open_tag to off. Jelix has not been tested with safe_mode. 
     13php.ini : magic_quotes_gpc, magic_quotes_runtime, and session_auto_start should be off.  
     14It is recommanded to set register_globals, asp_tags and short_open_tag to off.  
     15 
     16Jelix has not been tested with safe_mode. 
    1517 
    1618installation 

  • trunk/Makefile

    r340 r418  
    2525        @echo "target:" 
    2626        @echo " nightlies : " 
    27         @echo "     g�rations des packages des nightly build" 
     27        @echo "     généerations des packages des nightly build" 
    2828        @echo " docs : " 
    29         @echo "     G�ration de la doc" 
    30         @echo "param�es facultatifs (valeurs actuelles) :" 
     29        @echo "     Génération de la doc" 
     30        @echo "paramètres facultatifs (valeurs actuelles) :" 
    3131        @echo "   DISTPATH : repertoire cible pour les distributions (" $(DISTPATH) ")" 
    3232        @echo "   TESTPATH : repertoire cible pour developper (" $(TESTPATH) ")" 
    3333 
    3434nightlies: 
    35         $(PHP) build/buildjelix.php -D $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/jelix-dist-dev.ini 
    36         $(PHP) build/buildjelix.php -D $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/jelix-dist-opt.ini 
    37         $(PHP) build/buildapp.php -D $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/testapp-dist.ini 
    38         $(PHP) build/buildjbt.php -D $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/jbt-dist.ini 
    39         $(PHP) build/buildjtpl.php -D $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/jtpl-dist.ini 
    40         $(PHP) build/buildapp.php -D $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/myapp-dist.ini 
    41         $(PHP) build/buildmodules.php -D $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/modules-dist.ini 
     35        $(PHP) build/buildjelix.php -D $(DISTPATHSWITCH) build/config/jelix-dist-dev.ini 
     36        $(PHP) build/buildjelix.php -D $(DISTPATHSWITCH) build/config/jelix-dist-opt.ini 
     37        $(PHP) build/buildjelix.php -D $(DISTPATHSWITCH) build/config/jelix-dist-gold.ini 
     38        $(PHP) build/buildapp.php -D $(DISTPATHSWITCH) build/config/testapp-dist.ini 
     39        $(PHP) build/buildjbt.php -D $(DISTPATHSWITCH) build/config/jbt-dist.ini 
     40        $(PHP) build/buildjtpl.php -D $(DISTPATHSWITCH) build/config/jtpl-dist.ini 
     41        $(PHP) build/buildapp.php -D $(DISTPATHSWITCH) build/config/myapp-dist.ini 
     42        $(PHP) build/buildmodules.php -D $(DISTPATHSWITCH) build/config/modules-dist.ini 
    4243 
    4344 
Download in other formats: Unified Diff Zip Archive