From 48c247284e665914331bae8bdd13edb6df95e8b3 Mon Sep 17 00:00:00 2001 From: Gary Oberbrunner Date: Sun, 12 Aug 2012 17:26:38 +0000 Subject: Prepare src/CHANGES.txt for next release --- src/CHANGES.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 2636403..faf293f 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -6,6 +6,9 @@ RELEASE 2.X.X - + +RELEASE 2.2.0 - Mon, 05 Aug 2012 15:37:48 +0000 + From dubcanada on Bitbucket: - Fix 32-bit Visual Express C++ on 64-bit Windows (generate 32-bit code) @@ -28,7 +31,6 @@ RELEASE 2.X.X - - Fix cloning of builders when cloning environment (#2821). From Gary Oberbrunner: - - Support Intel C v12 compiler on Linux and Mac (not yet Windows) - Show valid Visual Studio architectures in error message when user passes invalid arch. -- cgit v0.12 From 8a4cdff25c3e2f765c288bc7ef749343ccb7ff4a Mon Sep 17 00:00:00 2001 From: Gary Oberbrunner Date: Sun, 12 Aug 2012 17:26:52 +0000 Subject: Warn during doc build if missing tools --- bin/upload-release-files.sh | 1 + doc/SConscript | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/bin/upload-release-files.sh b/bin/upload-release-files.sh index 2ba10cc..2867e3c 100755 --- a/bin/upload-release-files.sh +++ b/bin/upload-release-files.sh @@ -68,6 +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 " echo '*****' echo '***** Now manually update index.php, includes/versions.php and news-raw.xhtml on scons.org.' diff --git a/doc/SConscript b/doc/SConscript index faa0af2..9bf40bc 100644 --- a/doc/SConscript +++ b/doc/SConscript @@ -436,6 +436,8 @@ for man_1 in man_page_list: tar_deps.extend([ps, text]) tar_list.extend([ps, text]) + else: + print "doc: WARNING: no groff, skipping text and PostScript versions of man pages" if man2html: html = os.path.join(build, 'HTML' , '%s-man.html' % man) @@ -460,6 +462,8 @@ for man_1 in man_page_list: tar_deps.append(html) tar_list.append(html) + else: + print "doc: WARNING: no man2html, skipping HTML versions of man pages" if not epydoc_cli: try: -- cgit v0.12 From fa19ee19b1048e25a8915c6e9c0c7bef11d28481 Mon Sep 17 00:00:00 2001 From: Gary Oberbrunner Date: Sun, 12 Aug 2012 23:25:31 -0400 Subject: Fix Debian build process. Each release needs to update debian/changelog, and it needs to be in a particular format since the deb build process reads and parses it to get the version number in the .deb. Also fixed a few other deb-build-related errors. --- SConstruct | 2 +- debian/changelog | 7 +++++++ debian/postinst | 2 +- debian/rules | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index fd51396..46a7daf 100644 --- a/SConstruct +++ b/SConstruct @@ -1026,7 +1026,7 @@ for p in [ scons ]: if dh_builddeb and fakeroot: # Our Debian packaging builds directly into build/dist, # so we don't need to Install() the .debs. - deb = os.path.join(build_dir, 'dist', "%s_%s-1_all.deb" % (pkg, version)) + deb = os.path.join(build_dir, 'dist', "%s_%s_all.deb" % (pkg, version)) for d in p['debian_deps']: b = env.SCons_revision(os.path.join(build, d), d) env.Depends(deb, b) diff --git a/debian/changelog b/debian/changelog index 441f572..af58281 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +scons (2.2.0) unstable; urgency=low + + * Maintenance release. + + -- Gary Oberbrunner Sun, 12 Aug 2012 09:00:00 -0500 + + scons (0.97) unstable; urgency=low * Eighth beta release. diff --git a/debian/postinst b/debian/postinst index ed8ed5c..6a7d335 100644 --- a/debian/postinst +++ b/debian/postinst @@ -7,7 +7,7 @@ if [ "$1" = "configure" ]; then fi NAME=scons -PYTHON_VERSION=`python -V 2>&1| cut -d" " -f2 | cut -d"." -f0-2` +PYTHON_VERSION=`python -V 2>&1| cut -d" " -f2 | cut -d"." -f1-2` PYTHON_EXE_NAME=`which python$PYTHON_VERSION` case "$1" in configure|abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/rules b/debian/rules index 1eaf4de..1effa02 100644 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ # Overridable variables added to support building test .deb files # as part of routine SCons builds. --SK BUILDDEB_OPTIONS= -PYTHON_VERSION=`python -V 2>&1| cut -d" " -f2 | cut -d"." -f0-2` +PYTHON_VERSION=`python -V 2>&1| cut -d" " -f2 | cut -d"." -f1-2` PYTHON_PATH=/usr/bin/python PYTHON=$(PYTHON_PATH)$(PYTHON_VERSION) ####### @@ -55,7 +55,7 @@ install: build @######## mkdir -p debian/scons/usr/lib/python$(PYTHON_VERSION)/site-packages/ rm -rf debian/scons/usr/lib/python$(PYTHON_VERSION)/site-packages/SCons - cp -r build/lib/SCons debian/scons/usr/lib/python$(PYTHON_VERSION)/site-packages/ + cp -r build/lib*/SCons debian/scons/usr/lib/python$(PYTHON_VERSION)/site-packages/ mkdir -p debian/scons/usr/bin/ rm -f debian/scons/usr/bin/scons -- cgit v0.12 From 35dfcfed84da6f99f234773efb5a5f5978bea7bb Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 13 Aug 2012 10:42:55 -0700 Subject: added more release years. Dummy checkin to test buildbot trigger --- ReleaseConfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReleaseConfig b/ReleaseConfig index 0a5e606..c7943a1 100644 --- a/ReleaseConfig +++ b/ReleaseConfig @@ -50,7 +50,7 @@ deprecated_python_version = (2, 4, 0) #month_year = 'December 2012' # If copyright years is not given, the release year is used as the end. -#copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010' +#copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012' # Local Variables: # tab-width:4 -- cgit v0.12 From 1062ba60e3500a90231d4acef4aa44cdc6803591 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 13 Aug 2012 10:49:22 -0700 Subject: dummy whitespace added to test triggering buildbot --- review.py | 1 + 1 file changed, 1 insertion(+) diff --git a/review.py b/review.py index ea09923..23e4b10 100644 --- a/review.py +++ b/review.py @@ -1802,3 +1802,4 @@ def main(): if __name__ == "__main__": main() + -- cgit v0.12 From 202e2257c1b2349f0111e9c86425ef944509f835 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 13 Aug 2012 14:06:58 -0700 Subject: dummy whitespace added to test triggering buildbot --- review.py | 1 + 1 file changed, 1 insertion(+) diff --git a/review.py b/review.py index 23e4b10..3eaeb28 100644 --- a/review.py +++ b/review.py @@ -1803,3 +1803,4 @@ def main(): if __name__ == "__main__": main() + -- cgit v0.12 From 6658b6e89046ea5dc58b36bb95d9c9a9c7ea1e6a Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 13 Aug 2012 14:15:33 -0700 Subject: dummy whitespace added to test triggering buildbot --- review.py | 1 - 1 file changed, 1 deletion(-) diff --git a/review.py b/review.py index 3eaeb28..23e4b10 100644 --- a/review.py +++ b/review.py @@ -1803,4 +1803,3 @@ def main(): if __name__ == "__main__": main() - -- cgit v0.12 From 80f77401bad632ab355f9fb5b36777d9f214cd3e Mon Sep 17 00:00:00 2001 From: Gary Oberbrunner Date: Mon, 13 Aug 2012 20:09:18 -0400 Subject: Fix MSVS solution generation for VS11, and fixed tests. --- src/CHANGES.txt | 2 ++ src/engine/SCons/Tool/msvs.py | 4 ++-- test/MSVS/vs-10.0-scc-files.py | 2 +- test/MSVS/vs-10.0-scc-legacy-files.py | 2 +- test/MSVS/vs-11.0-scc-files.py | 2 +- test/MSVS/vs-11.0-scc-legacy-files.py | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index faf293f..7665e39 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -6,6 +6,8 @@ RELEASE 2.X.X - + From Gary Oberbrunner: + - Fix MSVS solution generation for VS11, and fixed tests. RELEASE 2.2.0 - Mon, 05 Aug 2012 15:37:48 +0000 diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py index 2b5373d..b10868f 100644 --- a/src/engine/SCons/Tool/msvs.py +++ b/src/engine/SCons/Tool/msvs.py @@ -1206,7 +1206,7 @@ class _GenerateV7DSW(_DSWGenerator): self.version_num, self.suite = msvs_parse_version(self.version) self.versionstr = '7.00' if self.version_num >= 11.0: - self.versionstr = '12.0' + self.versionstr = '12.00' elif self.version_num >= 10.0: self.versionstr = '11.00' elif self.version_num >= 9.0: @@ -1311,7 +1311,7 @@ class _GenerateV7DSW(_DSWGenerator): def PrintSolution(self): """Writes a solution file""" self.file.write('Microsoft Visual Studio Solution File, Format Version %s\n' % self.versionstr) - if self.versionstr >= 11.0: + if self.version_num >= 11.0: self.file.write('# Visual Studio 11\n') elif self.version_num >= 10.0: self.file.write('# Visual Studio 2010\n') diff --git a/test/MSVS/vs-10.0-scc-files.py b/test/MSVS/vs-10.0-scc-files.py index 48857b6..32dd9ef 100644 --- a/test/MSVS/vs-10.0-scc-files.py +++ b/test/MSVS/vs-10.0-scc-files.py @@ -51,7 +51,7 @@ env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='10.0', MSVS_SCC_PROJECT_NAME='Perforce Project') testsrc = ['test1.cpp', 'test2.cpp'] -testincs = ['sdk.h'] +testincs = ['sdk_dir\sdk.h'] testlocalincs = ['test.h'] testresources = ['test.rc'] testmisc = ['readme.txt'] diff --git a/test/MSVS/vs-10.0-scc-legacy-files.py b/test/MSVS/vs-10.0-scc-legacy-files.py index 4a5d5a8..14276a7 100644 --- a/test/MSVS/vs-10.0-scc-legacy-files.py +++ b/test/MSVS/vs-10.0-scc-legacy-files.py @@ -50,7 +50,7 @@ env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='10.0', MSVS_SCC_PROJECT_NAME='Perforce Project') testsrc = ['test1.cpp', 'test2.cpp'] -testincs = ['sdk.h'] +testincs = ['sdk_dir\sdk.h'] testlocalincs = ['test.h'] testresources = ['test.rc'] testmisc = ['readme.txt'] diff --git a/test/MSVS/vs-11.0-scc-files.py b/test/MSVS/vs-11.0-scc-files.py index 8cc0465..6d12c79 100644 --- a/test/MSVS/vs-11.0-scc-files.py +++ b/test/MSVS/vs-11.0-scc-files.py @@ -51,7 +51,7 @@ env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='11.0', MSVS_SCC_PROJECT_NAME='Perforce Project') testsrc = ['test1.cpp', 'test2.cpp'] -testincs = ['sdk.h'] +testincs = ['sdk_dir\sdk.h'] testlocalincs = ['test.h'] testresources = ['test.rc'] testmisc = ['readme.txt'] diff --git a/test/MSVS/vs-11.0-scc-legacy-files.py b/test/MSVS/vs-11.0-scc-legacy-files.py index d509138..726f994 100644 --- a/test/MSVS/vs-11.0-scc-legacy-files.py +++ b/test/MSVS/vs-11.0-scc-legacy-files.py @@ -50,7 +50,7 @@ env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='11.0', MSVS_SCC_PROJECT_NAME='Perforce Project') testsrc = ['test1.cpp', 'test2.cpp'] -testincs = ['sdk.h'] +testincs = ['sdk_dir\sdk.h'] testlocalincs = ['test.h'] testresources = ['test.rc'] testmisc = ['readme.txt'] -- cgit v0.12 From 695972e743aef7d860b2b70ae4412a6994a1a94f Mon Sep 17 00:00:00 2001 From: William Deegan Date: Fri, 17 Aug 2012 16:02:29 -0700 Subject: Fake change to force buildbot to trigger --- README-local | 1 + 1 file changed, 1 insertion(+) diff --git a/README-local b/README-local index fac11f1..584234d 100644 --- a/README-local +++ b/README-local @@ -202,3 +202,4 @@ With plenty of help from the SCons Development team: Anthony Roach Terrel Shumway + -- cgit v0.12