Windows: Detect VC version instead of hardcoding it

diff --git a/cf/w32-detect-vc-version.pl b/cf/w32-detect-vc-version.pl
new file mode 100644 (file)
index 0000000..213ca29
--- /dev/null
+++ b/cf/w32-detect-vc-version.pl
@@ -0,0 +1,49 @@
+########################################################################
+#
+# Copyright (c) 2010, Secure Endpoints Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in
+#   the documentation and/or other materials provided with the
+#   distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+# Try to detect the version of Visual C++ in use by parsing the output
+# of cl.exe.
+
+$cl_cmd = shift;
+
+die "C compiler command should be specified" if ($cl_cmd eq '');
+
+open(CL, '-|', $cl_cmd." 2>&1") or die "Can't run C compiler command [$cl_cmd]";
+
+$verline = <CL>;
+
+if ($verline =~ /(\d+).(\d+).(\d+).(\d+)/) {
+    print "Found Version: $1.$2.$3.$4\n";
+    exit $1 + 0;
+} else {
+    print "Mismatch";
+    exit 1;
+}

diff --git a/packages/windows/installer/NTMakefile b/packages/windows/installer/NTMakefile
index ac1be409abed57129cd67f3743a66bdcbdfb4139..5a4d2c7cf79bf6e5d99a41418fd0fcc8380afdb3 100644 (file)
--- a/packages/windows/installer/NTMakefile
+++ b/packages/windows/installer/NTMakefile
@@ -76,7 +76,13 @@ clean::
 ######################################################################
 # Runtime modules
 
+!if [ $(PERL) $(SRC)\cf\w32-detect-vc-version.pl $(CC) ]==15
 VCVER=VC90
+!elseif [ $(PERL) $(SRC)\cf\w32-detect-vc-version.pl $(CC) ]==14
+VCVER=VC80
+!else
+!  error Cant determine Visual C compiler version
+!endif
 
 !if "$(CPU)"=="AMD64"
 CPUSUFFIX=_x64