Changeset 23232


Ignore:
Timestamp:
Mar 27, 2007, 8:07:15 PM (13 years ago)
Author:
jmpp@…
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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/release_1_4/base/Makefile.in

    r23202 r23232  
    5757
    5858_gettag:
    59         cd ${DISTDIR}; svn co ${SVNURL}/tags/${SVNTAG} ${REPOPATH}
    60         cd ${DISTDIR}; mv ${REPOPATH} ${PKGNAME}; rm -Rf macports
     59        cd ${DISTDIR}; svn co ${SVNURL}/tags/${SVNTAG} ${PKGNAME}
    6160
    6261_pkgdist:
     
    7271        [ -d ${DISTDIR} ] || mkdir ${DISTDIR}
    7372        rm -f ${DISTDIR}/${DISTNAME}.chk.txt
    74         ${MAKE} PKGNAME=${DISTNAME} REPOPATH=macports/base SVNTAG=${DISTTAG} _dopkg
     73        ${MAKE} SVNTAG=${DISTTAG}/base/ PKGNAME=${DISTNAME} _dopkg
    7574ifeq ($(ARC),yes)
    76         ${MAKE} PKGNAME=${DISTARCNAME} REPOPATH=macports SVNTAG=${DISTARCTAG} _dopkg
     75        ${MAKE} SVNTAG=${DISTARCTAG} PKGNAME=${DISTARCNAME} _dopkg
    7776endif
    7877
Note: See TracChangeset for help on using the changeset viewer.