From b97bfb11bc245984ba2ac59df8a64efffb59d5da Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 9 Nov 2021 05:42:39 +0100 Subject: [PATCH] [tcl] no absolute paths (#21256) --- ports/tcl/portfile.cmake | 65 ++++++++++++++++++++-------------------- ports/tcl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tcl.json | 5 ++++ 4 files changed, 40 insertions(+), 34 deletions(-) diff --git a/ports/tcl/portfile.cmake b/ports/tcl/portfile.cmake index 146682d262..77347cb028 100644 --- a/ports/tcl/portfile.cmake +++ b/ports/tcl/portfile.cmake @@ -60,10 +60,10 @@ if (VCPKG_TARGET_IS_WINDOWS) # Note: tcl shell requires it to be in a folder adjacent to the /lib/ folder, i.e. in a /bin/ folder if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) file(GLOB_RECURSE TOOL_BIN - ${CURRENT_PACKAGES_DIR}/bin/*.exe - ${CURRENT_PACKAGES_DIR}/bin/*.dll + "${CURRENT_PACKAGES_DIR}/bin/*.exe" + "${CURRENT_PACKAGES_DIR}/bin/*.dll" ) - file(COPY ${TOOL_BIN} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/tcl/bin/) + file(COPY ${TOOL_BIN} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/tcl/bin/") # Remove .exes only after copying file(GLOB_RECURSE TOOL_EXES @@ -72,53 +72,53 @@ if (VCPKG_TARGET_IS_WINDOWS) file(REMOVE ${TOOL_EXES}) file(GLOB_RECURSE TOOLS - ${CURRENT_PACKAGES_DIR}/lib/dde1.4/* - ${CURRENT_PACKAGES_DIR}/lib/nmake/* - ${CURRENT_PACKAGES_DIR}/lib/reg1.3/* - ${CURRENT_PACKAGES_DIR}/lib/tcl8/* - ${CURRENT_PACKAGES_DIR}/lib/tcl8.6/* - ${CURRENT_PACKAGES_DIR}/lib/tdbcsqlite31.1.0/* + "${CURRENT_PACKAGES_DIR}/lib/dde1.4/*" + "${CURRENT_PACKAGES_DIR}/lib/nmake/*" + "${CURRENT_PACKAGES_DIR}/lib/reg1.3/*" + "${CURRENT_PACKAGES_DIR}/lib/tcl8/*" + "${CURRENT_PACKAGES_DIR}/lib/tcl8.6/*" + "${CURRENT_PACKAGES_DIR}/lib/tdbcsqlite31.1.0/*" ) foreach(TOOL ${TOOLS}) get_filename_component(DST_DIR ${TOOL} PATH) - file(COPY ${TOOL} DESTINATION ${DST_DIR}) + file(COPY "${TOOL}" DESTINATION ${DST_DIR}) endforeach() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/dde1.4 - ${CURRENT_PACKAGES_DIR}/lib/nmake - ${CURRENT_PACKAGES_DIR}/lib/reg1.3 - ${CURRENT_PACKAGES_DIR}/lib/tcl8 - ${CURRENT_PACKAGES_DIR}/lib/tcl8.6 - ${CURRENT_PACKAGES_DIR}/lib/tdbcsqlite31.1.0 + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/dde1.4" + "${CURRENT_PACKAGES_DIR}/lib/nmake" + "${CURRENT_PACKAGES_DIR}/lib/reg1.3" + "${CURRENT_PACKAGES_DIR}/lib/tcl8" + "${CURRENT_PACKAGES_DIR}/lib/tcl8.6" + "${CURRENT_PACKAGES_DIR}/lib/tdbcsqlite31.1.0" ) endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) file(GLOB_RECURSE TOOL_BIN - ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe - ${CURRENT_PACKAGES_DIR}/debug/bin/*.dll + "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.dll" ) - file(COPY ${TOOL_BIN} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/tcl/debug/bin/) + file(COPY ${TOOL_BIN} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/tcl/debug/bin/") # Remove .exes only after copying file(GLOB_RECURSE EXES - ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe + "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe" ) file(REMOVE ${EXES}) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/dde1.4 - ${CURRENT_PACKAGES_DIR}/debug/lib/nmake - ${CURRENT_PACKAGES_DIR}/debug/lib/reg1.3 - ${CURRENT_PACKAGES_DIR}/debug/lib/tcl8 - ${CURRENT_PACKAGES_DIR}/debug/lib/tcl8.6 - ${CURRENT_PACKAGES_DIR}/debug/lib/tdbcsqlite31.1.0 + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/dde1.4" + "${CURRENT_PACKAGES_DIR}/debug/lib/nmake" + "${CURRENT_PACKAGES_DIR}/debug/lib/reg1.3" + "${CURRENT_PACKAGES_DIR}/debug/lib/tcl8" + "${CURRENT_PACKAGES_DIR}/debug/lib/tcl8.6" + "${CURRENT_PACKAGES_DIR}/debug/lib/tdbcsqlite31.1.0" ) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(CHMOD_RECURSE "${CURRENT_PACKAGES_DIR}/tools/tcl/debug/lib/tcl9.0/msgs" "${CURRENT_PACKAGES_DIR}/tools/tcl/debug/lib/tcl9.0/tzdata" @@ -131,7 +131,7 @@ if (VCPKG_TARGET_IS_WINDOWS) else() file(REMOVE "${SOURCE_PATH}/unix/configure") vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH unix ) @@ -139,9 +139,10 @@ else() vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/tclConfig.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/tclConfig.sh") endif() -file(INSTALL ${SOURCE_PATH}/license.terms DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/license.terms" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tcl/vcpkg.json b/ports/tcl/vcpkg.json index 4449957408..d01f3bea07 100644 --- a/ports/tcl/vcpkg.json +++ b/ports/tcl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tcl", "version-string": "core-9-0-a1", - "port-version": 3, + "port-version": 4, "description": "Tcl provides a powerful platform for creating integration applications that tie together diverse applications, protocols, devices, and frameworks. When paired with the Tk toolkit, Tcl provides the fastest and most powerful way to create GUI applications that run on PCs, Unix, and Mac OS X. Tcl can also be used for a variety of web-related tasks and for creating powerful command languages for applications.", "homepage": "https://github.com/tcltk/tcl", "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 1e11ec883e..bcdfe640a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6574,7 +6574,7 @@ }, "tcl": { "baseline": "core-9-0-a1", - "port-version": 3 + "port-version": 4 }, "tclap": { "baseline": "1.2.2", diff --git a/versions/t-/tcl.json b/versions/t-/tcl.json index 3933fe028a..e6483aba42 100644 --- a/versions/t-/tcl.json +++ b/versions/t-/tcl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce21246b8ebf7e3ec20c2c8ea3abc5bbacea363e", + "version-string": "core-9-0-a1", + "port-version": 4 + }, { "git-tree": "178e263715acedbd584a7390566df8f6e75e5a9c", "version-string": "core-9-0-a1",