Skip to content

Commit cb6f62b

Browse files
author
Dale Wilson
committed
Setup is aware of VC versions up to 15
1 parent 2f652ba commit cb6f62b

File tree

2 files changed

+62
-34
lines changed

2 files changed

+62
-34
lines changed

‎setup.cmd

+59-34
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ REM Setting up QuickFAST environment
1717
@echo off
1818
REM =====================================================================================
1919
REM EDIT THE FOLLOWING LINES OR SET THESE VALUES IN YOUR ENVIRONMENT BEFORE RUNNING SETUP
20-
if "a" == "a%MPC_ROOT%" set MPC_ROOT=c:\MPC
21-
if "a" == "a%XERCESCROOT%" set XERCESCROOT=C:\Progs\xerces-c-3.0.1-x86-windows-vc-9.0
22-
if "a" == "a%BOOST_VERSION%" set BOOST_VERSION=boost_1_43_0
20+
if "a" == "a%MPC_ROOT%" set MPC_ROOT=c:\MPC\MPC_4_1_22
21+
if "a" == "a%XERCESROOT%" set XERCESROOT=C:\Progs\xerces\xerces-c-3.1.1-x86_64-windows-vc-10.0
22+
if "a" == "a%BOOST_VERSION%" set BOOST_VERSION=boost_1_62_0
2323
if "a" == "a%BOOST_ROOT%" set BOOST_ROOT=c:\boost\%BOOST_VERSION%
2424
REM END OF VALUES TO BE SET
2525
REM =====================================================================================
@@ -32,8 +32,8 @@ REM Verify setup by checking for expected files/directories
3232
set SETUP_CHECKING=MPC_ROOT=%MPC_ROOT%
3333
if not exist "%MPC_ROOT%\mpc.pl" goto setup_is_bad
3434

35-
set SETUP_CHECKING=XERCESCROOT=%XERCESCROOT%
36-
if not exist "%XERCESCROOT%\lib" goto setup_is_bad
35+
set SETUP_CHECKING=XERCESROOT=%XERCESROOT%
36+
if not exist "%XERCESROOT%\lib" goto setup_is_bad
3737

3838
set SETUP_CHECKING=BOOST_ROOT=%BOOST_ROOT%
3939
if not exist "%BOOST_ROOT%\boost" goto setup_is_bad
@@ -43,59 +43,84 @@ if not exist "%BOOST_ROOT%\lib" goto setup_is_bad
4343

4444
REM Find visual studio.
4545
REM You can short-circuit this by setting VCVER before running this
46-
REM However this also avoids the check to see if VC is installed in the expected place.
47-
set SETUP_CHECKING=Setup checking visual studio common tools
46+
REM However this also avoids the check to see if VC is installed in the expected place
47+
48+
rem if VCVER is already set, skip the discovery
4849
if not "a" == "a%VCVER%" goto setup_is_ok
50+
51+
set SETUP_CHECKING=Setup checking visual studio common tools
52+
53+
echo on
54+
set VCVER=15
55+
set SETUP_CHECKING=VS150COMNTOOLS=%VS150COMNTOOLS%
56+
set VS_COMMON_TOOLS=%VS150COMNTOOLS%
57+
set VC_ROOT=C:\%PROGRAM_FILES_X86%\Microsoft Visual Studio 15.0\VC\bin
58+
if exist "%VS_COMMON_TOOLS%VSVARS32.BAT" goto setup_is_ok
59+
60+
set VCVER=14
61+
set SETUP_CHECKING=VS140COMNTOOLS=%VS140COMNTOOLS%
62+
set VS_COMMON_TOOLS=%VS140COMNTOOLS%
63+
set VC_ROOT=C:\%PROGRAM_FILES_X86%\Microsoft Visual Studio 14.0\VC\bin
64+
if exist "%VS_COMMON_TOOLS%VSVARS32.BAT" goto setup_is_ok
65+
66+
set VCVER=13
67+
set SETUP_CHECKING=VS130COMNTOOLS=%VS130COMNTOOLS%
68+
set VS_COMMON_TOOLS=%VS130COMNTOOLS%
69+
set VC_ROOT=C:\%PROGRAM_FILES_X86%\Microsoft Visual Studio 13.0\VC\bin
70+
if exist "%VS_COMMON_TOOLS%VSVARS32.BAT" goto setup_is_ok
71+
72+
set VCVER=12
73+
set SETUP_CHECKING=VS120COMNTOOLS=%VS120COMNTOOLS%
74+
set VS_COMMON_TOOLS=%VS130COMNTOOLS%
75+
set VC_ROOT=C:\%PROGRAM_FILES_X86%\Microsoft Visual Studio 12.0\VC\bin
76+
if exist "%VS_COMMON_TOOLS%VSVARS32.BAT" goto setup_is_ok
77+
78+
set VCVER=11
79+
set SETUP_CHECKING=VS110COMNTOOLS=%VS110COMNTOOLS%
80+
set VS_COMMON_TOOLS=%VS110COMNTOOLS%
81+
set VC_ROOT=C:\%PROGRAM_FILES_X86%\Microsoft Visual Studio 11.0\VC\bin
82+
if exist "%VS_COMMON_TOOLS%VSVARS32.BAT" goto setup_is_ok
83+
4984
set VCVER=10
5085
set SETUP_CHECKING=VS100COMNTOOLS=%VS100COMNTOOLS%
51-
if exist "%VS100COMNTOOLS%VSVARS32.BAT" goto setup_is_ok
86+
set VS_COMMON_TOOLS=%VS100COMNTOOLS%
87+
set VC_ROOT=C:\%PROGRAM_FILES_X86%\Microsoft Visual Studio 10.0\VC\bin
88+
if exist "%VS_COMMON_TOOLS%VSVARS32.BAT" goto setup_is_ok
89+
5290
set VCVER=9
5391
set SETUP_CHECKING=VS90COMNTOOLS=%VS90COMNTOOLS%
54-
if exist "%VS90COMNTOOLS%VSVARS32.BAT" goto setup_is_ok
92+
set VS_COMMON_TOOLS=%VS90COMNTOOLS%
93+
set VC_ROOT=C:\%PROGRAM_FILES_X86%\Microsoft Visual Studio 9.0\VC\bin
94+
if exist "%VS_COMMON_TOOLS%VSVARS32.BAT" goto setup_is_ok
95+
5596
set VCVER=8
5697
set SETUP_CHECKING=VS80COMNTOOLS=%VS80COMNTOOLS%
57-
if exist "%VS80COMNTOOLS%VSVARS32.BAT" goto setup_is_ok
98+
set VS_COMMON_TOOLS=%VS80COMNTOOLS%
99+
set VC_ROOT=C:\%PROGRAM_FILES_X86%\Microsoft Visual Studio 8.0\VC\bin
100+
if exist "%VS_COMMON_TOOLS%VSVARS32.BAT" goto setup_is_ok
58101
REM goto setup_is_bad (you are here)
59102

