[Swift-commit] r4039 - in SwiftApps/SwiftR: . Swift Swift/man

[noreply at svn.ci.uchicago.edu]

Author: tga
Date: 2011-01-26 16:09:49 -0600 (Wed, 26 Jan 2011)
New Revision: 4039

Modified:
   SwiftApps/SwiftR/Makefile
   SwiftApps/SwiftR/Swift/DESCRIPTION
   SwiftApps/SwiftR/Swift/man/Swift-package.Rd
Log:
Updated Makefile so that it doesn't misbehaving when swift is not in path.
Updated version to 0.1.1 for release.


Modified: SwiftApps/SwiftR/Makefile
===================================================================
--- SwiftApps/SwiftR/Makefile	2011-01-26 21:41:58 UTC (rev 4038)
+++ SwiftApps/SwiftR/Makefile	2011-01-26 22:09:49 UTC (rev 4039)
@@ -2,21 +2,25 @@
 # Extract the version number from the R package description file
 # There should be a line in the file of the form:
 # Version: (major).(minor)
-SWIFTR_VERSION=$(shell sed -n -r 's/^Version:(\W*)([[:digit:]]+\.[[:digit:]])/\2/p' Swift/DESCRIPTION)
+SWIFTR_VERSION=$(shell sed -n -r 's/^Version:(\W*)([[:digit:]]+\.[[:digit:].]+)/\2/p' Swift/DESCRIPTION)
 
 SW := $(shell which swift)
-SWIFT_PATH := $(shell cd `dirname $(SW)`/..; pwd)
 
 TBALL=Swift_$(SWIFTR_VERSION).tar.gz
 
+
 all: build
 
 
+
 build: Swift/inst/swift/bin/swift
 	R CMD build Swift
 
 # Target to make sure that swift exists
 Swift/inst/swift/bin/swift:
+	SWD := $(shell dirname $(SW))
+	SWIFT_PATH := $(shell cd $(SWD)/..; pwd)
+	$(if $(SW),, $(error swift could not be found using which))
 	mkdir -p Swift/inst/swift
 	cp -pr $(SWIFT_PATH)/* Swift/inst/swift
 

Modified: SwiftApps/SwiftR/Swift/DESCRIPTION
===================================================================
--- SwiftApps/SwiftR/Swift/DESCRIPTION	2011-01-26 21:41:58 UTC (rev 4038)
+++ SwiftApps/SwiftR/Swift/DESCRIPTION	2011-01-26 22:09:49 UTC (rev 4039)
@@ -1,7 +1,7 @@
 Package: Swift
 Type: Package
 Title: R interface to Swift parallel scripting languaage
-Version: 0.2
+Version: 0.1.1
 Date: 2010-02-25
 Author: Michael Wilde
 Maintainer: Michael Wilde <wilde at mcs.anl.gov>

Modified: SwiftApps/SwiftR/Swift/man/Swift-package.Rd
===================================================================
--- SwiftApps/SwiftR/Swift/man/Swift-package.Rd	2011-01-26 21:41:58 UTC (rev 4038)
+++ SwiftApps/SwiftR/Swift/man/Swift-package.Rd	2011-01-26 22:09:49 UTC (rev 4039)
@@ -27,8 +27,8 @@
 \tabular{ll}{
 Package: \tab Swift\cr
 Type: \tab Package\cr
-Version: \tab 0.2.0\cr
-Date: \tab 2011-01-21\cr
+Version: \tab 0.1.1\cr
+Date: \tab 2011-01-26\cr
 License: \tab Globus Toolkit Public License v3 (based on Apache License 2.0):
 http://www.globus.org/toolkit/legal/4.0/license-v3.html \cr
 LazyLoad: \tab yes\cr