[23232] branches/release_1_4/base/Makefile.in
source_changes at macosforge.org
source_changes at macosforge.org
Tue Mar 27 13:07:15 PDT 2007
Revision: 23232
http://trac.macosforge.org/projects/macports/changeset/23232
Author: jmpp at macports.org
Date: 2007-03-27 13:07:15 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
Reworking the "distfromsvn" target: the distribution tarball for our base sources was being created with redundancy
in the resulting ${PKGNAME}/base/base path due to the now gone "REPOPATH=macports/base" variable passed to the
"_gettag" target and the base directory in every release branch (how on earth did it work before without manual
intervention?); said tarball would cause the MacPorts Portfile to fail without additional tweaking (albeit simple).
I was lucky enough to produce working 1.4 release tarballs 'cause I omitted the "base" directory level when first
creating the release_1_4 branch (now fixed by eridius). No longer needing the REPOPATH variable to discern between a
base tarball and a full "archive" one (now done through the "${DISTTAG}/base/" value of the "SVNTAG" variable for the
first tarball), some other minor cleanups are also in order.
Modified Paths:
--------------
branches/release_1_4/base/Makefile.in
Modified: branches/release_1_4/base/Makefile.in
===================================================================
--- branches/release_1_4/base/Makefile.in 2007-03-27 19:55:57 UTC (rev 23231)
+++ branches/release_1_4/base/Makefile.in 2007-03-27 20:07:15 UTC (rev 23232)
@@ -56,8 +56,7 @@
rm -f Makefile Mk/dports.autoconf.mk
_gettag:
- cd ${DISTDIR}; svn co ${SVNURL}/tags/${SVNTAG} ${REPOPATH}
- cd ${DISTDIR}; mv ${REPOPATH} ${PKGNAME}; rm -Rf macports
+ cd ${DISTDIR}; svn co ${SVNURL}/tags/${SVNTAG} ${PKGNAME}
_pkgdist:
cd ${DISTDIR}; COPY_EXTENDED_ATTRIBUTES_DISABLE=true tar --exclude .svn -c ${PKGNAME} | gzip > ${PKGNAME}.tar.gz
@@ -71,9 +70,9 @@
@[ -n "${DISTVER}" ] || ( echo Must specify DISTVER, like: make DISTVER=1.4 dist; exit 1 )
[ -d ${DISTDIR} ] || mkdir ${DISTDIR}
rm -f ${DISTDIR}/${DISTNAME}.chk.txt
- ${MAKE} PKGNAME=${DISTNAME} REPOPATH=macports/base SVNTAG=${DISTTAG} _dopkg
+ ${MAKE} SVNTAG=${DISTTAG}/base/ PKGNAME=${DISTNAME} _dopkg
ifeq ($(ARC),yes)
- ${MAKE} PKGNAME=${DISTARCNAME} REPOPATH=macports SVNTAG=${DISTARCTAG} _dopkg
+ ${MAKE} SVNTAG=${DISTARCTAG} PKGNAME=${DISTARCNAME} _dopkg
endif
test::
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070327/7ebae5c6/attachment.html
More information about the macports-changes
mailing list