summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Lacko <backup.rlacko@gmail.com>2012-06-05 14:00:59 +0200
committerRoman Lacko <backup.rlacko@gmail.com>2012-06-05 14:00:59 +0200
commit8123eef67f9c5e239a22b33b0ff32bbb502e9dc5 (patch)
tree7e497cdc345de1874497d3ad596c574434dacf97
parent845ab69b402f900c78e66a4607f1093121adf2b5 (diff)
ensure that git submodules are initialized
-rw-r--r--setup.py15
1 files changed, 12 insertions, 3 deletions
diff --git a/setup.py b/setup.py
index 6d0dba36..99429264 100644
--- a/setup.py
+++ b/setup.py
@@ -32,8 +32,11 @@ Building 64bit version is not supported with Visual Studio 2008 Express Edition.
__version__ = "1.1.1"
-from distribute_setup import use_setuptools
-use_setuptools()
+try:
+ import setuptools
+except ImportError:
+ from distribute_setup import use_setuptools
+ use_setuptools()
import os
import sys
@@ -65,9 +68,9 @@ except NameError:
this_file = os.path.abspath(this_file)
if os.path.dirname(this_file):
os.chdir(os.path.dirname(this_file))
+script_dir = os.getcwd()
# Clean temp build folders
-script_dir = os.getcwd()
for n in ["build", "PySide.egg-info", "PySide-%s" % __version__,
"PySide", "pysideuic"]:
d = os.path.join(script_dir, n)
@@ -80,6 +83,12 @@ for pkg in ["PySide", "pysideuic"]:
pkg_dir = os.path.join(script_dir, pkg)
os.makedirs(pkg_dir)
+# Ensure that git submodules are initialized, if this is the git repo clone
+if os.path.isdir(".git"):
+ git_cmd = ["git", "submodule", "update", "--init"]
+ if run_process(git_cmd) != 0:
+ print("Failed to initialize the git submodules")
+
def has_option(name):
try:
sys.argv.remove('--%s' % name)