Use C++ for the portal code; that's cleaner.

Store the Cactus source tree in the executable and output it into the
output directory.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusUtils/Formaline/trunk@6 83718e91-0e4f-0410-abf4-91180603181f

5 files changed, 42 insertions, 6 deletions

diff --git a/README b/README
index 588210f..0d0fee7 100644
--- a/README
+++ b/README
@@ -11,3 +11,9 @@ Send meta information about a run to a server, so that it is kept
 there forever.  The information sent is e.g. the parameter file, date,
 time, machine, and user id of the run, location of the output data,
 number of iterations, an efficiency summary, etc.
+
+
+
+TODO:
+
+unique IDs for all output files
diff --git a/par/output_source.par b/par/output_source.par
new file mode 100644
index 0000000..b0df357
--- /dev/null
+++ b/par/output_source.par
@@ -0,0 +1,6 @@
+# $Header$
+
+Cactus::cctk_itlast = 0
+
+ActiveThorns = "Formaline"
+Formaline::announce_to_portal = no
diff --git a/param.ccl b/param.ccl
index daf2a42..f08a70d 100644
--- a/param.ccl
+++ b/param.ccl
@@ -21,3 +21,13 @@ STRING portal_username "User name on the portal"
 {
   "" :: ""
 } ""
+
+
+
+BOOLEAN output_source "Output a tarball with the cactus source tree"
+{
+} yes
+
+SHARES: IO
+
+USES STRING out_dir
diff --git a/schedule.ccl b/schedule.ccl
index 57889dd..68289c5 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -1,7 +1,20 @@
 # Schedule definitions for thorn Formaline
 # $Header$
 
-SCHEDULE Formaline AT wragh
+if (output_source)
 {
-  LANG: C
-} "Put some meta information about the current run into permanent storage"
+  SCHEDULE Formaline_OutputSource AT wragh
+  {
+    LANG: C
+  } "Output Cactus source tree"
+}
+
+
+
+if (announce_to_portal)
+{
+  SCHEDULE Formaline_Portal AT wragh
+  {
+    LANG: C
+  } "Put some meta information about the current run into permanent storage"
+}
diff --git a/src/util/makeblob.c b/src/util/makeblob.c
index 60de456..46f3446 100644
--- a/src/util/makeblob.c
+++ b/src/util/makeblob.c
@@ -40,6 +40,7 @@ main (int argc, char * * argv)
     
     if (feof (stdin)) break;
   }
+  ++ metacount;
   
   
   
@@ -53,10 +54,10 @@ main (int argc, char * * argv)
   fprintf (metafile, "  size_t * length;\n");
   fprintf (metafile, "};\n");
   fprintf (metafile, "\n");
-  for (count = 0; count <= metacount; ++ count)
+  for (count = 0; count < metacount; ++ count)
   {
     fprintf (metafile, "extern char const cactus_source_%08lu [];\n", count);
-    fprintf (metafile, "extern size_t cactus_source_length_%08lu [];\n", count);
+    fprintf (metafile, "extern size_t cactus_source_length_%08lu;\n", count);
   }
   fprintf (metafile, "\n");
   fprintf (metafile, "struct chunkinfo cactus_source_chunks [] = {");
@@ -70,7 +71,7 @@ main (int argc, char * * argv)
   }
   fprintf (metafile, "\n");
   fprintf (metafile, "};\n");
-  fprintf (metafile, "size_t cactus_source_chunks_length = %lu;\n", metacount + 1);
+  fprintf (metafile, "size_t cactus_source_chunks_length = %lu;\n", metacount);
   fclose (metafile);
   
   return 0;