[ODP-Repository] SF.net SVN: opendocumentphp: [44] poc

[<nma...@us...>]

Revision: 44
Author:   nmarkgraf
Date:     2006-03-30 05:20:40 -0800 (Thu, 30 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/opendocumentphp/?rev=44&view=rev

Log Message:
-----------
New feature:
- The release property in build.properties will be used to update OpenDocumentAbstract::Release.

We need an build.xml refactoring as soon as we heading to 0.6.0 ...;)

Modified Paths:
--------------
    poc/build.xml
    poc/src/OpenDocumentAbstract.php
Modified: poc/build.xml
===================================================================
--- poc/build.xml	2006-03-30 10:47:03 UTC (rev 43)
+++ poc/build.xml	2006-03-30 13:20:40 UTC (rev 44)
@@ -5,7 +5,7 @@
     <property file="build.properties" />
     <property name="OpenDocumentPHPSolid" value="OpenDocumentPHP-${release}-solid.php" />
   
-	<target name="prepare">
+	<target name="prepare" depends="updateReleaseInfo">
 		<mkdir dir="reports"/>
 		<mkdir dir="reports/coverage"/>
 		<mkdir dir="reports/tests"/>
@@ -34,6 +34,21 @@
 		<mkdir dir="reports/tests"/>
 	</target>
 	
+	<target name="updateReleaseInfo">
+	  <copy file="src/OpenDocumentAbstract.php" tofile="tmp.tmp" overwrite="true">
+	    <filterchain>
+          <replaceregexp>
+		    <regexp pattern=".*const.*Release.*=.*" replace="##release##"/>
+          </replaceregexp>
+          <replacetokens begintoken="##" endtoken="##">
+            <token key="release" value="  const Release = '${release}';" />
+          </replacetokens>
+	    </filterchain>
+	  </copy>
+	  <copy file="tmp.tmp" tofile="src/OpenDocumentAbstract.php" overwrite="true" />
+	  <delete file="tmp.tmp" />
+	</target>
+	
 	<target name="reports" depends="preparereport">
 		<coverage-setup database="reports/data/${release}/coverage.db">
 			<fileset dir="src">
@@ -125,36 +140,36 @@
 	  </copy>
 	</target>
 
-    <target name="solid-production" depends="production" description="Creates a single file production release without unit tests in the dist directory.">
-      <mkdir dir="solid-production"/>
-      <copy todir="solid-production"> <!--"/OpenDocumentPHP-solid.php" overwrite="true" -->
-        <fileset dir="production">
-          <include name="**/*.php" />
-        </fileset>        
+    <target name="solid-file" depends="production">
+      <delete file="dist/tmp.tmp"/>
+      <append destFile="dist/tmp.tmp">
+        <fileset dir=".">
+          <include name="**/etc/solid.txt" />
+		  <include name="**/production/**/*.php" />
+        </fileset>              
         <filterchain>
           <replaceregexp>
           	<regexp pattern=".*require_once" replace="//require_once" ignoreCase="true" />
           	<regexp pattern=".*include_once" replace="//include_once" ignoreCase="true" />
-          	<regexp pattern=".+this-.logger.+" replace="//this-logger-" />
-          </replaceregexp>          
-          <!-- stripphpcomments /-->
+          	<regexp pattern=".+this-.logger.+" replace="//this-logger-" />          	
+          </replaceregexp>		              
+        </filterchain>
+      </append>
+    </target>
+    
+    <target name="solid-production" depends="solid-file" description="Creates a single file production release without unit tests in the dist directory.">
+      <copy file="dist/tmp.tmp" tofile="dist/${OpenDocumentPHPSolid}" overwrite="true">
+        <filterchain>
+          <replaceregexp>
+		    <regexp pattern="\?>.\?php" replace="//" />
+          </replaceregexp>		                        
           <striplinecomments>
             <comment value="//" />
           </striplinecomments>
-        </filterchain>        
-      </copy>
-      <!-- echo msg="${OpenDocumentPHPSolid}"/-->
-      <!-- echo msg="${os.name}"/-->
-      <exec command="copy ..\etc\solid.txt + *.php + manifest\*.php + content\*.php + settings\*.php + styles\*.php + meta\*.php tmp.tmp" dir="solid-production"/>
-      <exec command="cat ../etc/solid.txt &gt; ../tmp.tmp &amp;&amp; cat *.php &gt;&gt; ../tmp.tmp &amp;&amp; cat */*.php &gt;&gt; ../tmp.tmp" dir="solid-production" os="linux"/>
-      <copy file="solid-production/tmp.tmp" tofile="dist/${OpenDocumentPHPSolid}" overwrite="true">
-        <filterchain>
-          <replaceregexp>
-		    <regexp pattern="\?>.\?php" replace=" " />
-          </replaceregexp>		    
+          <!--stripphpcomments /-->
         </filterchain>
-      </copy>
-	  <delete dir="solid-production"/>
+	  </copy>
+	  <delete file="dist/tmp.tmp"/>
     </target>
 	
 	<target name="build" depends="prepare,test,reports,docs,dist">
@@ -174,6 +189,7 @@
 		<delete file="OpenDocumentPHP.tar"/>
 		<delete dir="production"/>
   	    <delete dir="solid-production"/>		
+  	    <delete file="dist/tmp.tmp"/>
 	</target>
 	
 	<target name="proper" depends="clean">

Modified: poc/src/OpenDocumentAbstract.php
===================================================================
--- poc/src/OpenDocumentAbstract.php	2006-03-30 10:47:03 UTC (rev 43)
+++ poc/src/OpenDocumentAbstract.php	2006-03-30 13:20:40 UTC (rev 44)
@@ -28,7 +28,7 @@
    * X = 0 : "proof of concept" (a.k.a POC) code
    * X = 1 : "stage 1" code
    */
-  const Release = "0.4.6";
+  const Release = '0.4.6';
   
   /**
    * Copyright notice for this package.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.