Python: Remove version stuff that is no longer needed, remove svn stuff

STEllAR-GROUP · Aug 23, 2012 · 6459477 · 6459477
1 parent c1b38ec
commit 6459477
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 158 deletions.
diff --git a/python/hpx/svn.py b/python/hpx/svn.py
diff --git a/python/scripts/hpx_environment.py b/python/scripts/hpx_environment.py
@@ -11,12 +11,10 @@
 
 from optparse import OptionParser
 
-from hpx_version import HPX_VERSION
-
 if exists(join(path[0], "../hpx")):
   path.append(join(path[0], ".."))
-if exists(join(path[0], "../share/hpx-"+HPX_VERSION+"/python/hpx")):
-  path.append(join(path[0], "../share/hpx-"+HPX_VERSION+"/python"))
+if exists(join(path[0], "../share/hpx/python/hpx")):
+  path.append(join(path[0], "../share/hpx/python"))
 
 from hpx.environment import identify
 

diff --git a/python/scripts/hpx_invoke.py b/python/scripts/hpx_invoke.py
@@ -16,12 +16,10 @@
 
 from optparse import OptionParser
 
-from hpx_version import HPX_VERSION
-
 if exists(join(path[0], "../hpx")):
   path.append(join(path[0], ".."))
-if exists(join(path[0], "../share/hpx-"+HPX_VERSION+"/python/hpx")):
-  path.append(join(path[0], "../share/hpx-"+HPX_VERSION+"/python"))
+if exists(join(path[0], "../share/hpx/python/hpx")):
+  path.append(join(path[0], "../share/hpx/python"))
 
 from hpx.process import process
 

diff --git a/python/scripts/hpx_optsweep.py b/python/scripts/hpx_optsweep.py
@@ -17,12 +17,11 @@
 from operator import *
 from datetime import datetime
 from pickle import dump
-from hpx_version import HPX_VERSION
 
 if osp.exists(osp.join(sys.path[0], "../hpx")):
   sys.path.append(osp.join(sys.path[0], ".."))
-if osp.exists(osp.join(sys.path[0], "../share/hpx-"+HPX_VERSION+"/python/hpx")):
-  sys.path.append(osp.join(sys.path[0], "../share/hpx-"+HPX_VERSION+"/python"))
+if osp.exists(osp.join(sys.path[0], "../share/hpx/python/hpx")):
+  sys.path.append(osp.join(sys.path[0], "../share/hpx/python"))
 
 from hpx.process import process
 

diff --git a/python/scripts/hpx_run_tests.py b/python/scripts/hpx_run_tests.py
@@ -16,12 +16,10 @@
 
 from errno import ENOENT
 
-from hpx_version import HPX_VERSION
-
 if osp.exists(osp.join(sys.path[0], "../hpx")):
   sys.path.append(osp.join(sys.path[0], ".."))
-if osp.exists(osp.join(sys.path[0], "../share/hpx-"+HPX_VERSION+"/python/hpx")):
-  sys.path.append(osp.join(sys.path[0], "../share/hpx-"+HPX_VERSION+"/python"))
+if osp.exists(osp.join(sys.path[0], "../share/hpx/python/hpx")):
+  sys.path.append(osp.join(sys.path[0], "../share/hpx/python"))
 
 from hpx.process import process, process_group
 

diff --git a/python/scripts/hpx_svnversion.py b/python/scripts/hpx_svnversion.py
diff --git a/python/scripts/hpx_version.py b/python/scripts/hpx_version.py