[Xlw-cvs] SF.net SVN: xlw:[1446] trunk/xlw/xlwdotnet.nsi

[<ad...@us...>]

Revision: 1446
          http://xlw.svn.sourceforge.net/xlw/?rev=1446&view=rev
Author:   adcockj
Date:     2012-12-16 10:45:08 +0000 (Sun, 16 Dec 2012)
Log Message:
-----------
Fix 2010 pro detection and create message for 2012 detection

Modified Paths:
--------------
    trunk/xlw/xlwdotnet.nsi

Modified: trunk/xlw/xlwdotnet.nsi
===================================================================
--- trunk/xlw/xlwdotnet.nsi	2012-12-14 07:17:57 UTC (rev 1445)
+++ trunk/xlw/xlwdotnet.nsi	2012-12-16 10:45:08 UTC (rev 1446)
@@ -1130,10 +1130,7 @@
 	!insertmacro FINDENV HKLM "Software\Microsoft\VisualStudio\9.0\InstalledProducts\Microsoft Visual Basic" "Package"  "Visual Studio 2008 VisualBasic"
 	Pop $VS2008PRO_VisualBasic_INST
 	
-	
-	# Visual Studio 2012
-	ReadEnvStr $VS2012_INST  "VS110COMNTOOLS"  
-	
+
 	# Visual Studio 2010
 	
 	!insertmacro FINDENV HKLM "Software\Microsoft\VisualStudio\10.0\InstalledProducts\Microsoft Visual C++" "Package"  "Visual Studio 2010 C++"
@@ -1185,6 +1182,13 @@
 	!insertmacro FINDENV HKLM "Software\Microsoft\VBExpress\10.0\InstalledProducts\Microsoft Visual Basic" "Package"  "Visual Studio Express 2010 VisualBasic"
 	Pop $VS2010EXP_VisualBasic_INST
 	
+	# Visual Studio 2012
+	ReadEnvStr $VS2012_INST  "VS110COMNTOOLS"  
+	${If} $VS2012_INST != ""
+		${NSD_LB_AddString} $ListBox_right "Detected Visual Studio 2012"
+		!insertmacro insertline
+	${EndIf}
+
 	
 	# gcc
 	
@@ -1258,6 +1262,11 @@
 		SectionSetFlags ${VS2012} 1
 	${EndIf}
 	
+	${If} $VS2010PRO_CPP_INST != ""  
+		SectionSetFlags ${VS2010} 1
+		StrCpy $CPP_DETECTED  "1"
+	${EndIf}
+
 	${If} $VS2010EXP_CPP_INST != ""  
 		SectionSetFlags ${VS2010} 1
 		StrCpy $CPP_DETECTED  "1"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.