Changeset 297

Timestamp:

11/07/06 23:49:22 (2 years ago)

Author:

laurentj

Message:

Travail sur le build et les jbuildtools
- mise en place de la generation d'une version optimisee de Jelix
- paramètres de build STRIP_COMMENT, ENABLE_OPTIMIZE, ENABLE_PHP_JSON et ENABLE_PHP_FILTER pris en compte
- jManifest : capable de supprimer les commentaires d'un fichier php
- preprocesseur, #ifdef : test vrai si la variable existe mais est vide
- jJsonRpc : peut utiliser les fonctions json de php 5.2

Files:

• trunk/build/buildjelix.php (modified) (1 diff)
• trunk/build/lib/jManifest.class.php (modified) (4 diffs)
• trunk/build/lib/preprocessor.lib.php (modified) (6 diffs)
• trunk/build/manifests/demoxul.mn (modified) (1 diff)
• trunk/build/manifests/jelix-lib.mn (modified) (12 diffs)
• trunk/build/manifests/jelix-no-opt.mn (added)
• trunk/build/manifests/lib-json.mn (added)
• trunk/build/tests/ppdatas/result_include1.txt (modified) (1 diff)
• trunk/build/tests/testpreprocess.php (modified) (4 diffs)
• trunk/lib/jelix/init.php (modified) (3 diffs)
• trunk/lib/jelix/utils/jFilter.class.php (modified) (8 diffs)
• trunk/lib/jelix/utils/jJsonRpc.class.php (modified) (5 diffs)
• trunk/Makefile (modified) (1 diff)

trunk/build/buildjelix.php

@@ -100 +100 @@
-
-//... execution des manifests
-
+
+
+
+
-if($ENABLE_DEVELOPER){
-    jManifest::process('build/manifests/jelix-dev.mn', '.', $BUILD_TARGET_PATH , $GLOBALS);
+}
+if($ENABLE_PHP_JSON){
+    jManifest::process('build/manifests/lib-json.mn', '.', $BUILD_TARGET_PATH , $GLOBALS);
-}
-jManifest::process('build/manifests/jelix-others.mn','.', $BUILD_TARGET_PATH , $GLOBALS);

trunk/build/lib/jManifest.class.php

@@ -19 +19 @@
-     * @param string $distpath directory were files are copied
-     */
-
+stripcomment=false, $
-
-        $sourcedir = jBuildUtils::normalizeDir($sourcepath);
@@ -32 +32 @@
-        foreach($script as $nbline=>$line){
-            $nbline++;
-!^(cd|sd|dd|\*)?\s+([a-zA-Z0-9\/.\-_]+)\s*(?:\(([a-zA-Z0-9\/.\-_]*)\))?\s*$!
+;^(cd|sd|dd|\*|!|\*!)?\s+([a-zA-Z0-9\/.\-_]+)\s*(?:\(([a-zA-Z0-9\/.\-_]*)\))?\s*$;
-                if($m[1] == 'dd'){
-                    $currentdestdir = jBuildUtils::normalizeDir($m[2]);
@@ -50 +50 @@
-
-                    $destfile = $distdir.$currentdestdir.$m[3];
+                    $sourcefile = $sourcedir.$currentsrcdir.$m[2];
-
-
+ || $m[1]=='*!'
-                        if($verbose){
-".$sourcedir.$currentsrcdir.$m[2]."\tto\t".$destfile."
+$sourcefile \tto\t$destfile 
-                        }
-                        $preproc->setVars($preprocvars);
-                        try{
-dir.$currentsrcdir.$m[2]
+file
-                        }catch(Exception $e){
-                            throw new Exception ( "$ficlist : line $nbline, cannot process file ".$m[2]." (", $e ,")\n");
-                        }
+                        if($m[1]=='*' && $stripcomment && preg_match("/\.php$/",$destfile)){
+                            $contents = self::stripPhpComments($contents);
+                        }
-                        file_put_contents($destfile,$contents);
+
+                    }elseif($m[1]!='!'&& $stripcomment && preg_match("/\.php$/",$destfile)){
+                        if($verbose)
+                            echo "strip comment in  $sourcefile\tto\t".$destfile."\n";
+                        $src = file_get_contents($sourcefile);
+                        file_put_contents($destfile,self::stripPhpComments($src));
+
-                    }else{
-options['verbose']
+verbose
-                            echo "copy  ".$sourcedir.$currentsrcdir.$m[2]."\tto\t".$destfile."\n";
-
-dir.$currentsrcdir.$m[2]
+file
-                            throw new Exception ( "$ficlist : cannot copy file ".$m[2].", line $nbline \n");
-                        }
@@ -78 +89 @@
-        }
-    }
+
+    static protected function stripPhpComments($content){
+
+        $tokens = token_get_all($content);
+        $result = '';
+        $firstcomment= true;
+        foreach ($tokens as $token) {
+            if (is_string($token)) {
+                $result.=$token;
+            } else {
+                switch ($token[0]) {
+                    case T_COMMENT:
+                        break;
+                    case T_DOC_COMMENT:
+                        // on garde le premier commentaire documentaire
+                        if($firstcomment){
+                            $result.=$token[1];
+                            $firstcomment = false;
+                        }
+                        break;
+                    default:
+                        $result.=$token[1];
+                        break;
+                }
+            }
+        }
+        return $result;
+
+    }
-}
-?>

