Merged with stable

CHANGES.txt

@@ -8,14 +8,14 @@
 
 
 -------
- 4.3.1
+ 4.3.1 (in progress)
 -------
 
 * Bug 3119793: Fixed ClCompile blocks with vs10 and PCH (Dan Dunham)
 * Bug 2920784: Symbol visibility in Xcode3 libraries (burnson2)
 * Bug 3133743: Sets ONLY_ACTIVE_ARCH = YES in Xcode debug builds (James Wynn)
 * Properly pass return codes back to shell in release builds
-
+* Bug 3135734: Remove WholeProgramOptimization setting in vs10 (doug)
 
 -------
   4.3

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2003-2010 Jason Perkins and individual contributors.
+Copyright (c) 2003-2011 Jason Perkins and individual contributors.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

README.txt

@@ -1,7 +1,7 @@
 PREMAKE
 A build configuration tool
 
- Copyright (C) 2002-2010 by Jason Perkins
+ Copyright (C) 2002-2011 by Jason Perkins
  Distributed under the terms of the BSD License, see LICENSE.txt
 
  The Lua language and runtime library is (C) TeCGraf, PUC-Rio.

src/actions/vstudio/vs2010_vcxproxj.lua

@@ -150,14 +150,8 @@ local vs10_helpers = premake.vstudio.vs10_helpers
 				_p(2,'<UseOfMfc>Dynamic</UseOfMfc>')
 			end
 			
-			local use_debug = "false"
-			if  not premake.config.isoptimizedbuild(cfg.flags) then 
-				use_debug = "true" 
-			else
-				_p(2,'<WholeProgramOptimization>true</WholeProgramOptimization>')
-			end
-				_p(2,'<UseDebugLibraries>%s</UseDebugLibraries>',use_debug)
-				
+			_p(2,'<UseDebugLibraries>%s</UseDebugLibraries>'
+				,iif(optimisation(cfg) == "Disabled","true","false"))				
 			_p(1,'</PropertyGroup>')
 		end
 	end
@@ -689,4 +683,4 @@ local vs10_helpers = premake.vstudio.vs10_helpers
 	end
 	
 
-		
+		

src/host/premake.c

@@ -1,7 +1,7 @@
 /**
  * \file   premake.c
  * \brief  Program entry point.
- * \author Copyright (c) 2002-2010 Jason Perkins and the Premake project
+ * \author Copyright (c) 2002-2011 Jason Perkins and the Premake project
  */
 
 #include <stdlib.h>
@@ -10,7 +10,7 @@
 
 
 #define VERSION        "HEAD"
-#define COPYRIGHT      "Copyright (C) 2002-2010 Jason Perkins and the Premake Project"
+#define COPYRIGHT      "Copyright (C) 2002-2011 Jason Perkins and the Premake Project"
 #define ERROR_MESSAGE  "%s\n"
 
 

tests/actions/vstudio/test_vs2010_vcxproj.lua

@@ -422,3 +422,8 @@
 			..release_config_pch_string ..'%s+</ClCompile>'
 		test.string_contains(buffer,expected)
 	end
+
+	function vs10_vcxproj.wholeProgramOptimizationIsNotSetByDefault_bufferDoesNotContainWholeProgramOptimization()
+		local buffer = get_buffer()
+		test.string_does_not_contain(buffer,"WholeProgramOptimization")
+	end

tests/test.bat

@@ -1,2 +1,3 @@
 
-CALL ..\\bin\\debug\\premake4 /scripts=..\\src test
+CALL ..\\bin\\debug\\premake4 /scripts=..\\src test
+::CALL ..\\bin\\release\\premake4 /scripts=..\\src test