Changeset 294

Show
Ignore:
Timestamp:
11/05/06 14:30:42 (2 years ago)
Author:
laurentj
Message:

fix bug dans le makefile pour les nightlys et la génération de la doc

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Makefile

    r293 r294  
    22SHELL=/bin/sh 
    33PHP=/usr/bin/php 
    4 PHPDOC=../../phpdoc/phpdoc 
     4PHPDOC=../../phpdoc/ 
    55 
    66CURRENT_PATH = $(shell pwd) 
    77 
    88ifdef DISTPATH 
    9 DISTPATHSWITCH="-D MAIN_TARGET_PATH=$(DISTPATH)" 
     9DISTPATHSWITCH="MAIN_TARGET_PATH=$(DISTPATH)" 
    1010else 
    1111DISTPATH=_dist 
    12 DISTPATHSWITCH= 
     12DISTPATHSWITCH="MAIN_TARGET_PATH=_dist" 
    1313endif 
    1414ifdef TESTPATH 
    15 TESTPATHSWITCH="-D MAIN_TARGET_PATH=$(TESTPATH)" 
     15TESTPATHSWITCH="MAIN_TARGET_PATH=$(TESTPATH)" 
    1616else 
    1717TESTPATH=_dev 
    18 TESTPATHSWITCH= 
     18TESTPATHSWITCH="MAIN_TARGET_PATH=_dev" 
    1919endif 
    2020ifndef DOCSPATH 
    …… 
    4343 
    4444jelix-dist: 
    45         $(PHP) build/buildjelix.php $(DISTPATHSWITCH) build/config/jelix-dist-dev.ini 
     45        $(PHP) build/buildjelix.php -D $(DISTPATHSWITCH) build/config/jelix-dist-dev.ini 
    4646 
    4747jelix-dist-opt: 
    48         $(PHP) build/buildjelix.php $(DISTPATHSWITCH) build/config/jelix-dist-opt.ini 
     48        $(PHP) build/buildjelix.php -D $(DISTPATHSWITCH) build/config/jelix-dist-opt.ini 
    4949 
    5050jelix-test: 
    51         $(PHP) build/buildjelix.php $(TESTPATHSWITCH) build/config/jelix-test.ini 
     51        $(PHP) build/buildjelix.php -D $(TESTPATHSWITCH) build/config/jelix-test.ini 
    5252 
    5353testapp-dist: 
    54         $(PHP) build/buildapp.php $(DISTPATHSWITCH) build/config/testapp-dist.ini 
     54        $(PHP) build/buildapp.php -D $(DISTPATHSWITCH) build/config/testapp-dist.ini 
    5555 
    5656testapp-test: 
    57         $(PHP) build/buildapp.php $(TESTPATHSWITCH) build/config/testapp-test.ini 
     57        $(PHP) build/buildapp.php -D $(TESTPATHSWITCH) build/config/testapp-test.ini 
    5858 
    5959myapp-dist: 
    60         $(PHP) build/buildapp.php $(DISTPATHSWITCH) build/config/myapp-dist.ini 
     60        $(PHP) build/buildapp.php -D $(DISTPATHSWITCH) build/config/myapp-dist.ini 
    6161 
    6262myapp-test: 
    63         $(PHP) build/buildapp.php $(TESTPATHSWITCH) build/config/myapp-test.ini 
     63        $(PHP) build/buildapp.php -D $(TESTPATHSWITCH) build/config/myapp-test.ini 
    6464 
    6565jtpl-dist: 
    66         $(PHP) build/buildjtpl.php $(DISTPATHSWITCH) build/config/jtpl-dist.ini 
     66        $(PHP) build/buildjtpl.php -D $(DISTPATHSWITCH) build/config/jtpl-dist.ini 
    6767 
    6868jtpl-test: 
    69         $(PHP) build/buildjtpl.php $(TESTPATHSWITCH) build/config/jtpl-test.ini 
     69        $(PHP) build/buildjtpl.php -D $(TESTPATHSWITCH) build/config/jtpl-test.ini 
    7070 
    7171jbt-dist: 
    72         $(PHP) build/buildjbt.php $(DISTPATHSWITCH) build/config/jbt-dist.ini 
     72        $(PHP) build/buildjbt.php -D $(DISTPATHSWITCH) build/config/jbt-dist.ini 
    7373 
    7474jbt-test: 
    75         $(PHP) build/buildjbt.php $(TESTPATHSWITCH) build/config/jbt-test.ini 
     75        $(PHP) build/buildjbt.php -D $(TESTPATHSWITCH) build/config/jbt-test.ini 
    7676 
    7777modules-dist: 
    78         $(PHP) build/buildmodules.php $(DISTPATHSWITCH) build/config/modules-dist.ini 
     78        $(PHP) build/buildmodules.php -D $(DISTPATHSWITCH) build/config/modules-dist.ini 
    7979 
    8080modules-test: 
    81         $(PHP) build/buildmodules.php $(TESTPATHSWITCH) build/config/modules-test.ini 
     81        $(PHP) build/buildmodules.php -D $(TESTPATHSWITCH) build/config/modules-test.ini 
    8282 
    8383nightlies: 
    84         $(PHP) build/buildjelix.php $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/jelix-dist-dev.ini 
    85         $(PHP) build/buildjelix.php $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/jelix-dist-opt.ini 
    86         $(PHP) build/buildapp.php $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/testapp-dist.ini 
    87         $(PHP) build/buildjbt.php $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/jbt-dist.ini 
    88         $(PHP) build/buildjtpl.php $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/jtpl-dist.ini 
    89         $(PHP) build/buildapp.php $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/myapp-dist.ini 
     84        $(PHP) build/buildjelix.php -D $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/jelix-dist-dev.ini 
     85        $(PHP) build/buildapp.php -D $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/testapp-dist.ini 
     86        $(PHP) build/buildjbt.php -D $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/jbt-dist.ini 
     87        $(PHP) build/buildjtpl.php -D $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/jtpl-dist.ini 
     88        $(PHP) build/buildapp.php -D $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/myapp-dist.ini 
    9089 
    9190docs: jelix-test 
    92         $(PHPDOC)  -d $(TESTPATH)/lib/jelix/ -t $(DOCSPATH) \ 
     91        cp -R -f build/phpdoc/Converters/HTML/frames $(PHPDOC)phpDocumentor/Converters/HTML/ 
     92        $(PHPDOC)phpdoc  -d $(TESTPATH)/lib/jelix/ -t $(DOCSPATH) \ 
    9393        -o "HTML:frames:DOM/jelix" -s on -ct "contributor,licence" -i *.ini.php \ 
    9494        -ti "Jelix API Reference" -ric "README,INSTALL,CHANGELOG,CREDITS,LICENCE,VERSION" 
Download in other formats: Unified Diff Zip Archive