Prevent python3 build failure (#9014)

* Prevent python3 build failure

If VCPKG_BUILD_TYPE release is set inside a
triplet, then the build will fail because
the port file attempts to deal with debug
files which will never exist. The changes
in this patch allow the build to succeed
if VCPKG_BUILD_TYPE release is stipulated
using a triplet before a build of the
python3 port is initiated.

* python3 version bump

Port clean up and version number
bump.

* libxslt release triplet build fix

This patch fixes a condition where
if a debug build is disabled via
triplet, the build fails and an
empty directory error message
is sent to the console.

2 files changed, 31 insertions, 17 deletions

diff --git a/ports/python3/CONTROL b/ports/python3/CONTROL
index da8409fd9..7550d5568 100644
--- a/ports/python3/CONTROL
+++ b/ports/python3/CONTROL
@@ -1,5 +1,5 @@
 Source: python3
-Version: 3.7.3
+Version: 3.7.4
 Homepage: https://github.com/python/cpython
 Description: The Python programming language as an embeddable library
 Build-Depends: libffi, openssl
\ No newline at end of file
diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake
index c31eb313a..3a22d25b7 100644
--- a/ports/python3/portfile.cmake
+++ b/ports/python3/portfile.cmake
@@ -42,33 +42,45 @@ if (VCPKG_TARGET_IS_WINDOWS)
 
 	file(GLOB HEADERS ${SOURCE_PATH}/Include/*.h)
 	file(COPY ${HEADERS} ${SOURCE_PATH}/PC/pyconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
-
 	file(COPY ${SOURCE_PATH}/Lib DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR})
-
 	file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-	file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+
+	if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+		file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+	endif()
 
 	if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
 		file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-		file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+
+		if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+			file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+		endif()
+
+	endif()
+
+	if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+		vcpkg_copy_pdbs()
 	endif()
-	
-	vcpkg_copy_pdbs()
-	
 	# Handle copyright
 	file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR})
 	file(RENAME ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}/LICENSE ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}/copyright)
+
 elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
-	set(SOURCE_PATH_DEBUG "${TEMP_SOURCE_PATH}-${TARGET_TRIPLET}-debug")
+
+	if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+		set(SOURCE_PATH_DEBUG "${TEMP_SOURCE_PATH}-${TARGET_TRIPLET}-debug")
+	endif()
+
 	set(SOURCE_PATH_RELEASE "${TEMP_SOURCE_PATH}-${TARGET_TRIPLET}-release")
-	
 	file(REMOVE_RECURSE ${SOURCE_PATH_RELEASE})
 	file(GLOB FILES ${TEMP_SOURCE_PATH}/*)
 	file(COPY ${FILES} DESTINATION ${SOURCE_PATH_RELEASE})
-	
-	file(REMOVE_RECURSE ${SOURCE_PATH_DEBUG})
-	file(RENAME "${TEMP_SOURCE_PATH}" ${SOURCE_PATH_DEBUG})
-	
+
+	if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+		file(REMOVE_RECURSE ${SOURCE_PATH_DEBUG})
+		file(RENAME "${TEMP_SOURCE_PATH}" ${SOURCE_PATH_DEBUG})
+	endif()
+
 	find_program(MAKE make)
 	if (NOT MAKE)
 		message(FATAL_ERROR "MAKE not found")
@@ -97,6 +109,7 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
 		endif()
 
 		message(STATUS "Building ${TARGET_TRIPLET}-rel")
+
 		vcpkg_execute_build_process(
 		  COMMAND make -j ${VCPKG_CONCURRENCY}
 		  NO_PARALLEL_COMMAND make
@@ -113,14 +126,13 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
 
 		file(GLOB HEADERS ${OUT_PATH_RELEASE}/include/*)
 		file(COPY ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-		
 		file(GLOB LIBS ${OUT_PATH_RELEASE}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/*)
 		file(COPY ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}/Lib)
-		
 		file(GLOB LIBS ${OUT_PATH_RELEASE}/lib/pkgconfig/*)
 		file(COPY ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR})
 		file(COPY ${OUT_PATH_RELEASE}/lib/libpython${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}m.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
 		message(STATUS "Installing ${TARGET_TRIPLET}-rel done")
+
 	endif()
 
 	if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
@@ -130,6 +142,7 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
 		message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
 		set(OUT_PATH_DEBUG ${SOURCE_PATH_DEBUG}/../../make-build-${TARGET_TRIPLET}-debug)
 		file(MAKE_DIRECTORY ${OUT_PATH_DEBUG})
+
 		if(VCPKG_TARGET_IS_OSX)
 			vcpkg_execute_build_process(
 			  COMMAND "${SOURCE_PATH_DEBUG}/configure" --with-pydebug --prefix=${OUT_PATH_DEBUG} --with-openssl=${CURRENT_INSTALLED_DIR}/debug "CPPFLAGS=-I${CURRENT_INSTALLED_DIR}/include -framework CoreFoundation" "LDFLAGS=-L${CURRENT_INSTALLED_DIR}/debug/lib" "LIBS=-liconv"
@@ -161,9 +174,10 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
 
 		file(COPY ${OUT_PATH_DEBUG}/lib/libpython${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}dm.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
 		message(STATUS "Installing ${TARGET_TRIPLET}-dbg done")
+
 	endif()
-	
 	# Handle copyright
 	file(COPY ${SOURCE_PATH_RELEASE}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR})
 	file(RENAME ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}/LICENSE ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}/copyright)
+
 endif()