Changeset 37453

Timestamp:

06/08/08 05:39:45 (6 months ago)

Author:

jmr@…

Message:

Check depends_build before configure phase, and check dependencies before
alll packaging targets. This is a step towards fixing #15161.

Location:

trunk/base/src

Files:

• macports1.0/macports.tcl (modified) (3 diffs)
• port1.0/portutil.tcl (modified) (3 diffs)

trunk/base/src/macports1.0/macports.tcl

@@ -1237 +1237 @@
         || $target == "destroot" || $target == "install"
         || $target == "archive"
+        || $target == "dmg" || $target == "mdmg"
         || $target == "pkg" || $target == "mpkg"
-        || $target == "rpm" || $target == "dpkg" } {
+        || $target == "rpm" || $target == "dpkg" 
+        || $target == "srpm" } {
 
         if {[mportdepends $mport $target] != 0} {
@@ -1677 +1679 @@
     # Determine deptypes to look for based on target
     switch $target {
-        configure   { set deptypes "depends_lib" }
-        
+        configure   -
         build       { set deptypes "depends_lib depends_build" }
         
@@ -1685 +1686 @@
         install     -
         archive     -
+        dmg         -
         pkg         -
+        mdmg        -
         mpkg        -
         rpm         -
+        srpm        -
         dpkg        -
         ""          { set deptypes "depends_lib depends_build depends_run" }

trunk/base/src/port1.0/portutil.tcl

@@ -1189 +1189 @@
                         # Determine deptypes to look for based on target
                         switch $target {
-                            configure   { set deptypes "depends_lib depends_build" }
-                            
+                            configure   -
                             build       { set deptypes "depends_lib depends_build" }
                         
@@ -1197 +1196 @@
                             install     -
                             archive     -
+                            dmg         -
                             pkg         -
                             mpkg        -
@@ -1202 +1202 @@
                             srpm        -
                             dpkg        -
+                            mdmg        -
                             activate    -
                             ""          { set deptypes "depends_lib depends_build depends_run" }