trunk/build/lib/preprocessor.lib.php

@@ -103 +103 @@
-                            array_push($this->_blockstack, self::BLOCK_IF_NO);
-                        }else{
-
+ && $this->_variables[$m[2]] !==''
-                                array_push($this->_blockstack, self::BLOCK_IF_YES);
-                            }else{
@@ -113 +113 @@
-                    case 'define': // define avec un seul argument.
-                        if($isOpen ){
-''
+true
-                        }
-                        $source[$nb]=false;
@@ -127 +127 @@
-                            array_push($this->_blockstack, self::BLOCK_IF_NO);
-                        }else{
-
+ && $this->_variables[$m[2]] !==''
-                                array_push($this->_blockstack, self::BLOCK_IF_NO);
-                            }else{
@@ -145 +145 @@
-                            array_push($this->_blockstack, (self::BLOCK_IF_NO + self::BLOCK_YES_PREVIOUS));
-                        }else{
-
+ && $this->_variables[$m[2]] !==''
-                                array_push($this->_blockstack, self::BLOCK_IF_YES);
-                            }else{
@@ -167 +167 @@
-            }elseif(preg_match('/^\#(expand)\s(.*)$/m',$line,$m)){
-                if($isOpen){
-
+&&$this->_variables["\\1"]!==\'\'
-                }else{
-                    $source[$nb]=false;
@@ -217 +217 @@
-                    }
-                    if($m[1] == 'php'){
-(?:.|\n)*)\?\>\s*$/
+.*)\?\>\s*$/s
-                            $source[$nb] = $ms[1];
-                        }

trunk/build/manifests/demoxul.mn

@@ -14 +14 @@
-  dbprofils.ini.php.dist
-cd demoxul/var/config/index
- 
+!
-  config.ini.php
-cd demoxul/var/config/jsonrpc
- 
- 
+!
+!
-cd demoxul/var/config/rdf
- 
- 
+!
+!
-cd demoxul/var/config/xmlrpc
- 
- 
+!
+!
-
-cd temp/demoxul

trunk/build/manifests/jelix-lib.mn

