From 3ba7f01b94d299599f40e88492092f404cd9090b Mon Sep 17 00:00:00 2001 From: "Richard S. Wright Jr." Date: Tue, 12 Nov 2024 12:44:56 -0500 Subject: [PATCH 1/2] NSIS installer is deprecated and no longer used --- windows-runtime-installer/CMakeLists.txt | 26 --- windows-runtime-installer/InstallerRT.nsi | 165 ------------------ windows-runtime-installer/NSIS_Security.patch | 58 ------ windows-runtime-installer/README.md | 37 ---- windows-runtime-installer/V.bmp | Bin 27626 -> 0 bytes windows-runtime-installer/V.ico | Bin 101492 -> 0 bytes .../VulkanRT-License.txt | 79 --------- .../VulkanRT-License.txt.in | 79 --------- 8 files changed, 444 deletions(-) delete mode 100644 windows-runtime-installer/CMakeLists.txt delete mode 100644 windows-runtime-installer/InstallerRT.nsi delete mode 100644 windows-runtime-installer/NSIS_Security.patch delete mode 100644 windows-runtime-installer/README.md delete mode 100644 windows-runtime-installer/V.bmp delete mode 100644 windows-runtime-installer/V.ico delete mode 100644 windows-runtime-installer/VulkanRT-License.txt delete mode 100644 windows-runtime-installer/VulkanRT-License.txt.in diff --git a/windows-runtime-installer/CMakeLists.txt b/windows-runtime-installer/CMakeLists.txt deleted file mode 100644 index d27bef8ef..000000000 --- a/windows-runtime-installer/CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ -# ~~~ -# Copyright (c) 2023 Valve Corporation -# Copyright (c) 2023 LunarG, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ~~~ - -string(TIMESTAMP CURRENT_YEAR "%Y") - -# Keep windows-runtime-installer/VulkanRT-License.txt up to date. -# https://github.com/KhronosGroup/Vulkan-Tools/issues/754 -configure_file( - ${CMAKE_CURRENT_LIST_DIR}/VulkanRT-License.txt.in - ${CMAKE_CURRENT_LIST_DIR}/VulkanRT-License.txt - @ONLY -) diff --git a/windows-runtime-installer/InstallerRT.nsi b/windows-runtime-installer/InstallerRT.nsi deleted file mode 100644 index 63e555c75..000000000 --- a/windows-runtime-installer/InstallerRT.nsi +++ /dev/null @@ -1,165 +0,0 @@ -# The Vulkan runtime installer NSIS script - -!include LogicLib.nsh - -# Input file locations -!define RES "." - -# Input parameters -!ifndef MAJOR - !define MAJOR "1" - !define MINOR "1" - !define PATCH "73" - !define BUILD "0.dev" -!endif -!define VERSION "${MAJOR}.${MINOR}.${PATCH}.${BUILD}" -!ifndef PUBLISHER - !define PUBLISHER "YourCompany, Inc." -!endif -!ifndef COPYRIGHT - !define COPYRIGHT "" -!endif - -# Installer information -Icon ${RES}\V.ico -OutFile "VulkanRT-${VERSION}-Installer.exe" -InstallDir "$PROGRAMFILES\VulkanRT" - -RequestExecutionLevel admin -AddBrandingImage left 150 -Caption "Vulkan Runtime ${VERSION} Setup" -Name "Vulkan Runtime ${VERSION}" -LicenseData "${RES}\VulkanRT-License.txt" -Page custom brandimage "" ": Brand Image" -Page license -Page instfiles - -VIProductVersion "${VERSION}" -VIAddVersionKey "ProductName" "Vulkan Runtime" -VIAddVersionKey "FileVersion" "${VERSION}" -VIAddVersionKey "ProductVersion" "${VERSION}" -VIAddVersionKey "LegalCopyright" "${COPYRIGHT}" -VIAddVersionKey "FileDescription" "Vulkan Runtime Installer" - -Function brandimage - SetOutPath "$TEMP" - SetFileAttributes V.bmp temporary - File "${RES}\V.bmp" - SetBrandingImage "$TEMP/V.bmp" -Functionend - -# Utilties to check if a file is older than this installer or not -Function NeedsReplacing - Pop $0 - - # Extract the version of the existing file - GetDllVersion "$0" $R0 $R1 - IntOp $R2 $R0 >> 16 - IntOp $R2 $R2 & 0xffff - IntOp $R3 $R0 & 0xffff - IntOp $R4 $R1 >> 16 - IntOp $R4 $R4 & 0xffff - IntOp $R5 $R1 & 0xffff - - # Check major versions - ${IF} ${MAJOR} > $R2 - Push True - ${ELSEIF} ${MAJOR} < $R2 - Push False - - # Check minor versions - ${ELSEIF} ${MINOR} > $R3 - Push True - ${ELSEIF} ${MINOR} < $R3 - Push False - - # Check patch versions - ${ELSEIF} ${PATCH} > $R4 - Push True - ${ELSEIF} ${PATCH} < $R4 - Push False - - # Check build versions - ${ELSEIF} ${BUILD} > $R5 - Push True - ${ELSEIF} ${BUILD} < $R5 - Push False - - # If they match exactly, then we update - ${ELSE} - Push True - ${ENDIF} -FunctionEnd - -!macro InstallIfNewer SrcPath OutName - Push "$OUTDIR\${OutName}" - Call NeedsReplacing - Pop $0 - - ${IF} $0 == True - DetailPrint "File $OUTDIR\${OutName} (version $R2.$R3.$R4.$R5) will be upgraded to ${VERSION}" - File /oname=${OutName} "${SrcPath}" - ${ELSE} - DetailPrint "File $OUTDIR\${OutName} (version $R2.$R3.$R4.$R5) will not be replaced with ${VERSION}" - ${ENDIF} -!macroend - -# Utilities to check if this is a 64-bit OS or not -!define IsWow64 `"" IsWow64 ""` -!macro _IsWow64 _a _b _t _f - !insertmacro _LOGICLIB_TEMP - System::Call kernel32::GetCurrentProcess()p.s - System::Call kernel32::IsWow64Process(ps,*i0s) - Pop $_LOGICLIB_TEMP - !insertmacro _!= $_LOGICLIB_TEMP 0 `${_t}` `${_f}` -!macroend - -!define RunningX64 `"" RunningX64 ""` -!macro _RunningX64 _a _b _t _f - !if ${NSIS_PTR_SIZE} > 4 - !insertmacro LogicLib_JumpToBranch `${_t}` `${_f}` - !else - !insertmacro _IsWow64 `${_a}` `${_b}` `${_t}` `${_f}` - !endif -!macroend - -# Installer -Section - Delete "$INSTDIR\install.log" - Delete "$INSTDIR\VULKANRT_LICENSE.rtf" - LogSet on - - # Disable filesystem redirection - System::Call kernel32::Wow64EnableWow64FsRedirection(i0) - - ${IF} ${RunningX64} - SetOutPath $WINDIR\System32 - !insertmacro InstallIfNewer "${LOADER64}" "vulkan-1.dll" - !insertmacro InstallIfNewer "${LOADER64}" "vulkan-1-999-0-0-0.dll" - !insertmacro InstallIfNewer "${VULKANINFO64}" "vulkaninfo.exe" - !insertmacro InstallIfNewer "${VULKANINFO64}" "vulkaninfo-1-999-0-0-0.exe" - SetOutPath $WINDIR\SysWOW64 - ${ELSE} - SetOutPath $WINDIR\System32 - ${ENDIF} - - # Install 32-bit contents - !insertmacro InstallIfNewer "${LOADER32}" "vulkan-1.dll" - !insertmacro InstallIfNewer "${LOADER32}" "vulkan-1-999-0-0-0.dll" - !insertmacro InstallIfNewer "${VULKANINFO32}" "vulkaninfo.exe" - !insertmacro InstallIfNewer "${VULKANINFO32}" "vulkaninfo-1-999-0-0-0.exe" - - # Dump licenses into a the installation directory - SetOutPath "$INSTDIR" - AccessControl::DisableFileInheritance $INSTDIR - AccessControl::SetFileOwner $INSTDIR "Administrators" - AccessControl::ClearOnFile $INSTDIR "Administrators" "FullAccess" - AccessControl::SetOnFile $INSTDIR "SYSTEM" "FullAccess" - AccessControl::GrantOnFile $INSTDIR "Everyone" "ListDirectory" - AccessControl::GrantOnFile $INSTDIR "Everyone" "GenericExecute" - AccessControl::GrantOnFile $INSTDIR "Everyone" "GenericRead" - AccessControl::GrantOnFile $INSTDIR "Everyone" "ReadAttributes" - File "${RES}\VulkanRT-License.txt" - - LogSet off -SectionEnd diff --git a/windows-runtime-installer/NSIS_Security.patch b/windows-runtime-installer/NSIS_Security.patch deleted file mode 100644 index b275aae0a..000000000 --- a/windows-runtime-installer/NSIS_Security.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/nsis-3.0b3-src/SCons/Config/ms b/nsis-3.0b3-src/SCons/Config/ms -index 32d3d33..d2c4d25 100644 ---- a/nsis-3.0b3-src/SCons/Config/ms -+++ b/nsis-3.0b3-src/SCons/Config/ms -@@ -16,7 +16,7 @@ def entry(x,u): - - defenv['ENTRY_FLAG'] = entry - defenv['MAP_FLAG'] = '/map' --defenv['NODEFLIBS_FLAG'] = '/NODEFAULTLIB' -+#defenv['NODEFLIBS_FLAG'] = '/NODEFAULTLIB' - defenv['C_FLAG'] = '/TC' - defenv['CPP_FLAG'] = '/TP' - defenv['CPP_REQUIRES_STDLIB'] = 0 -@@ -29,7 +29,7 @@ defenv['STDCALL'] = '__stdcall' - msvs_version = float(defenv['MSVS_VERSION'].replace('Exp','')) - if msvs_version >= 8.0: - defenv['EXCEPTION_FLAG'] = '/EHsc' -- defenv.Append(CCFLAGS = ['/GS-']) -+ defenv.Append(CCFLAGS = ['/GS']) - defenv.Append(CPPDEFINES = ['_CRT_SECURE_NO_WARNINGS', '_CRT_NONSTDC_NO_WARNINGS', '_CRT_SECURE_NO_DEPRECATE', '_CRT_NON_CONFORMING_SWPRINTFS']) - defenv['MSVCRT_FLAG'] = '/MT' # Avoid msvcr?0.dll dependency - else: -@@ -43,6 +43,10 @@ if msvs_version >= 11.0: - defenv['SUBSYS_CON'] = '/subsystem:console,5.01' # support windows xp - defenv['SUBSYS_WIN'] = '/subsystem:windows,5.01' # support windows xp - -+if msvs_version >= 14.0: -+ defenv.Append(CCFLAGS = ['/guard:cf']) -+ defenv.Append(LINKFLAGS = ['/guard:cf']) -+ - ### defines - - defenv.Append(CPPDEFINES = [('NSISCALL', '$STDCALL')]) -@@ -143,9 +147,9 @@ stub_env.Append(CCFLAGS = ['/Fa${TARGET}.lst']) # listing file name - stub_env.Append(LINKFLAGS = ['$NODEFLIBS_FLAG']) # no default libraries - stub_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file - --if msvs_version >= 10.0: -- # no relocations that our resource editor ignores -- stub_env.Append(LINKFLAGS = ['/FIXED']) -+#if msvs_version >= 10.0: -+# # no relocations that our resource editor ignores -+# stub_env.Append(LINKFLAGS = ['/FIXED']) - - stub_uenv = stub_env.Clone() - stub_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE']) -diff --git a/nsis-3.0b3-src/Source/exehead/Main.c b/nsis-3.0b3-src/Source/exehead/Main.c -index eb231e7..e4642ce 100644 ---- a/nsis-3.0b3-src/Source/exehead/Main.c -+++ b/nsis-3.0b3-src/Source/exehead/Main.c -@@ -84,6 +84,7 @@ void *g_SHGetFolderPath; - NSIS_ENTRYPOINT_GUINOCRT - EXTERN_C void NSISWinMainNOCRT() - { -+ __security_init_cookie(); - int ret = 0; - const TCHAR *m_Err = _LANG_ERRORWRITINGTEMP; - diff --git a/windows-runtime-installer/README.md b/windows-runtime-installer/README.md deleted file mode 100644 index 81c581251..000000000 --- a/windows-runtime-installer/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# Windows Runtime Installer - -This directory contains the files required for building the Windows Vulkan Runtime Installer package. -The runtime installer is a method of delivering a Vulkan loader to system. -The runtime installer is used by the SDK installer. -It is also used by some drivers to ensure that an adequate Vulkan loader is installed on a system. -Additionally, applications may install a runtime to ensure that a minimum loader version is present. - -To build a runtime installer: -1. Get a copy of the Nullsoft Install System (NSIS) version 3.0b3. - Other versions may work, but the patch included in this directory is built against version 3.0b3. - Apply the `NSIS_Security.patch` file provided in this directory to the NSIS source code. - This security patch adds the /DYNAMICBASE /GS, and /guard:cf options to the build. - In addition, it will be necessary to specify NSIS_CONFIG_LOG=yes and NSIS_MAX_STRLEN=8192 when compiling. - Once you have applied the patch, compile NSIS with the command: - ``` - scons SKIPUTILS="NSIS Menu","MakeLangId" UNICODE=yes \ - ZLIB_W32=\zlib-1.2.7-win32-x86 NSIS_MAX_STRLEN=8192 \ - NSIS_CONFIG_LOG=yes NSIS_CONFIG_LOG_TIMESTAMP=yes \ - APPEND_CCFLAGS="/DYNAMICBASE /Zi" APPEND_LINKFLAGS="/DYNAMICBASE \ - /DEBUG /OPT:REF /OPT:ICF" SKIPDOC=all dist-zip - ``` - -2. The compilation should have created a zip file containing the new NSIS build. - Unzip this file to the location of your choosing. - Download the NSIS Access Control plugin in copy it into the plugin directory in the build you just unzipped. - It may be useful to prepend this NSIS binary directory to your system's path, so that this NSIS will be run when you type "makensis". - Otherwise, you will just have to specify the full path to makensis.exe in the following steps. - It may be useful to verify that all shared libraries in the build have the DYNAMIC_BASE and NX_COMPAT flags set. - -3. Build the Vulkan-Loader repository and this one. - -4. Build the runtime installer from this directory with the command: - ``` - makensis InstallerRT.nsi -DLOADER64="?" -DLOADER32="?" -DVULKANINFO64="?" -DVULKANINFO32="?" - ``` - where the question marks are replaced with the 64 and 32 bit versions of the loader and vulkaninfo builds. diff --git a/windows-runtime-installer/V.bmp b/windows-runtime-installer/V.bmp deleted file mode 100644 index dea3353c377ad314c02ad561eb59a2fdab26f6df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27626 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 diff --git a/windows-runtime-installer/V.ico b/windows-runtime-installer/V.ico deleted file mode 100644 index 61166983ebd857cec8c7c3bc8e2249567889e02d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 101492 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 -Copyright (c) 2015-2024 The Khronos Group Inc. -Copyright (c) 2015-2024 Valve Corporation -Copyright (c) 2015-2024 LunarG, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and/or associated documentation files (the "Materials"), to -deal in the Materials without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Materials, and to permit persons to whom the Materials are -furnished to do so, subject to the following conditions: - -The above copyright notice(s) and this permission notice shall be included in -all copies or substantial portions of the Materials. - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE -USE OR OTHER DEALINGS IN THE MATERIALS. diff --git a/windows-runtime-installer/VulkanRT-License.txt.in b/windows-runtime-installer/VulkanRT-License.txt.in deleted file mode 100644 index 06c5f249a..000000000 --- a/windows-runtime-installer/VulkanRT-License.txt.in +++ /dev/null @@ -1,79 +0,0 @@ -Copyright (c) 2015-@CURRENT_YEAR@ The Khronos Group Inc. -Copyright (c) 2015-@CURRENT_YEAR@ LunarG, Inc. -Copyright (c) 2015-@CURRENT_YEAR@ Valve Corporation - -The Vulkan Runtime is comprised of 100% open-source components (MIT, and -Apache 2.0). The text of such licenses is included below along with the -copyrights. - -ALL INFORMATION HERE IS PROVIDED "AS IS." LUNARG MAKES NO REPRESENTATIONS OR -WARRANTIES, EXPRESS OR IMPLIED, WITH REGARD TO THIS LIST OR ITS ACCURACY OR -COMPLETENESS, OR WITH RESPECT TO ANY RESULTS TO BE OBTAINED FROM USE OR -DISTRIBUTION OF THE LIST. BY USING OR DISTRIBUTING THIS LIST, YOU AGREE THAT -IN NO EVENT SHALL LUNARG BE HELD LIABLE FOR ANY DAMAGES WHATSOEVER RESULTING -FROM ANY USE OR DISTRIBUTION OF THIS LIST, INCLUDING, WITHOUT LIMITATION, ANY -SPECIAL, CONSEQUENTIAL, INCIDENTAL OR OTHER DIRECT OR INDIRECT DAMAGES. - -=========================Apache 2.0========================= -Licensed under the Apache License, Version 2.0 (the "License"); you may not -use this file except in compliance with the License. You may obtain a copy -of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on as "AS IS" BASIS, WITHOUT -WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See -the License for the specific language governing permissions and limitations -under the License. - -============================MIT============================ - -Copyright (c) 2009 Dave Gamble -Copyright (c) 2015-@CURRENT_YEAR@ The Khronos Group Inc. -Copyright (c) 2015-@CURRENT_YEAR@ Valve Corporation -Copyright (c) 2015-@CURRENT_YEAR@ LunarG, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - -============================MIT============================ - -Copyright (c) 2014 joseph werle -Copyright (c) 2015-@CURRENT_YEAR@ The Khronos Group Inc. -Copyright (c) 2015-@CURRENT_YEAR@ Valve Corporation -Copyright (c) 2015-@CURRENT_YEAR@ LunarG, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and/or associated documentation files (the "Materials"), to -deal in the Materials without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Materials, and to permit persons to whom the Materials are -furnished to do so, subject to the following conditions: - -The above copyright notice(s) and this permission notice shall be included in -all copies or substantial portions of the Materials. - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE -USE OR OTHER DEALINGS IN THE MATERIALS. From 9100972fb9c040081376635955f552681b678f13 Mon Sep 17 00:00:00 2001 From: "Richard S. Wright Jr." Date: Tue, 12 Nov 2024 12:55:26 -0500 Subject: [PATCH 2/2] Removed runtime dir --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2dc2a6322..f35f79bb2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,7 +148,6 @@ if(BUILD_ICD) add_subdirectory(icd) endif() -add_subdirectory(windows-runtime-installer) if(BUILD_TESTS) enable_testing()