[pypy-svn] r36031 - in pypy/dist/pypy/translator: . goal

[antocuni at codespeak.net]

Author: antocuni
Date: Fri Dec 29 11:22:33 2006
New Revision: 36031

Modified:
   pypy/dist/pypy/translator/driver.py
   pypy/dist/pypy/translator/goal/bench-cronjob.py
Log:
Rename also the directory containing the actual pypy.net, not only the
wrapper script.



Modified: pypy/dist/pypy/translator/driver.py
==============================================================================
--- pypy/dist/pypy/translator/driver.py	(original)
+++ pypy/dist/pypy/translator/driver.py	Fri Dec 29 11:22:33 2006
@@ -610,8 +610,8 @@
         newexename = basename
         f = file(newexename, 'w')
         f.write("""#!/bin/bash
-mono "$(dirname $0)/%s/%s" "$@" # XXX doesn't work if it's placed in PATH
-""" % (dirname, main_exe_name))
+mono "$(dirname $0)/$(basename $0)-data/%s" "$@" # XXX doesn't work if it's placed in PATH
+""" % main_exe_name)
         f.close()
         os.chmod(newexename, 0755)
 

Modified: pypy/dist/pypy/translator/goal/bench-cronjob.py
==============================================================================
--- pypy/dist/pypy/translator/goal/bench-cronjob.py	(original)
+++ pypy/dist/pypy/translator/goal/bench-cronjob.py	Fri Dec 29 11:22:33 2006
@@ -133,6 +133,10 @@
         compile_llvm_variants(revision, features)
     elif os.path.exists(basename):                   #copy executable
         run("mv %s %s" % (basename, realname))
+        if backend == 'cli':
+            basename_dir = basename + '-data'
+            realname_dir = realname + '-data'
+            run("mv %s %s" % (basename_dir, realname_dir))
         #pypy = open(basename, 'rb').read()
         #if len(pypy) > 0:
         #    open(realname, 'wb').write(pypy)