Changeset 114

Timestamp:

03/21/06 07:55:37 (3 years ago)

Author:

laurentj

Message:

ajout de fichiers CREDITS... pour jtpl et amélioration du build de jtpl

Files:

• trunk/build/manifests/jtpl-standalone.mn (modified) (1 diff)
• trunk/lib/jelix-scripts/templates/dao.xml.tpl (modified) (1 diff)
• trunk/lib/jelix-scripts/templates/dao_empty.xml.tpl (modified) (1 diff)
• trunk/lib/jelix/tpl/CREDITS (added)
• trunk/lib/jelix/tpl/LICENCE (added)
• trunk/lib/jelix/tpl/VERSION (added)
• trunk/Makefile (modified) (4 diffs)

trunk/build/manifests/jtpl-standalone.mn

@@ -4 +4 @@
-*  jTplCompiler.class.php
-   jtpl_standalone_prepend.php
+   VERSION
+   CREDITS
+   LICENCE
-
-sd lib/jelix/tpl/plugins/common

trunk/lib/jelix-scripts/templates/dao.xml.tpl

@@ -19 +19 @@
-    <!--<factory>
-        <method name="findByStage" type="select/selectfirst/delete/update/php">
-
-
-
+
-            <values>
-                <value property="" value="" />

trunk/lib/jelix-scripts/templates/dao_empty.xml.tpl

@@ -14 +14 @@
-    <!--<factory>
-        <method name="findByStage" type="select/selectfirst/delete/update/php">
-
-
-
+
-            <values>
-                <value property="" value="" />

trunk/Makefile

@@ -6 +6 @@
-endif
-
+ifndef JTPL_VERSION
+JTPL_VERSION = $(shell cat lib/jelix/tpl/VERSION)
+endif
+
-ifeq ($(LIB_VERSION),SVN)
-SVN_REVISION = $(shell svn info | grep "Revision" | cut -d " " -f 2)
-LIB_VERSION=SVN-$(SVN_REVISION)
+endif
+
+ifeq ($(JTPL_VERSION),SVN)
+SVN_REVISION = $(shell svn info | grep "Revision" | cut -d " " -f 2)
+JTPL_VERSION=SVN-$(SVN_REVISION)
-endif
-
@@ -20 +29 @@
-
-default:
-
+ jtpl-dist
-
-
+-dist
-
-
+ jtpl
-
-dist-jelix: common
+        if [ ! -d "$(DISTJELIX)" ] ; then mkdir $(DISTJELIX) ; fi
-        export LIB_VERSION=$(LIB_VERSION) \
-        && $(PHP) build/mkdist.php build/manifests/jelix-lib.mn . $(DISTJELIX) \
@@ -35 +45 @@
-
-dist-testapp: common
+        if [ ! -d "$(DISTJELIX)" ] ; then mkdir $(DISTJELIX) ; fi
-        $(PHP) build/mkdist.php build/manifests/testapp.mn . $(DISTJELIX)
-        tar czf $(DIST)/testapp-$(LIB_VERSION).tar.gz  -C $(DISTJELIX) testapp/
-
-dist-myapp: common
+        if [ ! -d "$(DISTJELIX)" ] ; then mkdir $(DISTJELIX) ; fi
-        $(PHP) build/mkdist.php build/manifests/myapp.mn . $(DISTJELIX)
-        tar czf $(DIST)/myapp-$(LIB_VERSION).tar.gz  -C $(DISTJELIX) myapp/
-
-dev-jelix: common
+        if [ ! -d "$(DISTHACKER)" ] ; then mkdir $(DISTHACKER) ; fi
-        export LIB_VERSION=$(LIB_VERSION) \
-        && $(PHP) build/mkdist.php build/manifests/jelix-lib.mn . $(DISTHACKER) \
@@ -48 +61 @@
-        && echo "$(LIB_VERSION)" > "$(DISTHACKER)/lib/jelix/VERSION"
-
+dev-jelix-lib: common
+        if [ ! -d "$(DISTHACKER)" ] ; then mkdir $(DISTHACKER) ; fi
+        export LIB_VERSION=$(LIB_VERSION) \
+        && $(PHP) build/mkdist.php build/manifests/jelix-lib.mn . $(DISTHACKER) \
+        && echo "$(LIB_VERSION)" > "$(DISTHACKER)/lib/jelix/VERSION"
+
-dev-testapp: common
+        if [ ! -d "$(DISTHACKER)" ] ; then mkdir $(DISTHACKER) ; fi
-        $(PHP) build/mkdist.php build/manifests/testapp.mn . $(DISTHACKER)
-
-dev-myapp: common
+        if [ ! -d "$(DISTHACKER)" ] ; then mkdir $(DISTHACKER) ; fi
-        $(PHP) build/mkdist.php build/manifests/myapp.mn . $(DISTHACKER)
+        
+jtpl: common 
+        if [ ! -d "$(DISTJTPL)" ] ; then mkdir $(DISTJTPL) ; fi
+        export JTPL_STANDALONE=1 \
+        && $(PHP) build/mkdist.php build/manifests/jtpl-standalone.mn . $(DISTJTPL) \
+        && echo "$(JTPL_VERSION)" > "$(DISTJTPL)/VERSION"
+
+jtpl-dist: jtpl
+        tar czf $(DIST)/jtpl-$(JTPL_VERSION).tar.gz  -C $(DIST) jtpl/
+
-
-common:
-        if [ ! -d "$(DIST)" ] ; then mkdir $(DIST) ; fi
-        if [ ! -d "$(DISTJELIX)" ] ; then mkdir $(DISTJELIX) ; fi
-        if [ ! -d "$(DISTHACKER)" ] ; then mkdir $(DISTHACKER) ; fi
-        if [ ! -d "$(DISTJTPL)" ] ; then mkdir $(DISTJTPL) ; fi
-        
-jtpl: common
-        export JTPL_STANDALONE=1 \
-        && $(PHP) build/mkdist.php build/manifests/jtpl-standalone.mn . $(DISTJTPL)
-