[Swift-commit] r2690 - in provenancedb: . etc

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2009-03-16 08:19:11 -0500 (Mon, 16 Mar 2009)
New Revision: 2690

Added:
   provenancedb/etc/
   provenancedb/etc/provenance.config.ci
   provenancedb/etc/provenance.config.soju
Removed:
   provenancedb/paths.source.ci
   provenancedb/paths.source.soju
Modified:
   provenancedb/provenance.xml
   provenancedb/swift-prov-import-all-logs
Log:
Change paths.source in base directory into a config file in etc/

Copied: provenancedb/etc/provenance.config.ci (from rev 2689, provenancedb/paths.source.ci)
===================================================================
--- provenancedb/etc/provenance.config.ci	                        (rev 0)
+++ provenancedb/etc/provenance.config.ci	2009-03-16 13:19:11 UTC (rev 2690)
@@ -0,0 +1,8 @@
+# file to source that sets variables for the various paths that are
+# presently hardcoded
+
+# this is the path to log repo on benc's laptop
+export LOGREPO=~/swift-logs/
+
+# export SQLCMD="psql -p 5435 -d provdb "
+

Copied: provenancedb/etc/provenance.config.soju (from rev 2689, provenancedb/paths.source.soju)
===================================================================
--- provenancedb/etc/provenance.config.soju	                        (rev 0)
+++ provenancedb/etc/provenance.config.soju	2009-03-16 13:19:11 UTC (rev 2690)
@@ -0,0 +1,10 @@
+# file to source that sets variables for the various paths that are
+# presently hardcoded
+
+# this is the path to log repo on benc's laptop
+export LOGREPO=/Users/benc/work/everylog/
+export IDIR=/Users/benc/work/everylog/
+
+export SQLCMD="sqlite3 provdb "
+# export SQLCMD="psql -p 5435 -d provdb "
+

Deleted: provenancedb/paths.source.ci
===================================================================
--- provenancedb/paths.source.ci	2009-03-16 13:17:59 UTC (rev 2689)
+++ provenancedb/paths.source.ci	2009-03-16 13:19:11 UTC (rev 2690)
@@ -1,8 +0,0 @@
-# file to source that sets variables for the various paths that are
-# presently hardcoded
-
-# this is the path to log repo on benc's laptop
-export LOGREPO=~/swift-logs/
-
-# export SQLCMD="psql -p 5435 -d provdb "
-

Deleted: provenancedb/paths.source.soju
===================================================================
--- provenancedb/paths.source.soju	2009-03-16 13:17:59 UTC (rev 2689)
+++ provenancedb/paths.source.soju	2009-03-16 13:19:11 UTC (rev 2690)
@@ -1,10 +0,0 @@
-# file to source that sets variables for the various paths that are
-# presently hardcoded
-
-# this is the path to log repo on benc's laptop
-export LOGREPO=/Users/benc/work/everylog/
-export IDIR=/Users/benc/work/everylog/
-
-export SQLCMD="sqlite3 provdb "
-# export SQLCMD="psql -p 5435 -d provdb "
-

Modified: provenancedb/provenance.xml
===================================================================
--- provenancedb/provenance.xml	2009-03-16 13:17:59 UTC (rev 2689)
+++ provenancedb/provenance.xml	2009-03-16 13:19:11 UTC (rev 2690)
@@ -171,9 +171,9 @@
 probably work under Linux.
 </para>
 <para>
-Now create a <filename>paths.source</filename> file to define local
+Now create a <filename>etc/provenance.config</filename> file to define local
 configuration. An example that I use on my laptop is present in
-<filename>paths.source.soju</filename>.
+<filename>provenance.config.soju</filename>.
 The <literal>SQLCMD</literal> indicates which command to run for SQL
 access. This is used by other scripts to access the database. The
 <literal>LOGREPO</literal> and <literal>IDIR</literal> variables should

Modified: provenancedb/swift-prov-import-all-logs
===================================================================
--- provenancedb/swift-prov-import-all-logs	2009-03-16 13:17:59 UTC (rev 2689)
+++ provenancedb/swift-prov-import-all-logs	2009-03-16 13:19:11 UTC (rev 2690)
@@ -5,7 +5,7 @@
 # we need to keep this out of the log-proceesing dir because import
 # of individual runs will clean other files.
 
-source paths.source
+source $PROVDIR/etc/provenance.config
 export PATH=$PROVDIR:$PATH
 
 swift-plot-log $LOGREPO everylog-vs-versions.data