@@ -29 +29 @@
-
-cd lib/jelix/core
-
-
+
-  jConfigCompiler.class.php
-  jContext.class.php
-  jController.class.php
-  jCoordinator.class.php
-  jErrorHandler.lib.php
-  jException.lib.php
-  jIncluder.class.php
-  jIPlugin.iface.php
-  jLocale.class.php
-  jRequest.class.php
-  jResponse.class.php
-  jSelector.class.php
-
-cd lib/jelix/core/request
@@ -70 +58 @@
-
-cd lib/jelix/core/url
-  jUrl.class.php
-  jUrlCompiler.significant.class.php
-  jUrlEngine.significant.class.php
@@ -113 +100 @@
-
-cd lib/jelix/forms
- 
- 
- 
- 
- 
- 
+
+
+
+
+
+
-
-cd lib/jelix/tpl/
@@ -177 +164 @@
-  jFile.class.php
-  jIniFile.class.php
- 
+*
-  jLog.class.php
-  jWiki.class.php
@@ -188 +175 @@
-  jSmtp.class.php
-* jFilter.class.php
-
-cd lib/json
-  JSON.php
-  LICENSE
-
-cd lib/jelix-modules
@@ -229 +212 @@
-  auth.UTF-8.properties
-cd lib/jelix-modules/jelix/controllers
- 
- 
- 
- 
- 
- 
+!
+!
+!
+!
+!
+!
-cd lib/jelix-modules/jelix/templates
-  404.xul.tpl
@@ -244 +227 @@
-  events.xml
-cd lib/jelix-modules/jxauth/plugins/auth
- 
+!
-  plugin.xml
-  auth.plugin.ini.php.dist
@@ -263 +246 @@
-  install.datas.mysql.sql
-cd lib/jelix-modules/jxauth/classes
-
+!
-cd lib/jelix-modules/jxauth/controllers
- 
- 
- 
- 
- 
- 
+!
+!
+!
+!
+!
+!
-cd lib/jelix-modules/jxauth/zones
- 
+!
-cd lib/jelix-modules/jxauth/templates
-  login.form.tpl
@@ -285 +268 @@
-   events.xml
-cd lib/jelix-modules/jxacl/classes
- 
- 
+!
+!
-cd lib/jelix-modules/jxacl/controllers
- 
- 
- 
- 
+!
+!
+!
+!
-cd lib/jelix-modules/jxacl/daos
-   jaclgroup.dao.xml
@@ -318 +301 @@
-  CREDITS
-cd lib/jelix-plugins/magicquotes
- 
+!
-  plugin.xml
-cd lib/jelix-plugins/autolocale
-  autolocale.plugin.ini.php.dist
- 
+!
-  plugin.xml
-
@@ -344 +327 @@
-
-cd lib/diff
- 
- 
+!
+!
-  README
-
@@ -352 +335 @@
-  CREDITS
-  LICENCE
- 
+!
-
-cd lib/wikirenderer/rules
- 
- 
- 
- 
- 
+!
+!
+!
+!
+!

trunk/build/tests/ppdatas/result_include1.txt

@@ -17 +17 @@
-
-
+
-ggggg
-

trunk/build/tests/testpreprocess.php

