[66608] trunk/base/src/port

[raimue at macports.org]

Revision: 66608
          http://trac.macports.org/changeset/66608
Author:   raimue at macports.org
Date:     2010-04-17 20:47:13 -0700 (Sat, 17 Apr 2010)
Log Message:
-----------
If the port command is being run in "base" or "src" and
macports1.0/macports_fastload.tcl exists, source local packages. This means we
can now develop and test any changes without running "make install".

Modified Paths:
--------------
    trunk/base/src/port/Makefile
    trunk/base/src/port/port.tcl
    trunk/base/src/port/portindex.tcl
    trunk/base/src/port/portmirror.tcl

Modified: trunk/base/src/port/Makefile
===================================================================
--- trunk/base/src/port/Makefile	2010-04-18 03:40:29 UTC (rev 66607)
+++ trunk/base/src/port/Makefile	2010-04-18 03:47:13 UTC (rev 66608)
@@ -14,12 +14,15 @@
 
 portmirror: portmirror.tcl ../../Mk/macports.autoconf.mk
 	${edit} portmirror.tcl > $@
+	chmod +x $@
 
 portindex: portindex.tcl ../../Mk/macports.autoconf.mk
 	${edit} portindex.tcl > $@
+	chmod +x $@
 
 port: port.tcl ../../Mk/macports.autoconf.mk
 	${edit} port.tcl > $@
+	chmod +x $@
 
 mkdirs:
 	cat ../../doc/prefix.mtree | $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null

Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl	2010-04-18 03:40:29 UTC (rev 66607)
+++ trunk/base/src/port/port.tcl	2010-04-18 03:47:13 UTC (rev 66608)
@@ -34,8 +34,14 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-catch {source \
-    [file join "@macports_tcl_dir@" macports1.0 macports_fastload.tcl]}
+if {([file tail [pwd]] == "src" && [file exists [set dir macports1.0]/macports_fastload.tcl]])
+        || ([file tail [pwd]] == "base" && [file exists [set dir src/macports1.0]/macports_fastload.tcl]])} {
+    # developer mode, source packages from current directory
+    source [file join $dir macports_fastload.tcl]
+} else {
+    source [file join "@macports_tcl_dir@" macports1.0 macports_fastload.tcl]
+}
+
 package require macports
 package require Pextlib 1.0
 

Modified: trunk/base/src/port/portindex.tcl
===================================================================
--- trunk/base/src/port/portindex.tcl	2010-04-18 03:40:29 UTC (rev 66607)
+++ trunk/base/src/port/portindex.tcl	2010-04-18 03:47:13 UTC (rev 66608)
@@ -7,8 +7,14 @@
 # if requested
 # $Id$
 
-catch {source \
-    [file join "@macports_tcl_dir@" macports1.0 macports_fastload.tcl]}
+if {([file tail [pwd]] == "src" && [file exists [set dir macports1.0]/macports_fastload.tcl]])
+        || ([file tail [pwd]] == "base" && [file exists [set dir src/macports1.0]/macports_fastload.tcl]])} {
+    # developer mode, source packages from current directory
+    source [file join $dir macports_fastload.tcl]
+} else {
+    source [file join "@macports_tcl_dir@" macports1.0 macports_fastload.tcl]
+}
+
 package require macports
 package require Pextlib
 

Modified: trunk/base/src/port/portmirror.tcl
===================================================================
--- trunk/base/src/port/portmirror.tcl	2010-04-18 03:40:29 UTC (rev 66607)
+++ trunk/base/src/port/portmirror.tcl	2010-04-18 03:47:13 UTC (rev 66608)
@@ -11,8 +11,14 @@
 # Updates the distfiles to current distfiles by deleting old stuff.
 # Uses the database.
 
-catch {source \
-    [file join "@macports_tcl_dir@" macports1.0 macports_fastload.tcl]}
+if {([file tail [pwd]] == "src" && [file exists [set dir macports1.0]/macports_fastload.tcl]])
+        || ([file tail [pwd]] == "base" && [file exists [set dir src/macports1.0]/macports_fastload.tcl]])} {
+    # developer mode, source packages from current directory
+    source [file join $dir macports_fastload.tcl]
+} else {
+    source [file join "@macports_tcl_dir@" macports1.0 macports_fastload.tcl]
+}
+
 package require macports
 package require Pextlib
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100417/e157da44/attachment-0001.html>