summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2015-03-26 23:59:30 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2015-03-26 23:59:30 (GMT)
commite2deb3e686eac9f36a413778ce08110e8acf5c33 (patch)
treed6c5de6f0cb4b3f8dec0b4f056d918efbe8aee9e
parent61a64ab9015bcd4f70b467eab182cb04141e9cb6 (diff)
downloadSCons-e2deb3e686eac9f36a413778ce08110e8acf5c33.zip
SCons-e2deb3e686eac9f36a413778ce08110e8acf5c33.tar.gz
SCons-e2deb3e686eac9f36a413778ce08110e8acf5c33.tar.bz2
add SKIP_WIN_PACKAGES bootstrap.py flag to allow skipping building win packages. Debian seems to skip shipping the wininst*.exe files and so will fail when trying to build these
-rw-r--r--SConstruct23
1 files changed, 17 insertions, 6 deletions
diff --git a/SConstruct b/SConstruct
index ae1a06e..e47908d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -172,6 +172,8 @@ if build_id is None:
else:
build_id = ''
+skip_win_packages = ARGUMENTS.get('SKIP_WIN_PACKAGES',False)
+
python_ver = sys.version[0:3]
#
@@ -235,6 +237,8 @@ command_line_variables = [
("VERSION=", "The SCons version being packaged. The default " +
"is the hard-coded value '%s' " % default_version +
"from this SConstruct file."),
+
+ ("SKIP_WIN_PACKAGES=", "If set, skip building win32 and win64 packages."),
]
Default('.', build_dir)
@@ -495,10 +499,13 @@ Version_values = [Value(version), Value(build_id)]
# separate packages.
#
+from distutils.sysconfig import get_python_lib;
+
+
python_scons = {
'pkg' : 'python-' + project,
'src_subdir' : 'engine',
- 'inst_subdir' : os.path.join('lib', 'python1.5', 'site-packages'),
+ 'inst_subdir' : get_python_lib(),
'rpm_dir' : '/usr/lib/scons',
'debian_deps' : [
@@ -737,8 +744,6 @@ for p in [ scons ]:
'dist',
"%s.%s.zip" % (pkg_version, platform))
- win64_exe = os.path.join(build, 'dist', "%s.win-amd64.exe" % pkg_version)
- win32_exe = os.path.join(build, 'dist', "%s.win32.exe" % pkg_version)
#
# Update the environment with the relevant information
@@ -849,8 +854,13 @@ for p in [ scons ]:
Local(*build_src_files)
distutils_formats = []
+ distutils_targets = []
+
+ if not skip_win_packages:
+ win64_exe = os.path.join(build, 'dist', "%s.win-amd64.exe" % pkg_version)
+ win32_exe = os.path.join(build, 'dist', "%s.win32.exe" % pkg_version)
+ distutils_targets.extend([ win32_exe , win64_exe ])
- distutils_targets = [ win32_exe , win64_exe ]
dist_distutils_targets = []
for target in distutils_targets:
@@ -1088,9 +1098,10 @@ for p in [ scons ]:
commands.append("$PYTHON $PYTHONFLAGS $SETUP_PY sdist --formats=%s" % \
','.join(distutils_formats))
- commands.append("$PYTHON $PYTHONFLAGS $SETUP_PY bdist_wininst --plat-name=win32 --user-access-control auto")
+ if not skip_win_packages:
+ commands.append("$PYTHON $PYTHONFLAGS $SETUP_PY bdist_wininst --plat-name=win32 --user-access-control auto")
- commands.append("$PYTHON $PYTHONFLAGS $SETUP_PY bdist_wininst --plat-name=win-amd64 --user-access-control auto")
+ commands.append("$PYTHON $PYTHONFLAGS $SETUP_PY bdist_wininst --plat-name=win-amd64 --user-access-control auto")
env.Command(distutils_targets, build_src_files, commands)