60103
:setup_is_bad
61104
ECHO Setup check failed: %SETUP_CHECKING%
62105
ECHO Edit the setup.cmd file or change environment variables
106+
ECHO run setup_clear.cmd to clean up before trying again.
63107
goto end
64108

65109
:setup_is_ok
66110
set SETUP_CHECKING=
67111

68-
set XERCESLIB=%XERCESCROOT%\lib
112+
set XERCESLIB=%XERCESROOT%\lib
69113
set QUICKFAST_ROOT=%CD%
70-
71-
rem must be outside the if because of the parens in the directory name [what was microsoft thinking?]
72-
if %VCVER%==10 goto isVC10
73-
if %VCVER%==9 goto isVC9
74-
if %VCVER%==8 goto isVC8
75-
echo "UNKNOWN OR UNSUPPORTED VISUAL STUDIO VERSION: %VCVER%
76-
goto end
77-
78-
:isVC10
79-
set VC_ROOT=C:\%PROGRAM_FILES_X86%\Microsoft Visual Studio 10.0\VC\bin
80-
@call "%VS100COMNTOOLS%VSVARS32.BAT" >nul
81-
goto vcIsSet
82-
:isVC9
83-
set VC_ROOT=C:\%PROGRAM_FILES_X86%\Microsoft Visual Studio 9.0\VC\bin
84-
call "%VS90COMNTOOLS%VSVARS32.BAT" >nul
85-
goto vcIsSet
86-
:isVC8
87-
set VC_ROOT=C:\%PROGRAM_FILES_X86%\Microsoft Visual Studio 8\VC\bin
88-
call "%VS80COMNTOOLS%VSVARS32.BAT" >nul
89-
:vcIsSet
114+
@call "%VS_COMMON_TOOLS%VSVARS32.BAT" >nul
90115

91116
REM: This avoids growing PATH and INCLUDE every time setup is run
92117
if "a" == "a%BASE_PATH%" set BASE_PATH=%PATH%
93118
if "a" == "a%BASE_INCLUDE%" set BASE_INCLUDE=%INCLUDE%
94119

95-
set RELEASE_PATH=%QUICKFAST_ROOT%\bin;%QUICKFAST_ROOT%\Output\Release;%MPC_ROOT%;%BOOST_ROOT%\lib;%QUICKFAST_ROOT%\lib;%XERCESCROOT%\bin;%BASE_PATH%
96-
set DEBUG_PATH=%QUICKFAST_ROOT%\bin;%QUICKFAST_ROOT%\Output\Debug;%MPC_ROOT%;%BOOST_ROOT%\lib;%QUICKFAST_ROOT%\lib;%XERCESCROOT%\bin;%BASE_PATH%
120+
set RELEASE_PATH=%QUICKFAST_ROOT%\bin;%QUICKFAST_ROOT%\Output\Release;%MPC_ROOT%;%BOOST_ROOT%\lib;%QUICKFAST_ROOT%\lib;%XERCESROOT%\bin;%BASE_PATH%
121+
set DEBUG_PATH=%QUICKFAST_ROOT%\bin;%QUICKFAST_ROOT%\Output\Debug;%MPC_ROOT%;%BOOST_ROOT%\lib;%QUICKFAST_ROOT%\lib;%XERCESROOT%\bin;%BASE_PATH%
97122
set PATH=%DEBUG_PATH%
98-
set INCLUDE=%BOOST_ROOT%;%XERCESCROOT%\include;%BASE_INCLUDE%
123+
set INCLUDE=%BOOST_ROOT%;%XERCESROOT%\include;%BASE_INCLUDE%
99124

100125
title QuickFAST
101126
:end

‎setup_clear.cmd

+3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55
REM This undefines the variables set by Setup to make it easy to rerun
66
REM setup after making changes. It should not be needed unless you are
77
REM editing the setup.cmd file.
8+
set VCVER=
89
set MPC_ROOT=
910
set XERCES_ROOT=
1011
set XERCES_LIBNAME=
12+
set XERCESCROOT=
13+
set XERCESLIB=
1114
set BOOST_VERSION=
1215
set BOOST_ROOT=

0 commit comments

Comments
 (0)