[51382] trunk/base
raimue at macports.org
raimue at macports.org
Sat May 23 13:20:59 PDT 2009
Revision: 51382
http://trac.macports.org/changeset/51382
Author: raimue at macports.org
Date: 2009-05-23 13:20:58 -0700 (Sat, 23 May 2009)
Log Message:
-----------
base:
Generate pkgIndex.tcl in the source tree, not at install time. This will detect
errors earlier.
Modified Paths:
--------------
trunk/base/Mk/macports.tea.mk
trunk/base/src/macports1.0/Makefile
trunk/base/src/package1.0/Makefile
trunk/base/src/port1.0/Makefile
trunk/base/src/registry1.0/Makefile
trunk/base/src/registry2.0/Makefile
Property Changed:
----------------
trunk/base/src/macports1.0/
trunk/base/src/package1.0/
trunk/base/src/pextlib1.0/
trunk/base/src/port1.0/
trunk/base/src/registry1.0/
trunk/base/src/registry2.0/
Modified: trunk/base/Mk/macports.tea.mk
===================================================================
--- trunk/base/Mk/macports.tea.mk 2009-05-23 20:03:00 UTC (rev 51381)
+++ trunk/base/Mk/macports.tea.mk 2009-05-23 20:20:58 UTC (rev 51382)
@@ -8,17 +8,20 @@
.c.o:
${CC} -c -DUSE_TCL_STUBS -DTCL_NO_DEPRECATED ${CFLAGS} ${SHLIB_CFLAGS} $< -o $@
+all:: ${SHLIB_NAME} pkgIndex.tcl
+
$(SHLIB_NAME):: ${OBJS}
${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${TCL_STUB_LIB_SPEC} ${SHLIB_LDFLAGS} ${LIBS}
-all:: ${SHLIB_NAME}
+pkgIndex.tcl:
+ $(SILENT) ../pkg_mkindex.sh .
clean::
- rm -f ${OBJS} ${SHLIB_NAME} so_locations
+ rm -f ${OBJS} ${SHLIB_NAME} so_locations pkgIndex.tcl
distclean:: clean
install:: all
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
- $(SILENT) ../pkg_mkindex.sh ${INSTALLDIR}
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
Property changes on: trunk/base/src/macports1.0
___________________________________________________________________
Modified: svn:ignore
- *.dylib
macports_autoconf.tcl
macports_fastload.tcl
+ *.dylib
macports_autoconf.tcl
macports_fastload.tcl
pkgIndex.tcl
Modified: trunk/base/src/macports1.0/Makefile
===================================================================
--- trunk/base/src/macports1.0/Makefile 2009-05-23 20:03:00 UTC (rev 51381)
+++ trunk/base/src/macports1.0/Makefile 2009-05-23 20:20:58 UTC (rev 51382)
@@ -24,4 +24,4 @@
echo "${TCL_PACKAGE_DIR}" > ${DESTDIR}${prefix}/var/macports/.tclpackage
- $(SILENT) ../pkg_mkindex.sh ${INSTALLDIR}
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
Property changes on: trunk/base/src/package1.0
___________________________________________________________________
Added: svn:ignore
+ pkgIndex.tcl
Modified: trunk/base/src/package1.0/Makefile
===================================================================
--- trunk/base/src/package1.0/Makefile 2009-05-23 20:03:00 UTC (rev 51381)
+++ trunk/base/src/package1.0/Makefile 2009-05-23 20:20:58 UTC (rev 51382)
@@ -5,9 +5,13 @@
include ../../Mk/macports.autoconf.mk
-all::
+all:: pkgIndex.tcl
+pkgIndex.tcl:
+ $(SILENT) ../pkg_mkindex.sh .
+
clean::
+ rm -f pkgIndex.tcl
distclean::
@@ -18,4 +22,4 @@
$(SILENT)set -x; for file in ${SRCS}; do \
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
done
- $(SILENT) ../pkg_mkindex.sh ${INSTALLDIR}
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
Property changes on: trunk/base/src/pextlib1.0
___________________________________________________________________
Modified: svn:ignore
- *.dylib
+ *.dylib
pkgIndex.tcl
Property changes on: trunk/base/src/port1.0
___________________________________________________________________
Modified: svn:ignore
- port_autoconf.tcl
+ port_autoconf.tcl
pkgIndex.tcl
Modified: trunk/base/src/port1.0/Makefile
===================================================================
--- trunk/base/src/port1.0/Makefile 2009-05-23 20:03:00 UTC (rev 51381)
+++ trunk/base/src/port1.0/Makefile 2009-05-23 20:20:58 UTC (rev 51382)
@@ -13,9 +13,13 @@
.PHONY: test
-all::
+all:: pkgIndex.tcl
+pkgIndex.tcl:
+ $(SILENT) ../pkg_mkindex.sh .
+
clean::
+ rm -f pkgIndex.tcl
distclean::
rm -f port_autoconf.tcl
@@ -25,7 +29,7 @@
$(SILENT)set -x; for file in ${SRCS}; do \
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
done
- $(SILENT) ../pkg_mkindex.sh ${INSTALLDIR}
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
test::
${TCLSH} tests/portutil.tcl
Property changes on: trunk/base/src/registry1.0
___________________________________________________________________
Modified: svn:ignore
- registry_autoconf.tcl
+ registry_autoconf.tcl
pkgIndex.tcl
Modified: trunk/base/src/registry1.0/Makefile
===================================================================
--- trunk/base/src/registry1.0/Makefile 2009-05-23 20:03:00 UTC (rev 51381)
+++ trunk/base/src/registry1.0/Makefile 2009-05-23 20:20:58 UTC (rev 51382)
@@ -4,9 +4,13 @@
include ../../Mk/macports.autoconf.mk
-all::
+all:: pkgIndex.tcl
+pkgIndex.tcl:
+ $(SILENT) ../pkg_mkindex.sh .
+
clean::
+ rm -f pkgIndex.tcl
distclean:: clean
rm -f registry_autoconf.tcl
@@ -16,6 +20,6 @@
$(SILENT)set -x; for file in ${SRCS}; do \
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
done
- $(SILENT) ../pkg_mkindex.sh ${INSTALLDIR}
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
test::
Property changes on: trunk/base/src/registry2.0
___________________________________________________________________
Modified: svn:ignore
- registry.dylib
+ registry.dylib
pkgIndex.tcl
Modified: trunk/base/src/registry2.0/Makefile
===================================================================
--- trunk/base/src/registry2.0/Makefile 2009-05-23 20:03:00 UTC (rev 51381)
+++ trunk/base/src/registry2.0/Makefile 2009-05-23 20:20:58 UTC (rev 51382)
@@ -25,4 +25,4 @@
$(SILENT) set -x; for file in ${SRCS}; do \
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}/$$file; \
done
- $(SILENT) ../pkg_mkindex.sh ${INSTALLDIR}
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090523/768e68e3/attachment-0001.html>
More information about the macports-changes
mailing list