[Swift-commit] r5137 - in SwiftApps/SwiftR: . Swift/exec Swift/src

[tga at ci.uchicago.edu]

Author: tga
Date: 2011-09-20 14:03:47 -0500 (Tue, 20 Sep 2011)
New Revision: 5137

Removed:
   SwiftApps/SwiftR/Swift/src/download-src.sh
Modified:
   SwiftApps/SwiftR/Makefile
   SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh
   SwiftApps/SwiftR/Swift/src/Makefile
Log:
Extended timeout; included download-src script in makefile, no need to separate

Modified: SwiftApps/SwiftR/Makefile
===================================================================
--- SwiftApps/SwiftR/Makefile	2011-09-20 18:08:01 UTC (rev 5136)
+++ SwiftApps/SwiftR/Makefile	2011-09-20 19:03:47 UTC (rev 5137)
@@ -7,7 +7,7 @@
 
 PKG_FILES += Swift/DESCRIPTION
 PKG_FILES += Swift/NAMESPACE 
-PKG_FILE +=  Swift/src/Makefile Swift/src/make.include Swift/src/download-src.sh
+PKG_FILE +=  Swift/src/Makefile Swift/src/make.include
 PKG_FILES += $(shell find Swift/src/swift-patches -not -path '*/.svn*') 
 
 PACKAGE_DEPS = $(PKG_FILES) Makefile

Modified: SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh
===================================================================
--- SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh	2011-09-20 18:08:01 UTC (rev 5136)
+++ SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh	2011-09-20 19:03:47 UTC (rev 5137)
@@ -108,16 +108,17 @@
 
 RPIDS=
 
-TIMEOUT=5
+TIMEOUT=30
 
 function start_timeout {
     ppid=$$
+    child_pid=$1
     trap "timeout_handler" SIGHUP
     (
     sleep ${TIMEOUT}s
     kill -1 $ppid  &> /dev/null #SIGHUP 
-    if [ "$1" != "" ]; then
-        kill -1 $1  &> /dev/null #SIGHUP 
+    if [ "$child_pid" != "" ]; then
+        kill -1 $child_pid  &> /dev/null #SIGHUP 
     fi
     ) &
 }

Modified: SwiftApps/SwiftR/Swift/src/Makefile
===================================================================
--- SwiftApps/SwiftR/Swift/src/Makefile	2011-09-20 18:08:01 UTC (rev 5136)
+++ SwiftApps/SwiftR/Swift/src/Makefile	2011-09-20 19:03:47 UTC (rev 5137)
@@ -19,13 +19,17 @@
 SWIFT_BIN = $(SWIFT_INST)/bin/swift
 
 
+SHASUM = $(shell if hash shasum &> /dev/null ; then echo shasum ; else echo sha1sum; fi)
 
 all: $(SWIFT_BIN)
 
 $(SWIFT_SRC_NAME)/.downloadedok: 
 	# hack to avoid redoing
 	if [ ! -f $(SWIFT_BIN) ]; then \
-	  sh ./download-src.sh $(SWIFT_SRC_NAME) && \
+	  rm -f $(SWIFT_SRC_NAME).tar.gz && \
+	  wget http://cs.uchicago.edu/~tga/swiftR/swift-source/$(SWIFT_SRC_NAME).tar.gz && \
+    	  $(SHASUM) --check ${SWIFT_SRC_NAME}.shasum && \
+	  tar xvzf ${SWIFT_SRC_NAME}.tar.gz && \
 	  touch $(SWIFT_SRC_NAME)/.downloadedok ; \
 	fi
 
@@ -62,7 +66,7 @@
 $(ANT_DIR)/.downloadedok:
 	rm -f $(ANT_PKG)
 	wget $(ANT_PKG_URL)
-	shasum --check $(ANT_PKG_SHASUM)
+	$(SHASUM) --check $(ANT_PKG_SHASUM)
 	rm -rf $(ANT_DIR)
 	tar xjf $(ANT_PKG)
 	touch $(ANT_DIR)/.downloadedok

Deleted: SwiftApps/SwiftR/Swift/src/download-src.sh
===================================================================
--- SwiftApps/SwiftR/Swift/src/download-src.sh	2011-09-20 18:08:01 UTC (rev 5136)
+++ SwiftApps/SwiftR/Swift/src/download-src.sh	2011-09-20 19:03:47 UTC (rev 5137)
@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-SWIFT_SRC_NAME=$1
-
-if [ "$SWIFT_SRC_NAME" = "" ] ; then
-    echo Package name not specified
-    exit 1
-fi
-
-rm -f ${SWIFT_SRC_NAME}.tar.gz
-wget http://cs.uchicago.edu/~tga/swiftR/swift-source/${SWIFT_SRC_NAME}.tar.gz
-shasum --check ${SWIFT_SRC_NAME}.shasum
-
-tar xvzf ${SWIFT_SRC_NAME}.tar.gz