[137671] branches/gsoc15-portfile
chunyang at macports.org
chunyang at macports.org
Tue Jun 16 22:20:21 PDT 2015
Revision: 137671
https://trac.macports.org/changeset/137671
Author: chunyang at macports.org
Date: 2015-06-16 22:20:21 -0700 (Tue, 16 Jun 2015)
Log Message:
-----------
port-create: Rename file, remove .tcl suffix
Modified Paths:
--------------
branches/gsoc15-portfile/Makefile
branches/gsoc15-portfile/Portfile.template
branches/gsoc15-portfile/port-create.test
Added Paths:
-----------
branches/gsoc15-portfile/port-create
Removed Paths:
-------------
branches/gsoc15-portfile/port-create.tcl
Modified: branches/gsoc15-portfile/Makefile
===================================================================
--- branches/gsoc15-portfile/Makefile 2015-06-17 04:53:21 UTC (rev 137670)
+++ branches/gsoc15-portfile/Makefile 2015-06-17 05:20:21 UTC (rev 137671)
@@ -1,8 +1,8 @@
tclsh=/opt/local/libexec/macports/bin/tclsh8.5
-run: port-create.tcl
- $(tclsh) port-create.tcl -url https://www.kernel.org/pub/software/scm/git/git-2.4.2.tar.gz
- $(tclsh) port-create.tcl -url https://www.kernel.org/pub/software/scm/git/git-2.4.2.tar.gz -name foo -version 1.0
+run: port-create
+ $(tclsh) port-create -url https://www.kernel.org/pub/software/scm/git/git-2.4.2.tar.gz
+ $(tclsh) port-create -url https://www.kernel.org/pub/software/scm/git/git-2.4.2.tar.gz -name foo -version 1.0
-test: port-create.tcl all.tcl port-create.test
+test: port-create all.tcl port-create.test
$(tclsh) all.tcl
Modified: branches/gsoc15-portfile/Portfile.template
===================================================================
--- branches/gsoc15-portfile/Portfile.template 2015-06-17 04:53:21 UTC (rev 137670)
+++ branches/gsoc15-portfile/Portfile.template 2015-06-17 05:20:21 UTC (rev 137671)
@@ -3,14 +3,17 @@
PortSystem 1.0
-name __PortName__
-version __PortVersion__
-maintainers __MaintainerHandle__
+name PortName
+version PortVersion
+categories Categories
+platforms darwin
+license License
+maintainers MaintainerHandle
+description Description
+long_description LongDescription
+homepage Homepage
-categories __Categories__
-description __Description__
-long_description __LongDescription__
+master_sites MasterSites
-platforms darwin
-
-homepage __Homepage__
+checksums rmd160 RMD160 \
+ sha256 SHA256
Copied: branches/gsoc15-portfile/port-create (from rev 137581, branches/gsoc15-portfile/port-create.tcl)
===================================================================
--- branches/gsoc15-portfile/port-create (rev 0)
+++ branches/gsoc15-portfile/port-create 2015-06-17 05:20:21 UTC (rev 137671)
@@ -0,0 +1,88 @@
+#!/usr/bin/env tclsh
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+# Create Portfile
+#
+# Workflow:
+# 1. Gather metadata
+# 2. Feed template
+# 3. Print result
+
+# Get tarball filename from tarball URL
+proc get_tarball_filename {url} {
+ set length [string length $url]
+ set last [string last "/" $url]
+ incr last; # Discard prefix "/"
+ return [string range $url $last $length]
+}
+
+# Get name from tarball filename
+proc get_name {tarball} {
+ set last_dash [string last "-" $tarball]
+ incr last_dash -1; # Discard suffix "-"
+ return [string range $tarball 0 $last_dash]
+}
+
+# Get version from tarball filename
+proc get_version {tarball} {
+ set rtv [regexp {(\d+\.)?(\d+\.)?(\*|\d+)} $tarball match]
+ if {$rtv == 1} {
+ return $match
+ } else {
+ return 0
+ }
+}
+
+proc read_template {file} {
+ set fp [open $file r]
+ set template [read $fp]
+ close $fp
+ return $template
+}
+
+proc feed_template {template metadata} {
+ return $template
+}
+
+puts $argv0
+
+set name ""
+set version ""
+
+package require cmdline
+set options {
+ {url.arg "" "set the tarball URL of port"}
+ {name.arg "" "set the name of port"}
+ {version.arg "" "set the version of port"}
+}
+set usage ": $argv0 \[-url <url>] \[-name <name>] \[-version <version>]\noptions:"
+if {[catch {array set params [cmdline::getoptions ::argv $options $usage]}]} {
+ puts [cmdline::usage $options $usage]
+ exit 2
+}
+
+if {[expr {[string length $params(url)] > 0}]} {
+ set tarball [get_tarball_filename $params(url)]
+ set name [get_name $tarball]
+ set version [get_version $tarball]
+}
+
+if {[expr {[string length $params(name)] > 0}]} {
+ set name $params(name)
+}
+
+if {[expr {[string length $params(version)] > 0}]} {
+ set version $params(version)
+}
+
+set template [read_template "./Portfile.template"]
+
+if {$name ne""} {
+ set template [string map "PortName $name" $template]
+}
+if {$version ne ""} {
+ set template [string map "PortVersion $version" $template]
+}
+
+puts -nonewline $template
Deleted: branches/gsoc15-portfile/port-create.tcl
===================================================================
--- branches/gsoc15-portfile/port-create.tcl 2015-06-17 04:53:21 UTC (rev 137670)
+++ branches/gsoc15-portfile/port-create.tcl 2015-06-17 05:20:21 UTC (rev 137671)
@@ -1,87 +0,0 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id$
-
-# Create Portfile
-#
-# Workflow:
-# 1. Gather metadata
-# 2. Feed template
-# 3. Print result
-
-# Get tarball filename from tarball URL
-proc get_tarball_filename {url} {
- set length [string length $url]
- set last [string last "/" $url]
- incr last; # Discard prefix "/"
- return [string range $url $last $length]
-}
-
-# Get name from tarball filename
-proc get_name {tarball} {
- set last_dash [string last "-" $tarball]
- incr last_dash -1; # Discard suffix "-"
- return [string range $tarball 0 $last_dash]
-}
-
-# Get version from tarball filename
-proc get_version {tarball} {
- set rtv [regexp {(\d+\.)?(\d+\.)?(\*|\d+)} $tarball match]
- if {$rtv == 1} {
- return $match
- } else {
- return 0
- }
-}
-
-proc read_template {file} {
- set fp [open $file r]
- set template [read $fp]
- close $fp
- return $template
-}
-
-proc feed_template {template metadata} {
- return $template
-}
-
-if {[string equal $argv0 port-create.tcl]} {
- set name ""
- set version ""
-
- package require cmdline
- set options {
- {url.arg "" "set the tarball URL of port"}
- {name.arg "" "set the name of port"}
- {version.arg "" "set the version of port"}
- }
- set usage ": $argv0 \[-url <url>] \[-name <name>] \[-version <version>]\noptions:"
- if {[catch {array set params [cmdline::getoptions ::argv $options $usage]}]} {
- puts [cmdline::usage $options $usage]
- exit 2
- }
-
- if {[expr {[string length $params(url)] > 0}]} {
- set tarball [get_tarball_filename $params(url)]
- set name [get_name $tarball]
- set version [get_version $tarball]
- }
-
- if {[expr {[string length $params(name)] > 0}]} {
- set name $params(name)
- }
-
- if {[expr {[string length $params(version)] > 0}]} {
- set version $params(version)
- }
-
- set template [read_template "./Portfile.template"]
-
- if {$name ne""} {
- set template [string map "__PortName__ $name" $template]
- }
- if {$version ne ""} {
- set template [string map "__PortVersion__ $version" $template]
- }
-
- puts $template
-}
Modified: branches/gsoc15-portfile/port-create.test
===================================================================
--- branches/gsoc15-portfile/port-create.test 2015-06-17 04:53:21 UTC (rev 137670)
+++ branches/gsoc15-portfile/port-create.test 2015-06-17 05:20:21 UTC (rev 137671)
@@ -4,7 +4,7 @@
package require tcltest
namespace import ::tcltest::*
-source port-create.tcl
+source port-create
test get_simple_name_version {} -body {
set tarball [get_tarball_filename https://www.kernel.org/pub/software/scm/git/git-2.4.2.tar.gz]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150616/e43bfdd2/attachment.html>
More information about the macports-changes
mailing list