Changeset 2726

Timestamp:

01/19/06 23:49:53 (3 years ago)

Author:

bergius

Message:

Much more packaging work. Now MgdSchema? files go to directory governed by "pear config-set mgdschema_dir <path>"

Files:

• trunk/lib/midcom/config/package.xml (modified) (2 diffs)
• trunk/lib/midcom/helper/misc.php (modified) (1 diff)
• trunk/support/Role_MgdSchema (added)
• trunk/support/Role_MgdSchema/Mgdschema.php (added)
• trunk/support/Role_MgdSchema/Mgdschema.xml (added)
• trunk/support/Role_MgdSchema/package.xml (added)
• trunk/support/Role_MgdSchema/setup.php (added)
• trunk/support/makedist2.sh (modified) (1 diff)

trunk/lib/midcom/config/package.xml

@@ -79 +79 @@
-                <dir name="config">
-                    <dir name="mgdschema">
+                        <file baseinstalldir="/" name="midcom_dbobjects.xml" role="mgdschema" />
-                        <dir name="sql">
-                            <file baseinstalldir="midcom/lib" name="midcom_dbobjects_full.sql" role="php" />
-                        </dir> <!-- //midcom/config/mgdschema/sql -->
-                        <file baseinstalldir="midcom/lib" name="midcom_dbobjects.xml" role="php" />
-                    </dir> <!-- //midcom/config/mgdschema -->
-                    <file baseinstalldir="midcom/lib" name="language_db.inc" role="php" />
@@ -230 +230 @@
-        </required>
-    </dependencies>
+    <usesrole>
+        <role>mgdschema</role>
+        <package>Role_MgdSchema</package>
+        <channel>pear.php.net</channel>
+    </usesrole>    
-    <phprelease />
-</package>

trunk/lib/midcom/helper/misc.php

@@ -946 +946 @@
-    {
-        $node_id = $nap->get_root_node();
+        
+        $root_node = $nap->get_node($node_id);
+        if ($root_node[MIDCOM_NAV_COMPONENT] == $component)
+        {
+            return $root_node;
+        }
-    }
-

trunk/support/makedist2.sh

@@ -10 +10 @@
-PHP=`which php`
-MIDCOM_SUPPORT_DIR=`dirname $0`
+
+# Packaging the MgdSchema role
+echo "Packaging MgdSchema Role..."
+$PEAR package $MIDCOM_SUPPORT_DIR/Role_MgdSchema/package.xml
+$PEAR install Role_MgdSchema-?.?.?.tgz
-
-# Package MidCOM itself