diff options
| author | Dirk Baechle <dl9obn@darc.de> | 2014-08-07 19:40:42 (GMT) |
|---|---|---|
| committer | Dirk Baechle <dl9obn@darc.de> | 2014-08-07 19:40:42 (GMT) |
| commit | 1e7356e2a4f660c6f1cd42b92aec0c47233c1a2d (patch) | |
| tree | 9dae7bcc4bde1a6733917afd57fe749d53b56e33 /src | |
| parent | a64b41ac4e3e506417f465e414b94cb07aed582e (diff) | |
| download | SCons-1e7356e2a4f660c6f1cd42b92aec0c47233c1a2d.zip SCons-1e7356e2a4f660c6f1cd42b92aec0c47233c1a2d.tar.gz SCons-1e7356e2a4f660c6f1cd42b92aec0c47233c1a2d.tar.bz2 | |
- several smaller fixes to get the Linux buildslaves green again
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Tool/JavaCommon.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/docbook/docs/manual.xml | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/packaging/rpm.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/SCons/Tool/JavaCommon.py b/src/engine/SCons/Tool/JavaCommon.py index 6dd6051..8b13f9f 100644 --- a/src/engine/SCons/Tool/JavaCommon.py +++ b/src/engine/SCons/Tool/JavaCommon.py @@ -65,7 +65,7 @@ if java_parsing: def __init__(self, version=default_java_version): if not version in ('1.1', '1.2', '1.3','1.4', '1.5', '1.6', '1.7', - '5', '6'): + '1.8', '5', '6'): msg = "Java version %s not supported" % version raise NotImplementedError(msg) @@ -171,7 +171,7 @@ if java_parsing: if self.version in ('1.1', '1.2', '1.3', '1.4'): clazz = self.listClasses[0] self.listOutputs.append('%s$%d' % (clazz, self.nextAnon)) - elif self.version in ('1.5', '1.6', '1.7', '5', '6'): + elif self.version in ('1.5', '1.6', '1.7', '1.8', '5', '6'): self.stackAnonClassBrackets.append(self.brackets) className = [] className.extend(self.listClasses) diff --git a/src/engine/SCons/Tool/docbook/docs/manual.xml b/src/engine/SCons/Tool/docbook/docs/manual.xml index 60e94bc..c129753 100644 --- a/src/engine/SCons/Tool/docbook/docs/manual.xml +++ b/src/engine/SCons/Tool/docbook/docs/manual.xml @@ -263,7 +263,7 @@ with large input files may occur. There will definitely arise the need for adding features, or a variable. Let us know if you can think of a nice improvement or have worked on a bugfix/patch with success. Enter your issues at the Launchpad bug tracker for the Docbook Tool, or write to the User General Discussion -list of SCons at <literal>scons-users@tigris.org</literal>. +list of SCons at <literal>scons-users@scons.org</literal>. </para> </section> diff --git a/src/engine/SCons/Tool/packaging/rpm.py b/src/engine/SCons/Tool/packaging/rpm.py index 07857d1..2bc3063 100644 --- a/src/engine/SCons/Tool/packaging/rpm.py +++ b/src/engine/SCons/Tool/packaging/rpm.py @@ -182,7 +182,7 @@ def build_specfile_sections(spec): spec['X_RPM_PREP'] = '[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"' + '\n%setup -q' if 'X_RPM_BUILD' not in spec: - spec['X_RPM_BUILD'] = 'mkdir "$RPM_BUILD_ROOT"' + spec['X_RPM_BUILD'] = '[ ! -e "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && mkdir "$RPM_BUILD_ROOT"' if 'X_RPM_INSTALL' not in spec: spec['X_RPM_INSTALL'] = 'scons --install-sandbox="$RPM_BUILD_ROOT" "$RPM_BUILD_ROOT"' |