@@ -15 +15 @@
-require_once(dirname(__FILE__).'/../../lib/simpletest/unit_tester.php');
-require_once(dirname(__FILE__).'/../../lib/simpletest/reporter.php');
+require_once(dirname(__FILE__).'/../../lib/diff/difflib.php');
-
-define('PP_DATA_DIR','ppdatas/');
@@ -72 +73 @@
-
-
+    protected $testcase2 = array(
+      'source2.txt'=>array(
+           'result2_1.txt'=>array('FOO'=>''),
+           'result2_2.txt'=>array('FOO'=>true),
+          ),
+      'source3.txt'=>array(
+           'result3_1.txt'=>array('FOO'=>''),
+           'result3_2.txt'=>array('FOO'=>true),
+          ),
+      'source4.txt'=>array(
+           'result4_1.txt'=>array('FOO'=>'', 'BAR'=>''),
+           'result4_2.txt'=>array('FOO'=>true, 'BAR'=>''),
+           'result4_3.txt'=>array('BAR'=>true, 'FOO'=>''),
+           'result4_4.txt'=>array('FOO'=>true, 'BAR'=>true),
+          ),
+      'source5.txt' =>array(
+           'result5_1.txt'=>array('FOO'=>'', 'BAR'=>''),
+           'result5_2.txt'=>array('FOO'=>"une variable foo", "BAR"=>"le bar est ouvert"),
+          ),
+      'source6.txt'=>array(
+           'result6_1.txt'=>array('FOO'=>'', 'BAR'=>''),
+           'result6_2.txt'=>array('FOO'=>true),
+           'result6_3.txt'=>array('BAR'=>true),
+           'result6_4.txt'=>array('FOO'=>true, 'BAR'=>true),
+          ),
+      'source7.txt'=>array(
+           'result7_1.txt'=>array('FOO'=>'', 'BAR'=>'', 'BAZ'=>''),
+           'result7_2.txt'=>array('FOO'=>true, 'BAR'=>'', 'BAZ'=>''),
+           'result7_3.txt'=>array('BAR'=>true, 'FOO'=>''),
+           'result7_4.txt'=>array('BAZ'=>true),
+           'result7_5.txt'=>array('BAZ'=>true, 'BAR'=>true),
+          ),
+    );
+
+
+
-    function __construct() {
-        $this->UnitTestCase();
@@ -89 +126 @@
-           $proc->setVars($vars);
-           $res = $proc->parseFile(PP_DATA_DIR.$source);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-         }
-      }
@@ -142 +194 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
+
-
-}

trunk/lib/jelix/init.php

