Changeset 303

Show
Ignore:
Timestamp:
11/16/06 09:34:32 (2 years ago)
Author:
laurentj
Message:

-fix regression build jelix : la lib json n'était plus inclue
-ajout d'un build pour les modules additionnels
-demoxul : ajout de htaccess et suppression de login.js

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildjelix.php

    r300 r303  
    110110    jManifest::process('build/manifests/jelix-dev.mn', '.', $BUILD_TARGET_PATH , $GLOBALS); 
    111111} 
    112 if($ENABLE_PHP_JSON){ 
     112if(!$ENABLE_PHP_JSON){ 
    113113    jManifest::process('build/manifests/lib-json.mn', '.', $BUILD_TARGET_PATH , $GLOBALS); 
    114114} 

  • trunk/build/config/modules-dist.ini

    r292 r303  
    1 MAIN_TARGET_PATH = _dev 
     1MAIN_TARGET_PATH = _dist 
    22PACKAGE_TAR_GZ = 1 
    33PACKAGE_ZIP = 1 

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

    r292 r303  
    1 MAIN_TARGET_PATH = 
     1MAIN_TARGET_PATH = _dev 
    22PACKAGE_TAR_GZ = 
    33PACKAGE_ZIP = 

  • trunk/build/manifests/demoxul.mn

    r297 r303  
    11cd demoxul 
    22  project.xml 
     3  VERSION 
    34  application.init.php 
     5  .htaccess 
    46cd demoxul/www 
     7  .htaccess 
    58  rdf.php 
    69  jsonrpc.php 
    …… 
    912cd demoxul/www/xulapp 
    1013  main.js 
    11   login.js 
    1214cd demoxul/var/config 
    1315  defaultconfig.ini.php.dist 
    …… 
    2628! config.ini.php 
    2729 
     30cd demoxul/var/log 
     31cd demoxul/var/overloads 
     32cd demoxul/var/themes 
     33cd demoxul/var/themes/default 
     34cd demoxul/modules 
     35cd demoxul/plugins 
     36cd demoxul/responses 
     37 
    2838cd temp/demoxul 

  • trunk/build/manifests/jelix-modules.mn

    r259 r303  
    2323cd jxxulapp/install/www/xulapp 
    2424  main.js 
    25   login.js 

  • trunk/Makefile

    r297 r303  
    8888        $(PHP) build/buildjtpl.php -D $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/jtpl-dist.ini 
    8989        $(PHP) build/buildapp.php -D $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/myapp-dist.ini 
     90        $(PHP) build/buildmodules.php -D $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/modules-dist.ini 
     91 
    9092 
    9193docs: jelix-test 
Download in other formats: Unified Diff Zip Archive