[cig-commits] r4008 - in cs/pythia/trunk: . blade elc journal
merlin merlin/projects merlin/projects/python pulse
pyre/inventory/odb
leif at geodynamics.org
leif at geodynamics.org
Tue Jul 11 13:38:42 PDT 2006
Author: leif
Date: 2006-07-11 13:38:41 -0700 (Tue, 11 Jul 2006)
New Revision: 4008
Added:
cs/pythia/trunk/blade/__vault__.odb
cs/pythia/trunk/blade/blade.pml
cs/pythia/trunk/blade/toolkits/
cs/pythia/trunk/elc/__vault__.odb
cs/pythia/trunk/elc/ice.odb
cs/pythia/trunk/elc/mpi.odb
cs/pythia/trunk/elc/serial.odb
cs/pythia/trunk/idd/
cs/pythia/trunk/ipa/
cs/pythia/trunk/journal/__vault__.odb
cs/pythia/trunk/journal/console.odb
cs/pythia/trunk/journal/file.odb
cs/pythia/trunk/journal/remote.odb
cs/pythia/trunk/merlin/__vault__.odb
cs/pythia/trunk/merlin/actions/
cs/pythia/trunk/merlin/autoconf/
cs/pythia/trunk/merlin/compilers/
cs/pythia/trunk/merlin/include/
cs/pythia/trunk/merlin/languages/
cs/pythia/trunk/merlin/platforms/
cs/pythia/trunk/merlin/projects/__vault__.odb
cs/pythia/trunk/merlin/projects/code.odb
cs/pythia/trunk/merlin/projects/python/__vault__.odb
cs/pythia/trunk/merlin/projects/python/package.odb
cs/pythia/trunk/pulse/__vault__.odb
cs/pythia/trunk/pulse/bath.odb
cs/pythia/trunk/pulse/heaviside.odb
cs/pythia/trunk/pyre/inventory/odb/prefix.py
cs/pythia/trunk/weaver/
Removed:
cs/pythia/trunk/pyre/inventory/odb/prefix-template.py
Modified:
cs/pythia/trunk/journal/__init__.py
Log:
Removed warning for _journal. Fixed 'prefix.py' and
copied '.pml' and '.odb' (etc) files from Pythia v0.8,
overlaying them on top of the Python packages. The
'hello.py' example now runs without errors. You can
"install" this rogue Pythia by simply checking it out
and adding it to your PYTHONPATH.
Copied: cs/pythia/trunk/blade/__vault__.odb (from rev 4007, vendor/pythia/v0.8/packages/blade/etc/__vault__.odb)
Copied: cs/pythia/trunk/blade/blade.pml (from rev 4007, vendor/pythia/v0.8/packages/blade/etc/blade.pml)
Copied: cs/pythia/trunk/blade/toolkits (from rev 4007, vendor/pythia/v0.8/packages/blade/etc/toolkits)
Copied: cs/pythia/trunk/elc/__vault__.odb (from rev 4007, vendor/pythia/v0.8/packages/elc/etc/__vault__.odb)
Copied: cs/pythia/trunk/elc/ice.odb (from rev 4007, vendor/pythia/v0.8/packages/elc/etc/ice.odb)
Copied: cs/pythia/trunk/elc/mpi.odb (from rev 4007, vendor/pythia/v0.8/packages/elc/etc/mpi.odb)
Copied: cs/pythia/trunk/elc/serial.odb (from rev 4007, vendor/pythia/v0.8/packages/elc/etc/serial.odb)
Copied: cs/pythia/trunk/idd (from rev 4007, vendor/pythia/v0.8/packages/pyre/etc/idd)
Copied: cs/pythia/trunk/ipa (from rev 4007, vendor/pythia/v0.8/packages/pyre/etc/ipa)
Modified: cs/pythia/trunk/journal/__init__.py
===================================================================
--- cs/pythia/trunk/journal/__init__.py 2006-07-11 19:41:28 UTC (rev 4007)
+++ cs/pythia/trunk/journal/__init__.py 2006-07-11 20:38:41 UTC (rev 4008)
@@ -162,9 +162,6 @@
import _journal
except ImportError:
hasProxy = False
- warn = warning("journal")
- warn.line("could not import the C++ bindings for journal")
- warn.log("control of diagnostics from extension modules is unavailable")
else:
#print " ** __init__.py: initializing C++ bindings"
Copied: cs/pythia/trunk/journal/__vault__.odb (from rev 4007, vendor/pythia/v0.8/packages/journal/etc/__vault__.odb)
Copied: cs/pythia/trunk/journal/console.odb (from rev 4007, vendor/pythia/v0.8/packages/journal/etc/console.odb)
Copied: cs/pythia/trunk/journal/file.odb (from rev 4007, vendor/pythia/v0.8/packages/journal/etc/file.odb)
Copied: cs/pythia/trunk/journal/remote.odb (from rev 4007, vendor/pythia/v0.8/packages/journal/etc/remote.odb)
Copied: cs/pythia/trunk/merlin/__vault__.odb (from rev 4007, vendor/pythia/v0.8/packages/merlin/etc/__vault__.odb)
Copied: cs/pythia/trunk/merlin/actions (from rev 4007, vendor/pythia/v0.8/packages/merlin/etc/actions)
Copied: cs/pythia/trunk/merlin/autoconf (from rev 4007, vendor/pythia/v0.8/packages/merlin/etc/autoconf)
Copied: cs/pythia/trunk/merlin/compilers (from rev 4007, vendor/pythia/v0.8/packages/merlin/etc/compilers)
Copied: cs/pythia/trunk/merlin/include (from rev 4007, vendor/pythia/v0.8/packages/merlin/etc/include)
Copied: cs/pythia/trunk/merlin/languages (from rev 4007, vendor/pythia/v0.8/packages/merlin/etc/languages)
Copied: cs/pythia/trunk/merlin/platforms (from rev 4007, vendor/pythia/v0.8/packages/merlin/etc/platforms)
Copied: cs/pythia/trunk/merlin/projects/__vault__.odb (from rev 4007, vendor/pythia/v0.8/packages/merlin/etc/projects/__vault__.odb)
Copied: cs/pythia/trunk/merlin/projects/code.odb (from rev 4007, vendor/pythia/v0.8/packages/merlin/etc/projects/code.odb)
Copied: cs/pythia/trunk/merlin/projects/python/__vault__.odb (from rev 4007, vendor/pythia/v0.8/packages/merlin/etc/projects/python/__vault__.odb)
Copied: cs/pythia/trunk/merlin/projects/python/package.odb (from rev 4007, vendor/pythia/v0.8/packages/merlin/etc/projects/python/package.odb)
Copied: cs/pythia/trunk/pulse/__vault__.odb (from rev 4007, vendor/pythia/v0.8/packages/pulse/etc/__vault__.odb)
Copied: cs/pythia/trunk/pulse/bath.odb (from rev 4007, vendor/pythia/v0.8/packages/pulse/etc/bath.odb)
Copied: cs/pythia/trunk/pulse/heaviside.odb (from rev 4007, vendor/pythia/v0.8/packages/pulse/etc/heaviside.odb)
Deleted: cs/pythia/trunk/pyre/inventory/odb/prefix-template.py
===================================================================
--- cs/pythia/trunk/pyre/inventory/odb/prefix-template.py 2006-07-11 19:41:28 UTC (rev 4007)
+++ cs/pythia/trunk/pyre/inventory/odb/prefix-template.py 2006-07-11 20:38:41 UTC (rev 4008)
@@ -1,32 +0,0 @@
-#!/usr/bin/env python
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Michael A.G. Aivazis
-# California Institute of Technology
-# (C) 1998-2005 All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-import os
-
-try:
- stem = os.environ["PYTHIA_HOME"]
-except KeyError:
- try:
- stem = os.environ["EXPORT_ROOT"]
- except KeyError:
- stem = 'xxDBROOTxx'
-
-_SYSTEM_ROOT = os.path.join(stem, "etc")
-_USER_ROOT = os.path.join(os.path.expanduser('~'), '.pyre')
-_LOCAL_ROOT = [ '.' ]
-
-
-# version
-__id__ = "$Id: prefix-template.py,v 1.1.1.1 2005/03/08 16:13:43 aivazis Exp $"
-
-# End of file
Copied: cs/pythia/trunk/pyre/inventory/odb/prefix.py (from rev 4007, cs/pythia/trunk/pyre/inventory/odb/prefix-template.py)
===================================================================
--- cs/pythia/trunk/pyre/inventory/odb/prefix-template.py 2006-07-11 19:41:28 UTC (rev 4007)
+++ cs/pythia/trunk/pyre/inventory/odb/prefix.py 2006-07-11 20:38:41 UTC (rev 4008)
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+# Michael A.G. Aivazis
+# California Institute of Technology
+# (C) 1998-2005 All Rights Reserved
+#
+# <LicenseText>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+
+import os
+from os.path import dirname
+
+_SYSTEM_ROOT = dirname(dirname(dirname(dirname(__file__))))
+_USER_ROOT = os.path.join(os.path.expanduser('~'), '.pyre')
+_LOCAL_ROOT = [ '.' ]
+
+
+# version
+__id__ = "$Id: prefix-template.py,v 1.1.1.1 2005/03/08 16:13:43 aivazis Exp $"
+
+# End of file
Copied: cs/pythia/trunk/weaver (from rev 4007, vendor/pythia/v0.8/packages/pyre/etc/weaver)
More information about the cig-commits
mailing list