[Swift-commit] r7140 - in SwiftApps/tryswift: . config

Sun Oct 6 21:22:49 CDT 2013

Author: davidk
Date: 2013-10-06 21:22:49 -0500 (Sun, 06 Oct 2013)
New Revision: 7140

Added:
   SwiftApps/tryswift/pushTo.sh
Modified:
   SwiftApps/tryswift/config/sites.xml
   SwiftApps/tryswift/config/tc.data
   SwiftApps/tryswift/getfiles.php
   SwiftApps/tryswift/index.php
   SwiftApps/tryswift/tryswift.php
Log:
Changes to configuration for running on swiftvm1


Modified: SwiftApps/tryswift/config/sites.xml
===================================================================

--- SwiftApps/tryswift/config/sites.xml	2013-10-07 01:15:08 UTC (rev 7139)
+++ SwiftApps/tryswift/config/sites.xml	2013-10-07 02:22:49 UTC (rev 7140)
@@ -1,9 +1,10 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
    <pool handle="local">
       <execution provider="local" url="none"/>
       <profile namespace="karajan" key="jobThrottle">0</profile>
       <profile namespace="karajan" key="initialScore">10000</profile>
       <filesystem provider="local"/>
-      <workdirectory>/home/davidk/work</workdirectory>
+      <workdirectory>/home/tryswift/swiftwork</workdirectory>
    </pool>
 </config>

Modified: SwiftApps/tryswift/config/tc.data
===================================================================
--- SwiftApps/tryswift/config/tc.data	2013-10-07 01:15:08 UTC (rev 7139)
+++ SwiftApps/tryswift/config/tc.data	2013-10-07 02:22:49 UTC (rev 7140)
@@ -5,5 +5,5 @@
 local paste /usr/bin/paste
 local wc /usr/bin/wc
 local sleep /bin/sleep
-local simulate /home/davidk/tryswift/bin/simulate.sh
-local stats /home/davidk/tryswift/bin/stats.sh
+local simulate /home/tryswift/tryswift/bin/simulate.sh
+local stats /home/tryswift/tryswift/bin/stats.sh

Modified: SwiftApps/tryswift/getfiles.php
===================================================================
--- SwiftApps/tryswift/getfiles.php	2013-10-07 01:15:08 UTC (rev 7139)
+++ SwiftApps/tryswift/getfiles.php	2013-10-07 02:22:49 UTC (rev 7140)
@@ -1,8 +1,7 @@
 <?PHP
 
 $dir = $_POST['dir'];
-$web_directory = "/home/davidk/tryswift";
-$cmd = "PATH=/usr/bin:/bin:\$PATH /home/tryswift/swift-0.94.1-RC2/bin/swift -sites.file sites.xml -tc.file tc.data script.swift";
+$web_directory = "/home/tryswift/tryswift";
 chdir("$web_directory/$dir");
 system("$web_directory/waitswift.sh");
 
@@ -30,7 +29,7 @@
            substr($file, -7) != ".swiftx" &&
            substr($file, -4) != ".log"
 	) {
-           print "<div class=\"span2\"><a href=\"$dir/$file\" target=\"_new\">$file</a> [" . filesize($file) . " bytes]</div>\n";
+           print "<div class=\"span2\"><a href=\"$dir/$file\" target=\"_blank\">$file</a> [" . filesize($file) . " bytes]</div>\n";
          }
 }
 ?>

Modified: SwiftApps/tryswift/index.php
===================================================================
--- SwiftApps/tryswift/index.php	2013-10-07 01:15:08 UTC (rev 7139)
+++ SwiftApps/tryswift/index.php	2013-10-07 02:22:49 UTC (rev 7140)
@@ -8,13 +8,6 @@
 
    <body>
       <div class="container-fluid">
-<!--
-         <div class="row-fluid">
-            <div id="header" class="span12">
-               <h2>Try Swift</h2>
-            </div>
-         </div>
--->
 
          <!-- Script navigation -->
          <div class="row-fluid">

Added: SwiftApps/tryswift/pushTo.sh
===================================================================
--- SwiftApps/tryswift/pushTo.sh	                        (rev 0)
+++ SwiftApps/tryswift/pushTo.sh	2013-10-07 02:22:49 UTC (rev 7140)
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+dst=$1
+
+if [ -z "$dst" ]; then
+   echo Usage: pushTo.sh destination
+   exit 1
+fi
+
+if [ ! -d "$dst" ]; then
+  echo Directory $dst does not exist
+  exit 1
+fi
+
+echo Copying from $src to $dst
+rsync -r --exclude=.svn --exclude=pushTo.sh $src/* $dst


Property changes on: SwiftApps/tryswift/pushTo.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: SwiftApps/tryswift/tryswift.php
===================================================================
--- SwiftApps/tryswift/tryswift.php	2013-10-07 01:15:08 UTC (rev 7139)
+++ SwiftApps/tryswift/tryswift.php	2013-10-07 02:22:49 UTC (rev 7140)
@@ -6,8 +6,8 @@
    }
 
    $source = $_POST['source'];
-   $web_directory = "/home/davidk/tryswift";
-   $swift_cmd = "PATH=/usr/bin:/bin:\$PATH nohup /home/davidk/swift-0.94/cog/modules/swift/dist/swift-svn/bin/swift -sites.file sites.xml -tc.file tc.data -config cf script.swift";
+   $web_directory = "/home/tryswift/tryswift";
+   $swift_cmd = "nohup /home/tryswift/swift-trunk/cog/modules/swift/dist/swift-svn/bin/swift -sites.file sites.xml -tc.file tc.data -config cf script.swift";
 
    # Create directory structure
    $unique = uniqid();


