[Swift-commit] r4919 - in trunk: . bin/grid

[wilde at ci.uchicago.edu]

Author: wilde
Date: 2011-08-01 11:52:35 -0500 (Mon, 01 Aug 2011)
New Revision: 4919

Modified:
   trunk/bin/grid/TODO
   trunk/build.xml
Log:
Reinstitute the merging of the bin/grid source dir into the bin/ distribution dir. Updated TODO notes as well.

Modified: trunk/bin/grid/TODO
===================================================================
--- trunk/bin/grid/TODO	2011-08-01 14:34:55 UTC (rev 4918)
+++ trunk/bin/grid/TODO	2011-08-01 16:52:35 UTC (rev 4919)
@@ -1,7 +1,6 @@
 
+EXTENCI APPLICATION WORK
 
-ExTENCI Exec
-
 create modft install & test file; test under fork and work
 
 run sites gen
@@ -26,15 +25,15 @@
 
 FEATURES
 
-Add site secltion option to foreachsite
+- Add site selection option to foreachsite
 
-(Swift feature: foreach site in siwift?_)
-
 CLEANUP
 
-Find all interim p-baked tools under swift/lab/osg and place under grid/ for development
+- Find all interim tools under swift/lab/osg and place under grid/ for development
 
-Find Glen's tgsites command and integrate
+ENHANCEMENTS
 
-Merge in gstar
+- Find Glen's tgsites command and integrate
 
+- incorporate gstar (would be a good Globus Online feature)
+

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2011-08-01 14:34:55 UTC (rev 4918)
+++ trunk/build.xml	2011-08-01 16:52:35 UTC (rev 4919)
@@ -75,8 +75,8 @@
 		<copy todir="${dist.dir}/libexec">
 			<fileset dir="${cog.dir}/modules/${module.name}/libexec"/>
 		</copy>
-		<copy todir="${dist.dir}/bin">
-			<fileset dir="${cog.dir}/modules/${module.name}/bin"/>
+		<copy todir="${dist.dir}/bin" flatten="true">
+			<fileset dir="${cog.dir}/modules/${module.name}/bin" excludes="grid/TODO,grid/README"/>
 		</copy>
 		<copy todir="${dist.dir}/lib/perl">
 			<fileset dir="${cog.dir}/modules/${module.name}/lib/perl"/>
@@ -94,9 +94,8 @@
 				<include name="stop-coaster-service"/>
 			</fileset>
 		</chmod>
-		
 		<chmod perm="+x">
-			<fileset dir="${dist.dir}/bin/grid">
+			<fileset dir="${dist.dir}/bin">
 				<include name="foreachsite"/>
 				<include name="gen_gridsites"/>
 				<include name="get_greensites"/>