@@ -47 +47 @@
-error_reporting (E_ALL);
-
+#ifdef ENABLE_OPTIMIZE
+
+#includephp core/jErrorHandler.lib.php
+#includephp core/jException.lib.php
+#includephp core/jContext.class.php
+#includephp core/jConfig.class.php
+#includephp core/jSelector.class.php
+#includephp core/url/jUrl.class.php
+#includephp core/jCoordinator.class.php
+#includephp core/jController.class.php
+#includephp core/jRequest.class.php
+#includephp core/jResponse.class.php
+#includephp core/jLocale.class.php
+#includephp core/jIncluder.class.php
+#includephp core/jIPlugin.iface.php
+
+#else
+
-// chargement du coeur
-require_once (JELIX_LIB_CORE_PATH . 'jErrorHandler.lib.php');
@@ -61 +79 @@
-require_once (JELIX_LIB_CORE_PATH . 'jIncluder.class.php');
-require_once (JELIX_LIB_CORE_PATH . 'jIPlugin.iface.php');
+
+#endif
+
-
-/**
@@ -112 +133 @@
-   }
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-}

trunk/lib/jelix/utils/jFilter.class.php

@@ -20 +20 @@
-
-    static public function usePhpFilter(){
-PHP52
+ENABLE_PHP_FILTER
-        return true;
-#else
@@ -35 +35 @@
-     */
-    static public function isInt ($val, $min=null, $max=null){
-PHP52
+ENABLE_PHP_FILTER
-        // @FIXME pas de doc sur la fa� d'utiliser les min/max sur les filters
-        if(!filter_var($var, FILTER_VALIDATE_INT)) return false;
@@ -55 +55 @@
-     */
-    static public function isHexInt ($val, $min=null, $max=null){
-PHP52
+ENABLE_PHP_FILTER
-        // @FIXME pas de doc sur la fa� d'utiliser les min/max sur les filters
-        if(!filter_var($var, FILTER_VALIDATE_INT, FILTER_FLAG_ALLOW_HEX)) return false;
@@ -74 +74 @@
-     */
-    static public function isBool ($val){
-PHP52
+ENABLE_PHP_FILTER
-        return filter_var($var, FILTER_VALIDATE_BOOLEAN);
-#else
@@ -90 +90 @@
-     */
-    static public function isFloat ($val, $min=null, $max=null){
-PHP52
+ENABLE_PHP_FILTER
-        // @FIXME pas de doc sur la fa� d'utiliser les min/max sur les filters
-        if(!filter_var($var, FILTER_VALIDATE_FLOAT)) return false;
@@ -110 +110 @@
-                            $hostRequired=false, $pathRequired=false,
-                            $queryRequired=false ){
-PHP52
+ENABLE_PHP_FILTER
-        $flag=0;
-        if($schemeRequired) $flag |= FILTER_FLAG_SCHEME_REQUIRED;
@@ -138 +138 @@
-     */
-    static public function isIPv4 ($val){
-PHP52
+ENABLE_PHP_FILTER
-        return filter_var($var, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
-#else
@@ -156 +156 @@
-     */
-    static public function isIPv6 ($val){
-PHP52
+ENABLE_PHP_FILTER
-        return filter_var($var, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6);
-#else

trunk/lib/jelix/utils/jJsonRpc.class.php

@@ -3 +3 @@
-* @package     jelix
-* @subpackage  utils
-* @version     $Id$
-* @author      Jouanneau Laurent
-* @contributor
@@ -11 +10 @@
-*/
-
+#ifndef ENABLE_PHP_JSON
-/**
- *
- */
-require_once (LIB_PATH.'json/JSON.php');
-
+
-/**
-
-
+
- * @package    jelix
- * @subpackage utils
+ * @link http://json-rpc.org/index.xhtml
- */
-class jJsonRpc {
@@ -27 +27 @@
-
-    /**
-
+ decode a request of json xmlrpc
-     * @param string $content
-     * @return mixed
@@ -33 +33 @@
-    public static function decodeRequest($content){
-        // {method:.. , params:.. , id:.. }
+#ifdef ENABLE_PHP_JSON
+        $obj = json_decode($content);
+#else
-        $json = new JSON(JSON_LOOSE_TYPE);
-
-        $obj = $json->decode($content);
-        /*
@@ -40 +42 @@
-        $obj->params
-        $obj->id*/
-
+
+
-    }
-
-    /**
-
-
-
-
+ create a request content for a jsonrpc call
+ method of the jsonrcp web service
+ parameters for the methods
+ jsonrcp request content
-     */
-    public static function encodeRequest($methodname, $params, $id=1){
+        
+#ifdef ENABLE_PHP_JSON
+        return '{"method":"'.$methodname.'","params":'.json_encode($params).',"id":'.json_encode($id).'}';
+#else
-        $json = new JSON();
-
-
+
+
+
-    }
-
-    /**
-
-
-
+ decode a jsonrpc response
+ string $content
+ mixed decoded content
-     */
-    public static function decodeResponse($content){
-        // {result:.. , error:.. , id:.. }
+#ifdef ENABLE_PHP_JSON
+        return json_decode($content);
+#else
-        $json = new JSON(JSON_LOOSE_TYPE);
+        return $json->decode($content);
+#endif
-
-        $response = $json->decode($content);
-        return $response;
-    }
-
-    /**
-
-
-
+ encode a jsonrpc response 
+ array $params  returned value
+ string encoded response
-     */
-    public static function encodeResponse($params, $id=1){
+#ifdef ENABLE_PHP_JSON
+        return '{"result":'.json_encode($params).',"error":null,"id":'.json_encode($id).'}';
+#else
-        $json = new JSON();
-$request =
-
+return
+
-    }
-
-    /**
-
-
-
+
+
+
+
-     */
-    public static function encodeFaultResponse($code, $message, $id=1){
+#ifdef ENABLE_PHP_JSON
+        return '{"result":null,"error":{"code": '.json_encode($code).', "string":'.json_encode($message).' },"id":'.json_encode($id).'}';
+#else
-        $json = new JSON();
-$request =
-
+return
+
-    }
-}

trunk/Makefile

@@ -83 +83 @@
-nightlies:
-        $(PHP) build/buildjelix.php -D $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/jelix-dist-dev.ini
+        $(PHP) build/buildjelix.php -D $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/jelix-dist-opt.ini
-        $(PHP) build/buildapp.php -D $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/testapp-dist.ini
-        $(PHP) build/buildjbt.php -D $(DISTPATHSWITCH) -D NIGHTLY_NAME=1 build/config/jbt-dist.ini