Get latest from the mainline.

15 files changed, 30 insertions, 12 deletions

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
 
+
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
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/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/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 <garyo@oberbrunner.com>  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
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:
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()

+

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 7b27507..685430c 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -11,6 +11,11 @@
 
 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
+
   From dubcanada on Bitbucket:
     - Fix 32-bit Visual Express C++ on 64-bit Windows (generate 32-bit code)
 
@@ -33,7 +38,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.
 
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']