Changeset 340

Show
Ignore:
Timestamp:
12/24/06 10:58:21 (2 years ago)
Author:
laurentj
Message:

-deplacement du plugin auth dans jelix-plugins
- fix bug dans jtpl : erreur de parametre manquant sur les plugin de block

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r339 r340  
    228228  ui.UTF-8.properties 
    229229  auth.UTF-8.properties 
    230 cd lib/jelix-modules/jelix/plugins/auth 
    231 ! auth.plugin.php 
    232   plugin.xml 
    233   auth.plugin.ini.php.dist 
    234230cd lib/jelix-modules/jelix/templates 
    235231  404.xul.tpl 
    …… 
    274270! autolocale.plugin.php 
    275271  plugin.xml 
     272cd lib/jelix-plugins/auth 
     273! auth.plugin.php 
     274  plugin.xml 
     275  auth.plugin.ini.php.dist 
    276276 
    277277 

  • trunk/demoxul/var/config/defaultconfig.ini.php.dist

    r339 r340  
    1313trustedModules = 
    1414 
    15 pluginsPath = lib:jelix-plugins/,app:plugins/,lib:jelix-modules/jelix/plugins/ 
     15pluginsPath = lib:jelix-plugins/,app:plugins/ 
    1616modulesPath = lib:jelix-modules/,app:modules/ 
    1717tplpluginsPath = lib:jelix/tpl/plugins/ 

  • trunk/lib/jelix/tpl/jTplCompiler.class.php

    r335 r340  
    473473 
    474474        if( $splitArgIntoArray){ 
    475             $results[]=$result; 
     475            if($result !='') $results[]=$result; 
    476476            return $results; 
    477477        }else{ 

  • trunk/Makefile

    r327 r340  
    2424default: 
    2525        @echo "target:" 
    26         @echo " tests editions : " 
    27         @echo "     jelix-test, jtpl-test, testapp-test, myapp-test, all-test" 
    28         @echo " developers editions : (generate package for users)" 
    29         @echo "     jelix-dist, testapp-dist, myapp-dist, jtpl-dist, jbt-dist, docs-dist, all-dist" 
    30         @echo " productions serveur editions : (generate optimized version with package)" 
    31         @echo "     jelix-dist-opt all-dist-opt" 
    32         @echo " G�ration de la doc: " 
    33         @echo "     docs" 
     26        @echo " nightlies : " 
     27        @echo "     g�rations des packages des nightly build" 
     28        @echo " docs : " 
     29        @echo "     G�ration de la doc" 
    3430        @echo "param�es facultatifs (valeurs actuelles) :" 
    3531        @echo "   DISTPATH : repertoire cible pour les distributions (" $(DISTPATH) ")" 
    3632        @echo "   TESTPATH : repertoire cible pour developper (" $(TESTPATH) ")" 
    37  
    38 all-dist: jelix-dist testapp-dist myapp-dist jtpl-dist jbt-dist 
    39  
    40 all-dist-opt: jelix-dist-opt 
    41  
    42 all-test: jelix-test  myapp-test testapp-test jtpl-test 
    43  
    44 jelix-dist: 
    45         $(PHP) build/buildjelix.php -D $(DISTPATHSWITCH) build/config/jelix-dist-dev.ini 
    46  
    47 jelix-dist-opt: 
    48         $(PHP) build/buildjelix.php -D $(DISTPATHSWITCH) build/config/jelix-dist-opt.ini 
    49  
    50 jelix-test: 
    51         $(PHP) build/buildjelix.php -D $(TESTPATHSWITCH) build/config/jelix-test.ini 
    52  
    53 testapp-dist: 
    54         $(PHP) build/buildapp.php -D $(DISTPATHSWITCH) build/config/testapp-dist.ini 
    55  
    56 testapp-test: 
    57         $(PHP) build/buildapp.php -D $(TESTPATHSWITCH) build/config/testapp-test.ini 
    58  
    59 myapp-dist: 
    60         $(PHP) build/buildapp.php -D $(DISTPATHSWITCH) build/config/myapp-dist.ini 
    61  
    62 myapp-test: 
    63         $(PHP) build/buildapp.php -D $(TESTPATHSWITCH) build/config/myapp-test.ini 
    64  
    65 jtpl-dist: 
    66         $(PHP) build/buildjtpl.php -D $(DISTPATHSWITCH) build/config/jtpl-dist.ini 
    67  
    68 jtpl-test: 
    69         $(PHP) build/buildjtpl.php -D $(TESTPATHSWITCH) build/config/jtpl-test.ini 
    70  
    71 jbt-dist: 
    72         $(PHP) build/buildjbt.php -D $(DISTPATHSWITCH) build/config/jbt-dist.ini 
    73  
    74 jbt-test: 
    75         $(PHP) build/buildjbt.php -D $(TESTPATHSWITCH) build/config/jbt-test.ini 
    76  
    77 modules-dist: 
    78         $(PHP) build/buildmodules.php -D $(DISTPATHSWITCH) build/config/modules-dist.ini 
    79  
    80 modules-test: 
    81         $(PHP) build/buildmodules.php -D $(TESTPATHSWITCH) build/config/modules-test.ini 
    8233 
    8334nightlies: 
    …… 
    9142 
    9243 
    93 docs: jelix-test 
     44docs:  
     45        $(PHP) build/buildjelix.php -D $(TESTPATHSWITCH) build/config/jelix-test.ini 
    9446        cp -R -f build/phpdoc/Converters/HTML/frames $(PHPDOC)phpDocumentor/Converters/HTML/ 
    9547        $(PHPDOC)phpdoc  -d $(TESTPATH)/lib/jelix/ -t $(DOCSPATH) \ 
Download in other formats: Unified Diff Zip Archive