linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3027
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sat 2012-08-25 15:08:38 +0200
message:
  updates for the new Windows / VS / SCons
modified:
  Compile.txt
  SConstruct
  build_util.py
  changelog.txt
  dwt/include/dwt/aspects/Scrollable.h


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'Compile.txt'
--- Compile.txt	2012-06-08 15:27:48 +0000
+++ Compile.txt	2012-08-25 13:08:38 +0000
@@ -84,8 +84,6 @@
 		Rename debug libraries to libeay32d.lib and ssleay32d.lib; put them in openssl/lib.
 
 		To generate project files for MSVC, run "scons" with "msvcproj=1" and "tools=default".
-		[Temporary until SCons fully supports VS 2012: the above command has to be run from a VS
-		command prompt.]
 		The resulting solution file (DCPlusPlus.sln) will be in msvc/[mode-arch]/.
 
 

=== modified file 'SConstruct'
--- SConstruct	2012-07-19 21:58:04 +0000
+++ SConstruct	2012-08-25 13:08:38 +0000
@@ -121,8 +121,7 @@
 	TARGET_ARCH = 'amd64'
 
 env = Environment(ENV = os.environ, tools = [defEnv['tools']], options = opts,
-		TARGET_ARCH = TARGET_ARCH, MSVS_ARCH = TARGET_ARCH,
-		MSVC_USE_SCRIPT = False) # TODO this disables SCons' automatic env setup as it doesn't know about VC 11 yet
+		TARGET_ARCH = TARGET_ARCH, MSVS_ARCH = TARGET_ARCH)
 
 if 'mingw' not in env['TOOLS'] and 'gcc' in env['TOOLS']:
 	raise Exception('Non-mingw gcc builds not supported')

=== modified file 'build_util.py'
--- build_util.py	2012-07-02 21:37:23 +0000
+++ build_util.py	2012-08-25 13:08:38 +0000
@@ -77,9 +77,8 @@
 
 			# work around a few bugs in MSVC project generation, see msvcproj_workarounds for details.
 			from SCons.Action import Action
-			from SCons.Tool.msvs import GenerateProject, GenerateSolution
+			from SCons.Tool.msvs import GenerateProject
 			self.env['MSVSPROJECTCOM'] = [Action(GenerateProject, None), Action(msvcproj_workarounds, None)]
-			self.env['MSVSSOLUTIONCOM'] = [Action(GenerateSolution, None), Action(msvcsol_workarounds, None)]
 
 	def finalize(self):
 		if self.env['msvcproj']:
@@ -350,23 +349,10 @@
 	contents = re.sub('<ItemGroup>\s*<None Include="SConstruct" />\s*</ItemGroup>', '', contents)
 
 	# update the platform toolset to the VS 2012 one.
-	# TODO remove when SCons knows about VS 2012.
+	# TODO remove when SCons adds this.
 	contents = contents.replace('<UseOfMfc>false</UseOfMfc>',
 	'<UseOfMfc>false</UseOfMfc>\r\n\t\t<PlatformToolset>v110</PlatformToolset>')
 
 	f = open(str(target[0]), 'wb')
 	f.write(contents)
 	f.close()
-
-def msvcsol_workarounds(target, source, env):
-	f = open(str(target[0]), 'rb')
-	contents = f.read()
-	f.close()
-
-	# modify solution files to open in VS 2012 by default.
-	# TODO remove when SCons knows about VS 2012.
-	contents = contents.replace('# Visual Studio 2010', '# Visual Studio 2012')
-
-	f = open(str(target[0]), 'wb')
-	f.write(contents)
-	f.close()

=== modified file 'changelog.txt'
--- changelog.txt	2012-08-02 17:11:14 +0000
+++ changelog.txt	2012-08-25 13:08:38 +0000
@@ -33,6 +33,7 @@
 * Add QP support (iceman50)
 * [L#305811] Grant extra slot hangs connection in ADC hubs (iceman50)
 * [L#1032227] Fix a crash when parsing messages with Magnet links (poy)
+* [L#1039537] Fix a crash in Windows 8 (poy)
 
 -- 0.799 2012-05-05 --
 * Add icons (iceman50)

=== modified file 'dwt/include/dwt/aspects/Scrollable.h'
--- dwt/include/dwt/aspects/Scrollable.h	2012-06-08 15:27:48 +0000
+++ dwt/include/dwt/aspects/Scrollable.h	2012-08-25 13:08:38 +0000
@@ -36,7 +36,6 @@
 #ifndef DWT_aspects_Scrollable_h
 #define DWT_aspects_Scrollable_h
 
-#include "../DWTException.h"
 #include "../Message.h"
 
 namespace dwt { namespace aspects {
@@ -88,9 +87,7 @@
 template<typename WidgetType>
 SCROLLINFO Scrollable<WidgetType>::getScrollInfo(int fnBar, unsigned mask) const {
 	SCROLLINFO info = { sizeof(SCROLLINFO), mask };
-	if(!::GetScrollInfo(H(), fnBar, &info)) {
-		throw Win32Exception("aspects::Scrollable: Can't get scroll info");
-	}
+	::GetScrollInfo(H(), fnBar, &info);
 	return info;
 }