[102563] trunk/base/src/package1.0

4 Feb 2013

Revision: 102563
          https://trac.macports.org/changeset/102563
Author:   snc@macports.org
Date:     2013-02-04 14:07:01 -0800 (Mon, 04 Feb 2013)
Log Message:
-----------
port{mpkg,mdmg}.tcl: abstract-out mpkg_path, epoch_namestr and revision_namestr

Modified Paths:
--------------
    trunk/base/src/package1.0/portmdmg.tcl
    trunk/base/src/package1.0/portmpkg.tcl

Modified: trunk/base/src/package1.0/portmdmg.tcl
===================================================================

--- trunk/base/src/package1.0/portmdmg.tcl	2013-02-04 21:32:25 UTC (rev 102562)
+++ trunk/base/src/package1.0/portmdmg.tcl	2013-02-04 22:07:01 UTC (rev 102563)
@@ -45,7 +45,7 @@
 set_ui_prefix
 
 proc portmdmg::mdmg_main {args} {
-    global subport version revision package.destpath UI_PREFIX
+    global subport epoch version revision package.destpath UI_PREFIX
 
     ui_msg "$UI_PREFIX [format [msgcat::mc "Creating disk image for %s-%s"] ${subport} ${version}]"
 
@@ -53,10 +53,10 @@
 		seteuid 0; setegid 0
 	}
 
-    return [package_mdmg $subport $version $revision]
+    return [package_mdmg $subport $epoch $version $revision]
 }
 
-proc portmdmg::package_mdmg {portname portversion portrevision} {
+proc portmdmg::package_mdmg {portname portepoch portversion portrevision} {
     global UI_PREFIX package.destpath portpath
     global os.platform os.arch os.version os.major
 
@@ -68,7 +68,7 @@
 
     set tmp_image ${package.destpath}/${imagename}.tmp.dmg
     set final_image ${package.destpath}/${imagename}.dmg
-    set mpkgpath ${package.destpath}/${portname}-${portversion}_${portrevision}.mpkg
+    set mpkgpath [portmpkg::mpkg_path $portname $portepoch $portversion $portrevision]
 
     if {[file readable $final_image] && ([file mtime ${final_image}] >= [file mtime ${portpath}/Portfile])} {
         ui_msg "$UI_PREFIX [format [msgcat::mc "Disk Image for %s-%s is up-to-date"] ${portname} ${portversion}]"

Modified: trunk/base/src/package1.0/portmpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portmpkg.tcl	2013-02-04 21:32:25 UTC (rev 102562)
+++ trunk/base/src/package1.0/portmpkg.tcl	2013-02-04 22:07:01 UTC (rev 102563)
@@ -120,19 +120,37 @@
     }
 }
 
-proc portmpkg::package_mpkg {portname portepoch portversion portrevision} {
-    global portdbpath os.major destpath workpath prefix porturl description package.destpath package.flat long_description homepage depends_run depends_lib
-
+proc portmpkg::epoch_namestr {portepoch} {
     set portepoch_namestr ""
     if {${portepoch} != "0"} {
         set portepoch_namestr "${portepoch}_"
     }
+    return ${portepoch_namestr}
+}
+
+proc portmpkg::revision_namestr {portrevision} {
     set portrevision_namestr ""
     if {${portrevision} != "0"} {
         set portrevision_namestr "_${portrevision}"
     }
+    return ${portrevision_namestr}
+}
+
+proc portmpkg::mpkg_path {portname portepoch portversion portrevision} {
+    global package.destpath
+    set portepoch_namestr [portmpkg::epoch_namestr ${portepoch}]
+    set portrevision_namestr [portmpkg::revision_namestr ${portrevision}]
     set mpkgpath ${package.destpath}/${portname}-${portepoch_namestr}${portversion}${portrevision_namestr}.mpkg
+    return $mpkgpath
+}
 
+proc portmpkg::package_mpkg {portname portepoch portversion portrevision} {
+    global portdbpath os.major destpath workpath prefix porturl description package.destpath package.flat long_description homepage depends_run depends_lib
+
+    set mpkgpath [portmpkg::mpkg_path $portname $portepoch $portversion $portrevision]
+
+    set portepoch_namestr [portmpkg::epoch_namestr ${portepoch}]
+    set portrevision_namestr [portmpkg::revision_namestr ${portrevision}]
     if {${package.flat} && ${os.major} >= 10} {
         set pkgpath ${package.destpath}/${portname}-${portepoch_namestr}${portversion}${portrevision_namestr}-component.pkg
         set packages_path ${workpath}/mpkg_packages

    

[102563] trunk/base/src/package1.0

snc＠macports.org