Split build target 'python-svm'.

Author: fangerer

mx.graalpython/mx_graalpython.py

@@ -57,6 +57,9 @@ def _get_stdlib_home():
 def _get_svm_binary():
     return os.path.join(_suite.dir, "graalpython-svm")
 
+def __get_svm_binary_from_graalvm():
+    vmdir = os.path.join(mx.suite("truffle").dir, "..", "vm")
+    return os.path.join(vmdir, "mxbuild", "-".join([mx.get_os(), mx.get_arch()]), "graalpython.image", "graalpython")
 
 def _extract_graalpython_internal_options(args):
     internal = []
@@ -333,16 +336,19 @@ def find_eclipse():
                 return
 
 
-def python_svm(args):
+def python_build_svm(args):
     mx.run_mx(
         ["--dynamicimports", "/substratevm,/vm", "build",
          "--force-deprecation-as-warning", "--dependencies",
          "GRAAL_MANAGEMENT,graalpython.image"],
         nonZeroIsFatal=True
     )
-    vmdir = os.path.join(mx.suite("truffle").dir, "..", "vm")
-    svm_image = os.path.join(vmdir, "mxbuild", "-".join([mx.get_os(), mx.get_arch()]), "graalpython.image", "graalpython")
-    shutil.copy(svm_image, os.path.join(_suite.dir, "graalpython-svm"))
+    shutil.copy(__get_svm_binary_from_graalvm(), _get_svm_binary())
+
+
+def python_svm(args):
+    python_build_svm(args)
+    svm_image = __get_svm_binary_from_graalvm()
     mx.run([svm_image] + args)
     return svm_image
 
@@ -942,6 +948,7 @@ def import_python_sources(args):
     'python-update-import': [update_import_cmd, 'import name'],
     'delete-graalpython-if-testdownstream': [delete_self_if_testdownstream, ''],
     'python-checkcopyrights': [python_checkcopyrights, 'Make sure code files have copyright notices'],
+    'python-build-svm': [python_build_svm, 'build svm image if it is outdated'],
     'python-svm': [python_svm, 'run python svm image (building it if it is outdated'],
     'punittest': [punittest, ''],
     'python3-unittests': [python3_unittests, 'run the cPython stdlib unittests'],