From 033550371675bb4237102a19c1f48b40a419eae0 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Fri, 2 Jun 2023 02:05:06 +0800 Subject: [PATCH] [winpcap/SDL1-mixer] Change the extension of the template MSBuild solution (#31749) * Modify the name of the template solutions * update version --------- Co-authored-by: Monica --- .../{SDL_mixer_2017.sln => SDL_mixer_2017.sln.in} | 0 ports/sdl1-mixer/portfile.cmake | 4 ++-- ports/sdl1-mixer/vcpkg.json | 2 +- ports/winpcap/{Packet.vcxproj => Packet.vcxproj.in} | 0 ports/winpcap/portfile.cmake | 7 +++---- ports/winpcap/vcpkg.json | 2 +- ports/winpcap/{wpcap.vcxproj => wpcap.vcxproj.in} | 0 versions/baseline.json | 4 ++-- versions/s-/sdl1-mixer.json | 5 +++++ versions/w-/winpcap.json | 5 +++++ 10 files changed, 19 insertions(+), 10 deletions(-) rename ports/sdl1-mixer/{SDL_mixer_2017.sln => SDL_mixer_2017.sln.in} (100%) rename ports/winpcap/{Packet.vcxproj => Packet.vcxproj.in} (100%) rename ports/winpcap/{wpcap.vcxproj => wpcap.vcxproj.in} (100%) diff --git a/ports/sdl1-mixer/SDL_mixer_2017.sln b/ports/sdl1-mixer/SDL_mixer_2017.sln.in similarity index 100% rename from ports/sdl1-mixer/SDL_mixer_2017.sln rename to ports/sdl1-mixer/SDL_mixer_2017.sln.in diff --git a/ports/sdl1-mixer/portfile.cmake b/ports/sdl1-mixer/portfile.cmake index e4dbc1f675..299e9db2c7 100644 --- a/ports/sdl1-mixer/portfile.cmake +++ b/ports/sdl1-mixer/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - file(COPY "${CMAKE_CURRENT_LIST_DIR}/SDL_mixer_2017.sln" DESTINATION "${SOURCE_PATH}/VisualC/") + configure_file("${CMAKE_CURRENT_LIST_DIR}/SDL_mixer_2017.sln.in" "${SOURCE_PATH}/VisualC/SDL_mixer_2017.sln" COPYONLY) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(LIB_TYPE StaticLibrary) @@ -73,7 +73,7 @@ else() vcpkg_install_make() vcpkg_fixup_pkgconfig() - file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") endif() file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/sdl1-mixer/vcpkg.json b/ports/sdl1-mixer/vcpkg.json index b0d9ae7d1c..52ef800e7f 100644 --- a/ports/sdl1-mixer/vcpkg.json +++ b/ports/sdl1-mixer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl1-mixer", "version-date": "2023-03-25", - "port-version": 1, + "port-version": 2, "description": "An audio mixer that supports various file formats for Simple Directmedia Layer.", "homepage": "https://www.libsdl.org", "license": "Zlib", diff --git a/ports/winpcap/Packet.vcxproj b/ports/winpcap/Packet.vcxproj.in similarity index 100% rename from ports/winpcap/Packet.vcxproj rename to ports/winpcap/Packet.vcxproj.in diff --git a/ports/winpcap/portfile.cmake b/ports/winpcap/portfile.cmake index fb3718c077..602fc28ab5 100644 --- a/ports/winpcap/portfile.cmake +++ b/ports/winpcap/portfile.cmake @@ -56,7 +56,7 @@ vcpkg_execute_required_process( ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(COPY "${CURRENT_PORT_DIR}/Packet.vcxproj" DESTINATION "${SOURCE_PATH}/packetNtx/Dll/Project/") + configure_file("${CURRENT_PORT_DIR}/Packet.vcxproj.in" "${SOURCE_PATH}/packetNtx/Dll/Project/Packet.vcxproj" COPYONLY) endif() vcpkg_build_msbuild( @@ -84,7 +84,7 @@ vcpkg_execute_required_process( ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(COPY "${CURRENT_PORT_DIR}/wpcap.vcxproj" DESTINATION "${SOURCE_PATH}/wpcap/PRJ/") + configure_file("${CURRENT_PORT_DIR}/wpcap.vcxproj.in" "${SOURCE_PATH}/wpcap/PRJ/wpcap.vcxproj" COPYONLY) endif() vcpkg_build_msbuild( @@ -168,5 +168,4 @@ endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pcap-stdinc.h" "#define inline __inline" "#ifndef __cplusplus\n#define inline __inline\n#endif") -file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "The latest license is available in https://www.winpcap.org/misc/copyright.htm and in the header files. -") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "The latest license is available in https://www.winpcap.org/misc/copyright.htm and in the header files.") diff --git a/ports/winpcap/vcpkg.json b/ports/winpcap/vcpkg.json index 8dfbb0541e..215c76b130 100644 --- a/ports/winpcap/vcpkg.json +++ b/ports/winpcap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "winpcap", "version": "4.1.3", - "port-version": 9, + "port-version": 10, "description": "WinPcap is the industry-standard tool for link-layer network access in Windows environments.", "homepage": "https://www.winpcap.org", "supports": "windows" diff --git a/ports/winpcap/wpcap.vcxproj b/ports/winpcap/wpcap.vcxproj.in similarity index 100% rename from ports/winpcap/wpcap.vcxproj rename to ports/winpcap/wpcap.vcxproj.in diff --git a/versions/baseline.json b/versions/baseline.json index b90afaad52..2de6e9fede 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7322,7 +7322,7 @@ }, "sdl1-mixer": { "baseline": "2023-03-25", - "port-version": 1 + "port-version": 2 }, "sdl1-net": { "baseline": "1.2.8", @@ -8590,7 +8590,7 @@ }, "winpcap": { "baseline": "4.1.3", - "port-version": 9 + "port-version": 10 }, "winpty": { "baseline": "0.4.3", diff --git a/versions/s-/sdl1-mixer.json b/versions/s-/sdl1-mixer.json index 540bdd76c9..aae68871ff 100644 --- a/versions/s-/sdl1-mixer.json +++ b/versions/s-/sdl1-mixer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9948f6d30a19d1be8d0de5406f7874c5991aec1", + "version-date": "2023-03-25", + "port-version": 2 + }, { "git-tree": "2e208f00e12332057ca6986afe060ff5fc1ef7cc", "version-date": "2023-03-25", diff --git a/versions/w-/winpcap.json b/versions/w-/winpcap.json index 0a62c51f05..ce841f61c4 100644 --- a/versions/w-/winpcap.json +++ b/versions/w-/winpcap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93484c8257a6ac5a90f5d540d143a6f4fe5968f2", + "version": "4.1.3", + "port-version": 10 + }, { "git-tree": "5444737a0b6d0d6a1c5129ae7435f52ac5f6bcb4", "version": "4.1.3",