Quick fix of build.py builds

Previous fix broke "./build.py clean" and other commands run by docs/hudson/OMERO.sh.
melissalinkert · Feb 27, 2012 · 02dec01 · 02dec01
1 parent 7c66fc8
commit 02dec01
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/build.py b/build.py
@@ -13,6 +13,8 @@
 import time
 import subprocess
 
+BUILD_PY = "-Dbuild.py=true"
+
 
 def popen(args, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE):
         copy = os.environ.copy()
@@ -89,7 +91,7 @@ def java_omero(args):
     command = [ find_java() ]
     p = os.path.join( os.path.curdir, "lib", "log4j-build.xml")
     command.append("-Dlog4j.configuration=%s" % p)
-    command.append("-Dbuild.py=true")
+    command.append(BUILD_PY)
     command.extend( calculate_memory_args() )
     command.extend(["omero"])
     command.extend(choose_omero_version())
@@ -119,7 +121,7 @@ def choose_omero_version():
     if omero_build:
         omero_build = "-b%s" % omero_build
 
-    command = [ find_java(), "omero","-q","version" ]
+    command = [ find_java(), "omero",BUILD_PY,"-q","version" ]
     err = ""
     try:
         p = popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)