From 26738d2e34bcc7620047bd23180e0e26a64c71ee Mon Sep 17 00:00:00 2001 From: Felipe Zimmerle Date: Tue, 5 Nov 2013 12:18:00 -0300 Subject: [PATCH] iis: Removes unecessary files from the build system The following files were removed: - VCVarsQueryRegistry.bat - vcvars64.bat - vsvars32.bat The visual studio files can be called direcltly, not necessary to distribute those files, at least in VS12. --- iis/winbuild/VCVarsQueryRegistry.bat | 224 --------------------------- iis/winbuild/vcvars64.bat | 113 -------------- iis/winbuild/vsvars32.bat | 118 -------------- 3 files changed, 455 deletions(-) delete mode 100644 iis/winbuild/VCVarsQueryRegistry.bat delete mode 100644 iis/winbuild/vcvars64.bat delete mode 100644 iis/winbuild/vsvars32.bat diff --git a/iis/winbuild/VCVarsQueryRegistry.bat b/iis/winbuild/VCVarsQueryRegistry.bat deleted file mode 100644 index c925743b..00000000 --- a/iis/winbuild/VCVarsQueryRegistry.bat +++ /dev/null @@ -1,224 +0,0 @@ -@call :GetWindowsSdkDir -@call :GetVSInstallDir -@call :GetVCInstallDir -@call :GetFSharpInstallDir -@if "%1"=="32bit" ( - @call :GetFrameworkDir32 - @call :GetFrameworkVer32 -) -@if "%2"=="64bit" ( - @call :GetFrameworkDir64 - @call :GetFrameworkVer64 -) -@SET Framework35Version=v3.5 - -@goto end - -@REM ----------------------------------------------------------------------- -:GetWindowsSdkDir -@set WindowsSdkDir= -@call :GetWindowsSdkDirHelper HKLM > nul 2>&1 -@if errorlevel 1 call :GetWindowsSdkDirHelper HKCU > nul 2>&1 -@if errorlevel 1 set WindowsSdkDir=%VCINSTALLDIR%\PlatformSDK\ -@exit /B 0 - -:GetWindowsSdkDirHelper -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" /v "InstallationFolder"') DO ( - @if "%%i"=="InstallationFolder" ( - @SET "WindowsSdkDir=%%k" - ) -) -@if "%WindowsSdkDir%"=="" exit /B 1 -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:GetVSInstallDir -@set VSINSTALLDIR= -@call :GetVSInstallDirHelper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVSInstallDirHelper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetVSInstallDirHelper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVSInstallDirHelper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetVSInstallDirHelper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\SxS\VS7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VSINSTALLDIR=%%k" - ) -) -@if "%VSINSTALLDIR%"=="" exit /B 1 -@exit /B 0 - -:GetVSInstallDirHelper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VSINSTALLDIR=%%k" - ) -) -@if "%VSINSTALLDIR%"=="" exit /B 1 -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:GetVCInstallDir -@set VCINSTALLDIR= -@call :GetVCInstallDirHelper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVCInstallDirHelper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetVCInstallDirHelper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVCInstallDirHelper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetVCInstallDirHelper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\SxS\VC7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VCINSTALLDIR=%%k" - ) -) -@if "%VCINSTALLDIR%"=="" exit /B 1 -@exit /B 0 - -:GetVCInstallDirHelper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VC7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VCINSTALLDIR=%%k" - ) -) -@if "%VCINSTALLDIR%"=="" exit /B 1 -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:GetFSharpInstallDir -@set FSHARPINSTALLDIR= -@call :GetFSharpInstallDirHelper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFSharpInstallDirHelper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetFSharpInstallDirHelper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFSharpInstallDirHelper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetFSharpInstallDirHelper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\10.0\Setup\F#" /v "ProductDir"') DO ( - @if "%%i"=="ProductDir" ( - @SET "FSHARPINSTALLDIR=%%k" - ) -) -@if "%FSHARPINSTALLDIR%"=="" exit /B 1 -@exit /B 0 - -:GetFSharpInstallDirHelper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\F#" /v "ProductDir"') DO ( - @if "%%i"=="ProductDir" ( - @SET "FSHARPINSTALLDIR=%%k" - ) -) -@if "%FSHARPINSTALLDIR%"=="" exit /B 1 -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:GetFrameworkDir32 -@set FrameworkDir32= -@call :GetFrameworkDir32Helper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFrameworkDir32Helper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetFrameworkDir32Helper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFrameworkDir32Helper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetFrameworkDir32Helper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\SxS\VC7" /v "FrameworkDir32"') DO ( - @if "%%i"=="FrameworkDir32" ( - @SET "FrameworkDIR32=%%k" - ) -) -@if "%FrameworkDir32%"=="" exit /B 1 -@exit /B 0 - -:GetFrameworkDir32Helper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VC7" /v "FrameworkDir32"') DO ( - @if "%%i"=="FrameworkDir32" ( - @SET "FrameworkDIR32=%%k" - ) -) -@if "%FrameworkDIR32%"=="" exit /B 1 -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:GetFrameworkDir64 -@set FrameworkDir64= -@call :GetFrameworkDir64Helper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFrameworkDir64Helper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetFrameworkDir64Helper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFrameworkDir64Helper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetFrameworkDir64Helper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\SxS\VC7" /v "FrameworkDir64"') DO ( - @if "%%i"=="FrameworkDir64" ( - @SET "FrameworkDIR64=%%k" - ) -) -@if "%FrameworkDIR64%"=="" exit /B 1 -@exit /B 0 - -:GetFrameworkDir64Helper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VC7" /v "FrameworkDir64"') DO ( - @if "%%i"=="FrameworkDir64" ( - @SET "FrameworkDIR64=%%k" - ) -) -@if "%FrameworkDIR64%"=="" exit /B 1 -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:GetFrameworkVer32 -@set FrameworkVer32= -@call :GetFrameworkVer32Helper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFrameworkVer32Helper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetFrameworkVer32Helper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFrameworkVer32Helper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetFrameworkVer32Helper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\SxS\VC7" /v "FrameworkVer32"') DO ( - @if "%%i"=="FrameworkVer32" ( - @SET "FrameworkVersion32=%%k" - ) -) -@if "%FrameworkVersion32%"=="" exit /B 1 -@exit /B 0 - -:GetFrameworkVer32Helper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VC7" /v "FrameworkVer32"') DO ( - @if "%%i"=="FrameworkVer32" ( - @SET "FrameworkVersion32=%%k" - ) -) -@if "%FrameworkVersion32%"=="" exit /B 1 -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:GetFrameworkVer64 -@set FrameworkVer64= -@call :GetFrameworkVer64Helper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFrameworkVer64Helper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetFrameworkVer64Helper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetFrameworkVer64Helper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetFrameworkVer64Helper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\SxS\VC7" /v "FrameworkVer64"') DO ( - @if "%%i"=="FrameworkVer64" ( - @SET "FrameworkVersion64=%%k" - ) -) -@if "%FrameworkVersion64%"=="" exit /B 1 -@exit /B 0 - -:GetFrameworkVer64Helper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VC7" /v "FrameworkVer64"') DO ( - @if "%%i"=="FrameworkVer64" ( - @SET "FrameworkVersion64=%%k" - ) -) -@if "%FrameworkVersion64%"=="" exit /B 1 -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:end diff --git a/iis/winbuild/vcvars64.bat b/iis/winbuild/vcvars64.bat deleted file mode 100644 index c7794638..00000000 --- a/iis/winbuild/vcvars64.bat +++ /dev/null @@ -1,113 +0,0 @@ -@echo Setting environment for using Microsoft Visual Studio 2010 x64 tools. - -@call :GetVSCommonToolsDir -@if "%VS100COMNTOOLS%"=="" goto error_no_VS100COMNTOOLSDIR - -@call "%VS100COMNTOOLS%VCVarsQueryRegistry.bat" No32bit 64bit - -@if "%VSINSTALLDIR%"=="" goto error_no_VSINSTALLDIR -@if "%VCINSTALLDIR%"=="" goto error_no_VCINSTALLDIR -@if "%FrameworkDir64%"=="" goto error_no_FrameworkDIR64 -@if "%FrameworkVersion64%"=="" goto error_no_FrameworkVer64 -@if "%Framework35Version%"=="" goto error_no_Framework35Version - -@set FrameworkDir=%FrameworkDir64% -@set FrameworkVersion=%FrameworkVersion64% - -@if not "%WindowsSdkDir%" == "" ( - @set "PATH=%WindowsSdkDir%bin\NETFX 4.0 Tools\x64;%WindowsSdkDir%bin\x64;%WindowsSdkDir%bin;%PATH%" - @set "INCLUDE=%WindowsSdkDir%include;%INCLUDE%" - @set "LIB=%WindowsSdkDir%lib\x64;%LIB%" -) - -@rem PATH -@rem ---- -@if exist "%VSINSTALLDIR%Team Tools\Performance Tools\x64" ( - @set "PATH=%VSINSTALLDIR%Team Tools\Performance Tools\x64;%VSINSTALLDIR%Team Tools\Performance Tools;%PATH%" -) -@if exist "%ProgramFiles%\HTML Help Workshop" set PATH=%ProgramFiles%\HTML Help Workshop;%PATH% -@if exist "%ProgramFiles(x86)%\HTML Help Workshop" set PATH=%ProgramFiles(x86)%\HTML Help Workshop;%PATH% -@set PATH=%VSINSTALLDIR%Common7\Tools;%PATH% -@set PATH=%VSINSTALLDIR%Common7\IDE;%PATH% -@set PATH=%VCINSTALLDIR%VCPackages;%PATH% -@set PATH=%FrameworkDir%\%Framework35Version%;%PATH% -@set PATH=%FrameworkDir%\%FrameworkVersion%;%PATH% -@set PATH=%VCINSTALLDIR%BIN\amd64;%PATH% - -@rem INCLUDE -@rem ------- -@if exist "%VCINSTALLDIR%ATLMFC\INCLUDE" set INCLUDE=%VCINSTALLDIR%ATLMFC\INCLUDE;%INCLUDE% -@set INCLUDE=%VCINSTALLDIR%INCLUDE;%INCLUDE% - -@rem LIB -@rem --- -@if exist "%VCINSTALLDIR%ATLMFC\LIB\amd64" set LIB=%VCINSTALLDIR%ATLMFC\LIB\amd64;%LIB% -@set LIB=%VCINSTALLDIR%LIB\amd64;%LIB% - -@rem LIBPATH -@rem ------- -@if exist "%VCINSTALLDIR%ATLMFC\LIB\amd64" set LIBPATH=%VCINSTALLDIR%ATLMFC\LIB\amd64;%LIBPATH% -@set LIBPATH=%VCINSTALLDIR%LIB\amd64;%LIBPATH% -@set LIBPATH=%FrameworkDir%\%Framework35Version%;%LIBPATH% -@set LIBPATH=%FrameworkDir%\%FrameworkVersion%;%LIBPATH% - -@set Platform=X64 -@set CommandPromptType=Native - -@goto end - -@REM ----------------------------------------------------------------------- -:GetVSCommonToolsDir -@set VS100COMNTOOLS= -@call :GetVSCommonToolsDirHelper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetVSCommonToolsDirHelper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\SxS\VS7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VS100COMNTOOLS=%%k" - ) -) -@if "%VS100COMNTOOLS%"=="" exit /B 1 -@SET "VS100COMNTOOLS=%VS100COMNTOOLS%Common7\Tools\" -@exit /B 0 - -:GetVSCommonToolsDirHelper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VS100COMNTOOLS=%%k" - ) -) -@if "%VS100COMNTOOLS%"=="" exit /B 1 -@SET "VS100COMNTOOLS=%VS100COMNTOOLS%Common7\Tools\" -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:error_no_VS100COMNTOOLSDIR -@echo ERROR: Cannot determine the location of the VS Common Tools folder. -@goto end - -:error_no_VSINSTALLDIR -@echo ERROR: Cannot determine the location of the VS installation. -@goto end - -:error_no_VCINSTALLDIR -@echo ERROR: Cannot determine the location of the VC installation. -@goto end - -:error_no_FrameworkDIR64 -@echo ERROR: Cannot determine the location of the .NET Framework 64bit installation. -@goto end - -:error_no_FrameworkVer64 -@echo ERROR: Cannot determine the version of the .NET Framework 64bit installation. -@goto end - -:error_no_Framework35Version -@echo ERROR: Cannot determine the .NET Framework 3.5 version. -@goto end - -:end diff --git a/iis/winbuild/vsvars32.bat b/iis/winbuild/vsvars32.bat deleted file mode 100644 index cdfc24ba..00000000 --- a/iis/winbuild/vsvars32.bat +++ /dev/null @@ -1,118 +0,0 @@ -@echo Setting environment for using Microsoft Visual Studio 2010 x86 tools. - -@call :GetVSCommonToolsDir -@if "%VS100COMNTOOLS%"=="" goto error_no_VS100COMNTOOLSDIR - -@call "%VS100COMNTOOLS%VCVarsQueryRegistry.bat" 32bit No64bit - -@if "%VSINSTALLDIR%"=="" goto error_no_VSINSTALLDIR -@if "%FrameworkDir32%"=="" goto error_no_FrameworkDIR32 -@if "%FrameworkVersion32%"=="" goto error_no_FrameworkVer32 -@if "%Framework35Version%"=="" goto error_no_Framework35Version - -@set FrameworkDir=%FrameworkDir32% -@set FrameworkVersion=%FrameworkVersion32% - -@if not "%WindowsSdkDir%" == "" ( - @set "PATH=%WindowsSdkDir%bin\NETFX 4.0 Tools;%WindowsSdkDir%bin;%PATH%" - @set "INCLUDE=%WindowsSdkDir%include;%INCLUDE%" - @set "LIB=%WindowsSdkDir%lib;%LIB%" -) - -@rem -@rem Root of Visual Studio IDE installed files. -@rem -@set DevEnvDir=%VSINSTALLDIR%Common7\IDE\ - -@rem PATH -@rem ---- -@if exist "%VSINSTALLDIR%Team Tools\Performance Tools" ( - @set "PATH=%VSINSTALLDIR%Team Tools\Performance Tools;%PATH%" -) -@if exist "%ProgramFiles%\HTML Help Workshop" set PATH=%ProgramFiles%\HTML Help Workshop;%PATH% -@if exist "%ProgramFiles(x86)%\HTML Help Workshop" set PATH=%ProgramFiles(x86)%\HTML Help Workshop;%PATH% -@if exist "%VCINSTALLDIR%VCPackages" set PATH=%VCINSTALLDIR%VCPackages;%PATH% -@set PATH=%FrameworkDir%%Framework35Version%;%PATH% -@set PATH=%FrameworkDir%%FrameworkVersion%;%PATH% -@set PATH=%VSINSTALLDIR%Common7\Tools;%PATH% -@if exist "%VCINSTALLDIR%BIN" set PATH=%VCINSTALLDIR%BIN;%PATH% -@set PATH=%DevEnvDir%;%PATH% - -@if exist "%VSINSTALLDIR%VSTSDB\Deploy" ( - @set "PATH=%VSINSTALLDIR%VSTSDB\Deploy;%PATH%" -) - -@if not "%FSHARPINSTALLDIR%" == "" ( - @set "PATH=%FSHARPINSTALLDIR%;%PATH%" -) - -@rem INCLUDE -@rem ------- -@if exist "%VCINSTALLDIR%ATLMFC\INCLUDE" set INCLUDE=%VCINSTALLDIR%ATLMFC\INCLUDE;%INCLUDE% -@if exist "%VCINSTALLDIR%INCLUDE" set INCLUDE=%VCINSTALLDIR%INCLUDE;%INCLUDE% - -@rem LIB -@rem --- -@if exist "%VCINSTALLDIR%ATLMFC\LIB" set LIB=%VCINSTALLDIR%ATLMFC\LIB;%LIB% -@if exist "%VCINSTALLDIR%LIB" set LIB=%VCINSTALLDIR%LIB;%LIB% - -@rem LIBPATH -@rem ------- -@if exist "%VCINSTALLDIR%ATLMFC\LIB" set LIBPATH=%VCINSTALLDIR%ATLMFC\LIB;%LIBPATH% -@if exist "%VCINSTALLDIR%LIB" set LIBPATH=%VCINSTALLDIR%LIB;%LIBPATH% -@set LIBPATH=%FrameworkDir%%Framework35Version%;%LIBPATH% -@set LIBPATH=%FrameworkDir%%FrameworkVersion%;%LIBPATH% - -@goto end - -@REM ----------------------------------------------------------------------- -:GetVSCommonToolsDir -@set VS100COMNTOOLS= -@call :GetVSCommonToolsDirHelper32 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper32 HKCU > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper64 HKLM > nul 2>&1 -@if errorlevel 1 call :GetVSCommonToolsDirHelper64 HKCU > nul 2>&1 -@exit /B 0 - -:GetVSCommonToolsDirHelper32 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Microsoft\VisualStudio\SxS\VS7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VS100COMNTOOLS=%%k" - ) -) -@if "%VS100COMNTOOLS%"=="" exit /B 1 -@SET "VS100COMNTOOLS=%VS100COMNTOOLS%Common7\Tools\" -@exit /B 0 - -:GetVSCommonToolsDirHelper64 -@for /F "tokens=1,2*" %%i in ('reg query "%1\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7" /v "10.0"') DO ( - @if "%%i"=="10.0" ( - @SET "VS100COMNTOOLS=%%k" - ) -) -@if "%VS100COMNTOOLS%"=="" exit /B 1 -@SET "VS100COMNTOOLS=%VS100COMNTOOLS%Common7\Tools\" -@exit /B 0 - -@REM ----------------------------------------------------------------------- -:error_no_VS100COMNTOOLSDIR -@echo ERROR: Cannot determine the location of the VS Common Tools folder. -@goto end - -:error_no_VSINSTALLDIR -@echo ERROR: Cannot determine the location of the VS installation. -@goto end - -:error_no_FrameworkDIR32 -@echo ERROR: Cannot determine the location of the .NET Framework 32bit installation. -@goto end - -:error_no_FrameworkVer32 -@echo ERROR: Cannot determine the version of the .NET Framework 32bit installation. -@goto end - -:error_no_Framework35Version -@echo ERROR: Cannot determine the .NET Framework 3.5 version. -@goto end - -:end