Changeset 85

Timestamp:

02/13/06 17:22:49 (3 years ago)

Author:

laurentj

Message:

travail sur le build

Files:

• trunk/build/fld/jelix-lib.fld (modified) (1 diff)
• trunk/build/mkdist.php (modified) (1 diff)
• trunk/lib/jelix/init.php (modified) (1 diff)
• trunk/lib/jelix/VERSION (modified) (1 diff)
• trunk/Makefile (modified) (1 diff)

trunk/build/fld/jelix-lib.fld

@@ -5 +5 @@
-  CHANGELOG
-  CREDITS
- 
+*
-  INSTALL
-  LICENCE

trunk/build/mkdist.php

@@ -27 +27 @@
-
-}
+/*$env = $_ENV;
+$options = array('verbose'=>false);
+$arrargv = $_SERVER['argv'];
+foreach($arrargv as $argv){
-
+  if($argv{0} == '-'){
+    $sw = substr(array_shift($_SERVER['argv']),1);
+    if($sw{0} =='D'){
+      
+    }else{
+      $options['verbose'] = (strpos('v', $sw) !== false);
+    }    
+  }else{
+    break;
+  }
+}*/
-list($ficlist, $sourcedir, $distdir) = $_SERVER['argv'];
-

trunk/lib/jelix/init.php

@@ -11 +11 @@
-*/
-
-define ('JELIX_VERSION', '0.20060125
+#expand define ('JELIX_VERSION', '__LIB_VERSION__
-define ('JELIX_NAMESPACE_BASE' , 'http://jelix.org/ns/');
-

trunk/lib/jelix/VERSION

@@ -1 @@
-
+

trunk/Makefile

@@ -1 +1 @@
-SHELL=/bin/sh
-PHP=/usr/bin/php
-VERSION=SVN
-
+ifndef LIB_VERSION
+LIB_VERSION = $(shell cat lib/jelix/VERSION)
+endif
+
+ifeq ($(LIB_VERSION),SVN)
+SVN_REVISION = $(shell svn info | grep "Revision" | cut -d " " -f 2)
+LIB_VERSION=SVN-$(SVN_REVISION)
+endif
+
+ifndef DIST
-DIST=_dist
+endif
-
-lib-$(
+$(LIB_
-
-
-
-default:
-make all
+target:  jelix-lib
-
-jelix-lib: common
-        if [ ! -d "$(LIBPATH)" ] ; then mkdir $(LIBPATH) ; else rm -rf $(LIBPATH)/* ; fi
-
+
+
+
+
+
+
+
-
-common:
-        if [ ! -d "$(DIST)" ] ; then mkdir $(DIST) ; fi
+        
-