Changeset 13572

Timestamp:

11/22/07 15:49:48 (10 months ago)

Author:

tarjei

Message:

closes #188
* Moved static dir down one place (after testing phing install and phing packageCore)
* Removed need for version.php
* Made core version something that is set by phing

Files:

• trunk/midcom/build.xml (modified) (2 diffs)
• trunk/midcom/build/installMidcomCore.php (modified) (1 diff)
• trunk/midcom/build/packageMidCOMcore.php (modified) (4 diffs)
• trunk/midcom/midcom.core/midcom.php (modified) (1 diff)
• trunk/midcom/midcom.core/midcom/config/midcom_config.php (modified) (1 diff)
• trunk/midcom/midcom.core/static (moved) (moved from trunk/midcom/midcom.core/midcom/static)

trunk/midcom/build.xml

@@ -6 +6 @@
-    <property name="absolute_basedir" value="" />
-    <property name="phpdocdir" value="documentation/api" />
+    <property name="coreVersion" value="2.9.0beta16" />
-    <resolvepath propertyName="absolute_basedir" file="${project.basedir}"/>
-
@@ -109 +110 @@
-            template="${project.basedir}/midcom.core/package-template.xml"
-            returnProperty="pear_name"
+            version="${coreVersion}"
-        >
-        </packageMidCOMcore>
+
+        <move file="${project.basedir}/midcom.core/midcom/config/midcom_config.php" 
+            tofile="${project.basedir}/midcom.core/midcom/config/midcom_config.php~"
+            overwrite="true"
+            />
+
+        <!-- insert midcom version into the correct file.
+        @todo: consider moving the original out of the package dir 
+        -->
+        <copy file="${project.basedir}/midcom.core/midcom/config/midcom_config.php~" 
+            tofile="${project.basedir}/midcom.core/midcom/config/midcom_config.php"
+            overwrite="true"
+            >
+            <filterchain>
+              <replacetokens begintoken="##" endtoken="##">
+                  <token key="MIDCOM_VERSION" value="${coreVersion}" />
+                </replacetokens>
+            </filterchain>
+        </copy>
+
+
+
-        <pearPackagePackage 
-            path="${project.basedir}/midcom.core"
-            target_dir="${target_dir}"
-            />
+
+        <copy file="${project.basedir}/midcom.core/midcom/config/midcom_config.php~" 
+            overwrite="true"
+            tofile="${project.basedir}/midcom.core/midcom/config/midcom_config.php" />
+
+
-        <echo>Package ${pear_name} created in ${target_dir}</echo>
-    </target>

trunk/midcom/build/installMidcomCore.php

@@ -141 +141 @@
-         * Make symlinks for the static files
-         */
-
+../
-        
-        foreach ($dirs as $dir => $value) {
-
+../
-            $to   =  "{$this->static_dir}/$dir";   
-            $this->make_symlink($from, $to);

trunk/midcom/build/packageMidCOMcore.php

@@ -40 +40 @@
-
-        protected $returnProperty; // name of property to set to return value
+    protected $version;
-
-        /**
@@ -83 +84 @@
-        $this->stability = $s;
-    }
+    public function setVersion($s) {
+        $this->version = $s;
+    }
+
-
-    // todo: add a setVersion from the commandline
@@ -128 +133 @@
-        $package->addRole('xml', 'mgdschema');
-
+        var_dump($this->version);
+
-        $package->generateContents();
-
@@ -192 +199 @@
-        $package->setAPIStability($this->stability);
-        $package->setPhpDep($this->phpversion);
+        $package->setReleaseVersion($this->version);
-        echo "Done with makeBase\n\n";
-        return $package;

trunk/midcom/midcom.core/midcom.php

@@ -58 +58 @@
-///////////////////////////////////////
-//Constants, Globals and Configuration
-require('version.php');
-require('constants.php');
-require('globals.php');

trunk/midcom/midcom.core/midcom/config/midcom_config.php

@@ -319 +319 @@
- */
-$GLOBALS['midcom_config_default'] = Array();
-
+
+
+
+
+
-// Initialize Helpers
-$phpversion = phpversion();