[Swift-commit] r7954 - trunk/libexec

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2014-07-04 01:37:53 -0500 (Fri, 04 Jul 2014)
New Revision: 7954

Modified:
   trunk/libexec/
   trunk/libexec/swift-int-wrapper-staging.k
   trunk/libexec/swift-int.k
Log:
removed swift: prefix from properties


Property changes on: trunk/libexec
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/release-0.93/libexec:4761-5122
/branches/release-0.94/libexec:6283-6619,6998-7002,7019
/trunk/libexec:6172,6177,6182,6189-6190,6202-6203,6206-6208,6215-6223,6231-6241,6255-6258,6263,6272,6274-6618
   + /branches/release-0.93/libexec:4761-5122
/branches/release-0.94/libexec:6283-6619,6998-7002,7019
/branches/release-0.95/libexec:7940
/trunk/libexec:6172,6177,6182,6189-6190,6202-6203,6206-6208,6215-6223,6231-6241,6255-6258,6263,6272,6274-6618

Modified: trunk/libexec/swift-int-wrapper-staging.k
===================================================================
--- trunk/libexec/swift-int-wrapper-staging.k	2014-07-04 06:35:22 UTC (rev 7953)
+++ trunk/libexec/swift-int-wrapper-staging.k	2014-07-04 06:37:53 UTC (rev 7954)
@@ -68,9 +68,9 @@
 		log(LOG:INFO, "START dir={dir} host={host}")
 		if(vdl:configProperty("sitedir.keep") == "false") {
 			task:execute(
-				vdl:siteprofile(host, "swift:cleanupCommand"),
+				vdl:siteprofile(host, "cleanupCommand"),
 				arguments = list(
-					siteProfile(host, "swift:cleanupCommandOptions"),
+					siteProfile(host, "cleanupCommandOptions"),
 					dir
 				)
 				host=host, batch=true, TCProfile(host)
@@ -196,9 +196,9 @@
 				if (wrapperMode == "files") {
 					swift:execute(
 						progress, 
-						siteProfile(rhost, "swift:wrapperInterpreter"),
+						siteProfile(rhost, "wrapperInterpreter"),
 						list(
-							siteProfile(rhost, "swift:wrapperInterpreterOptions"),
+							siteProfile(rhost, "wrapperInterpreterOptions"),
 							"_swiftwrap.wrapperstaging",
 							jobid,
 							"-urlprefix", URL_PREFIX,
@@ -217,9 +217,9 @@
 				}
 				if (wrapperMode == "args") {
 					swift:execute(
-						siteProfile(rhost, "swift:wrapperInterpreter"),
+						siteProfile(rhost, "wrapperInterpreter"),
 						list(
-							siteProfile(rhost, "swift:wrapperInterpreterOptions"),
+							siteProfile(rhost, "wrapperInterpreterOptions"),
 							"_swiftwrap.wrapperstaging",
 							jobid,
 							"-urlprefix", URL_PREFIX,

Modified: trunk/libexec/swift-int.k
===================================================================
--- trunk/libexec/swift-int.k	2014-07-04 06:35:22 UTC (rev 7953)
+++ trunk/libexec/swift-int.k	2014-07-04 06:37:53 UTC (rev 7954)
@@ -83,7 +83,7 @@
 			log(LOG:INFO, "START host={rhost} - Initializing shared directory")
 
 			dir:make(SHARED_DIR, host = rhost)
-			transfer(siteProfile(rhost, "swift:wrapperScript"), srcdir="{SWIFT:HOME}/libexec/", destdir=SHARED_DIR, desthost=rhost)
+			transfer(siteProfile(rhost, "wrapperScript"), srcdir="{SWIFT:HOME}/libexec/", destdir=SHARED_DIR, desthost=rhost)
 			transfer("_swiftseq", srcdir="{SWIFT:HOME}/libexec/", destdir=SHARED_DIR, desthost=rhost)
 			dir:make(dircat(RUN_DIR, "kickstart"), host=rhost)
 
@@ -139,8 +139,8 @@
 				host=host, batch=true, TCProfile(host))
 		}
 		if (swift:configProperty("sitedir.keep") == "false") {
-			task:execute(siteProfile(host, "swift:cleanupCommand"),
-				list(siteProfile(host, "swift:cleanupCommandOptions"), dir)
+			task:execute(siteProfile(host, "cleanupCommand"),
+				list(siteProfile(host, "cleanupCommandOptions"), dir)
 				host=host, batch=true, TCProfile(host))
 		}
 		log(LOG:INFO, "END dir={dir} host={host}")
@@ -398,10 +398,10 @@
 				if (wrapperMode == "files") {
 					swift:execute(
 						progress,
-						siteProfile(rhost, "swift:wrapperInterpreter"),
+						siteProfile(rhost, "wrapperInterpreter"),
 						list(
-							siteProfile(rhost, "swift:wrapperInterpreterOptions"),
-							dircat("shared", siteProfile(rhost, "swift:wrapperScript"), os=os),
+							siteProfile(rhost, "wrapperInterpreterOptions"),
+							dircat("shared", siteProfile(rhost, "wrapperScript"), os=os),
 							jobid, "-p", jobdir
 						)
 						directory = RUN_DIR
@@ -416,10 +416,10 @@
 				else if (wrapperMode == "args") {
 					swift:execute(
 						progress,
-						siteProfile(rhost, "swift:wrapperInterpreter"),
+						siteProfile(rhost, "wrapperInterpreter"),
 						list(
-							siteProfile(rhost, "swift:wrapperInterpreterOptions"),
-							dircat("shared", siteProfile(rhost, "swift:wrapperScript"), os=os),
+							siteProfile(rhost, "wrapperInterpreterOptions"),
+							dircat("shared", siteProfile(rhost, "wrapperScript"), os=os),
 							jobid,
 							"-jobdir", jobdir,
 							"-scratch", try(siteProfile(rhost, "scratch"), "")