diff options
| author | Stefan Zimmermann <zimmermann.code@gmail.com> | 2014-03-31 16:24:42 (GMT) |
|---|---|---|
| committer | Stefan Zimmermann <zimmermann.code@gmail.com> | 2014-03-31 16:24:42 (GMT) |
| commit | cffcd3c38568d3f82ff83916bbbd1b129373558c (patch) | |
| tree | ff268c97886e3cc905115185a35405b3fd83348a /bin | |
| parent | ea1890249923aab9cda388b2d22b566dbb7b8949 (diff) | |
| parent | d4f8c6e320484c106446918c37affdddacd5c7a3 (diff) | |
| download | SCons-cffcd3c38568d3f82ff83916bbbd1b129373558c.zip SCons-cffcd3c38568d3f82ff83916bbbd1b129373558c.tar.gz SCons-cffcd3c38568d3f82ff83916bbbd1b129373558c.tar.bz2 | |
Merged with [default]
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/SConsDoc.py | 4 | ||||
| -rw-r--r-- | bin/update-release-info.py | 4 | ||||
| -rwxr-xr-x | bin/upload-release-files.sh | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/bin/SConsDoc.py b/bin/SConsDoc.py index 72c0306..0d74a36 100644 --- a/bin/SConsDoc.py +++ b/bin/SConsDoc.py @@ -316,7 +316,7 @@ if not has_libxml2: fout.close() def decorateWithHeader(self, root): - root.attrib["{"+xsi+"}schemaLocation"] = "%s/scons.xsd scons.xsd" % dbxsd + root.attrib["{"+xsi+"}schemaLocation"] = "%s %s/scons.xsd" % (dbxsd, dbxsd) return root def newXmlTree(self, root): @@ -451,7 +451,7 @@ else: xi = root.newNs(xsi, 'xsi') root.setNs(ns) #put this node in the target namespace - root.setNsProp(xi, 'schemaLocation', "%s/scons.xsd scons.xsd" % dbxsd) + root.setNsProp(xi, 'schemaLocation', "%s %s/scons.xsd" % (dbxsd, dbxsd)) return root diff --git a/bin/update-release-info.py b/bin/update-release-info.py index be9e0f5..4a677db 100644 --- a/bin/update-release-info.py +++ b/bin/update-release-info.py @@ -139,7 +139,7 @@ if DEBUG: print('month year', month_year) try: copyright_years = config['copyright_years'] except KeyError: - copyright_years = ', '.join(map(str, list(range(2001, release_date[0] + 1)))) + copyright_years = '2001 - %d'%(release_date[0] + 1) if DEBUG: print('copyright years', copyright_years) class UpdateFile(object): @@ -333,7 +333,7 @@ t.replace_assign('deprecated_python_version', str(deprecated_version)) # Update doc/user/main.{in,xml} -docyears = ', '.join(map(str, range(2004, release_date[0] + 1))) +docyears = '2004 - %d' % release_date[0] if os.path.exists(os.path.join('doc', 'user', 'main.in')): # this is no longer used as of Dec 2013 t = UpdateFile(os.path.join('doc', 'user', 'main.in')) diff --git a/bin/upload-release-files.sh b/bin/upload-release-files.sh index 2867e3c..bf09751 100755 --- a/bin/upload-release-files.sh +++ b/bin/upload-release-files.sh @@ -46,7 +46,7 @@ $RSYNC $RSYNCOPTS \ # # scons.org stuff: -# +# # Doc: copy the doc tgz over; we'll unpack later $RSYNC $RSYNCOPTS \ scons-doc-$VERSION.tar.gz \ @@ -68,7 +68,7 @@ ssh scons@scons.org " cd .. rm latest; ln -s $VERSION latest rm production; ln -s $VERSION production - for f in HTML PDF PS TEXT; do rm $f; ln -s $VERSION/$f $f; done + for f in HTML PDF EPUB PS TEXT; do rm \$f; ln -s $VERSION/\$f \$f; done " echo '*****' echo '***** Now manually update index.php, includes/versions.php and news-raw.xhtml on scons.org.' |