[vcpkg] Fix more cases of semicolon mishandling in "scripts" - follow-up to PR #12926 (#13968)

8 files changed, 14 insertions, 10 deletions

diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL
index 987b73045..468c337ee 100644
--- a/ports/aws-sdk-cpp/CONTROL
+++ b/ports/aws-sdk-cpp/CONTROL
@@ -1,5 +1,6 @@
 Source: aws-sdk-cpp
 Version: 1.8.4
+Port-Version: 1
 Homepage: https://github.com/aws/aws-sdk-cpp
 Description: AWS SDK for C++
 Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream
diff --git a/ports/aws-sdk-cpp/CONTROL.in b/ports/aws-sdk-cpp/CONTROL.in
index 63cce2b75..b451299b7 100644
--- a/ports/aws-sdk-cpp/CONTROL.in
+++ b/ports/aws-sdk-cpp/CONTROL.in
@@ -1,5 +1,6 @@
 Source: aws-sdk-cpp

 Version: 1.8.4

+Port-Version: 1

 Description: AWS SDK for C++

 Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream

 Default-Features: dynamodb, s3, kinesis

diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
index be9f6190c..c8c39a5b0 100644
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@@ -14,7 +14,7 @@ set(BUILD_ONLY core)
 

 include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake)

 

-string(REPLACE ";" "\\\\\\\\\\\;" BUILD_ONLY "${BUILD_ONLY}")

+string(REPLACE ";" "\\\\\\\\\\;" BUILD_ONLY "${BUILD_ONLY}")

 

 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

@@ -25,7 +25,7 @@ vcpkg_configure_cmake(
         -DENABLE_TESTING=OFF

         -DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}

         -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE

-        "-DBUILD_ONLY=${BUILD_ONLY}"

+        -DBUILD_ONLY=${BUILD_ONLY}

         -DBUILD_DEPS=OFF

 )

 

diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
index aabd95f53..e5775e781 100644
--- a/ports/gdal/portfile.cmake
+++ b/ports/gdal/portfile.cmake
@@ -266,7 +266,7 @@ if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
     message(STATUS "Building ${TARGET_TRIPLET}-rel")
     vcpkg_execute_required_process(
       COMMAND ${NMAKE} -f makefile.vc
-      "${NMAKE_OPTIONS_REL}"
+      ${NMAKE_OPTIONS_REL}
       WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
       LOGNAME nmake-build-${TARGET_TRIPLET}-release
     )
@@ -281,7 +281,7 @@ if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
     message(STATUS "Building ${TARGET_TRIPLET}-dbg")
     vcpkg_execute_required_process(
       COMMAND ${NMAKE} /G -f makefile.vc
-      "${NMAKE_OPTIONS_DBG}"
+      ${NMAKE_OPTIONS_DBG}
       WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
       LOGNAME nmake-build-${TARGET_TRIPLET}-debug
     )
@@ -296,9 +296,9 @@ if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
 
   vcpkg_execute_required_process(
     COMMAND ${NMAKE} -f makefile.vc
-    "${NMAKE_OPTIONS_REL}"
-    "install"
-    "devinstall"
+    ${NMAKE_OPTIONS_REL}
+    install
+    devinstall
     WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
     LOGNAME nmake-install-${TARGET_TRIPLET}
   )
diff --git a/ports/libxslt/CONTROL b/ports/libxslt/CONTROL
index 38eea5f1a..04730c946 100644
--- a/ports/libxslt/CONTROL
+++ b/ports/libxslt/CONTROL
@@ -1,5 +1,6 @@
 Source: libxslt
 Version: 1.1.33-7
+Port-Version: 1
 Homepage: https://github.com/GNOME/libxslt
 Description: Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT
 Build-Depends: libxml2, liblzma
diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake
index c3296f0fe..86b633ee5 100644
--- a/ports/libxslt/portfile.cmake
+++ b/ports/libxslt/portfile.cmake
@@ -21,8 +21,8 @@ if (VCPKG_TARGET_IS_WINDOWS)
         prefix=@INSTALL_DIR@
         include=@INCLUDE_DIR@
         lib=@LIB_DIR@
-        bindir=$(PREFIX)\\tools\\
-        sodir=$(PREFIX)\\bin\\
+        bindir=$(PREFIX)\\tools
+        sodir=$(PREFIX)\\bin
     )
     # Debug params
     if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
diff --git a/ports/sqlcipher/portfile.cmake b/ports/sqlcipher/portfile.cmake
index 3a0f6c5d5..131209ce8 100644
--- a/ports/sqlcipher/portfile.cmake
+++ b/ports/sqlcipher/portfile.cmake
@@ -39,7 +39,7 @@ set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}")
 message(STATUS "Pre-building ${TARGET_TRIPLET}")

 vcpkg_execute_required_process(

 	COMMAND ${NMAKE} -f Makefile.msc /A /NOLOGO clean tcl

-	"${NMAKE_OPTIONS}"

+	${NMAKE_OPTIONS}

 	WORKING_DIRECTORY ${SOURCE_PATH}

 	LOGNAME pre-build-${TARGET_TRIPLET}

 )

diff --git a/ports/sqlcipher/vcpkg.json b/ports/sqlcipher/vcpkg.json
index 5165928f2..e3f2cb45f 100644
--- a/ports/sqlcipher/vcpkg.json
+++ b/ports/sqlcipher/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "sqlcipher",
   "version-string": "4.4.0",
+  "port-version": 1,
   "description": "SQLCipher extends the SQLite database library to add security enhancements that make it more suitable for encrypted local data storage.",
   "homepage": "https://www.zetetic.net/sqlcipher",
   "supports": "windows & !uwp & !static",