[vcpkg-build-qmake][vcpkg-configure-qmake] Collapse config-specific versions.

6 files changed, 27 insertions, 164 deletions

diff --git a/ports/qscintilla/CONTROL b/ports/qscintilla/CONTROL
index 65fa0cd63..6453ad643 100644
--- a/ports/qscintilla/CONTROL
+++ b/ports/qscintilla/CONTROL
@@ -1,4 +1,4 @@
 Source: qscintilla
-Version: 2.10-3
+Version: 2.10-4
 Description: QScintilla is a port to Qt of the Scintilla editing component. Features syntax highlighting, code-completion and much more (Barebone build without python bindings (missing dependeny PyQt) and without QtDesigner plugin)
 Build-Depends: qt5-base
diff --git a/ports/qscintilla/portfile.cmake b/ports/qscintilla/portfile.cmake
index fd60a5957..18ff18a97 100644
--- a/ports/qscintilla/portfile.cmake
+++ b/ports/qscintilla/portfile.cmake
@@ -1,15 +1,3 @@
-# Common Ambient Variables:
-#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-#   CURRENT_PORT DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
-#   PORT                      = current port name (zlib, etc)
-#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
-#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
-#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
-#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
-#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
-#
-
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/QScintilla_gpl-2.10)
 vcpkg_download_distfile(ARCHIVE
@@ -31,70 +19,24 @@ set(BUILD_OPTIONS
     CONFIG-=hide_symbols
 )
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    set(BUILD_OPTIONS
-        ${BUILD_OPTIONS}
-        CONFIG+=staticlib
-    )
-endif()
-
 SET(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin;${CURRENT_INSTALLED_DIR}/debug/bin")
 
 #Store build paths
 set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
 set(RELEASE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
 
-file(REMOVE_RECURSE "${DEBUG_DIR}" "${RELEASE_DIR}")
-
-#Configure debug
-vcpkg_configure_qmake_debug(
+vcpkg_configure_qmake(
     SOURCE_PATH ${SOURCE_PATH}/Qt4Qt5
+    OPTIONS
+        CONFIG+=build_all
+        CONFIG-=hide_symbols
 )
 
-#First generate the makefiles so we can modify them
-vcpkg_build_qmake_debug(TARGETS qmake_all)
-
-#Store debug makefiles path
-file(GLOB_RECURSE DEBUG_MAKEFILES ${DEBUG_DIR}/*Makefile*)
-
-foreach(DEBUG_MAKEFILE ${DEBUG_MAKEFILES})
-    file(READ "${DEBUG_MAKEFILE}" _contents)
-    string(REPLACE "zlib.lib" "zlibd.lib" _contents "${_contents}")
-    string(REPLACE "installed\\${TARGET_TRIPLET}\\lib" "installed\\${TARGET_TRIPLET}\\debug\\lib" _contents "${_contents}")
-    string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib qtmaind.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib\\manual-link qtmaind.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib" _contents "${_contents}")
-    file(WRITE "${DEBUG_MAKEFILE}" "${_contents}")
-endforeach()
-
-#Build debug
-vcpkg_build_qmake_debug(TARGETS debug)
-
-#Configure release
-vcpkg_configure_qmake_release(
-    SOURCE_PATH ${SOURCE_PATH}/Qt4Qt5
+vcpkg_build_qmake(
+    RELEASE_TARGETS release
+    DEBUG_TARGETS debug
 )
 
-#First generate the makefiles so we can modify them
-vcpkg_build_qmake_release(TARGETS qmake_all)
-
-#Store release makefile path
-file(GLOB_RECURSE RELEASE_MAKEFILES ${RELEASE_DIR}/*Makefile*)
-
-foreach(RELEASE_MAKEFILE ${RELEASE_MAKEFILES})
-    file(READ "${RELEASE_MAKEFILE}" _contents)
-    string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib qtmain.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib\\manual-link qtmain.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib" _contents "${_contents}")
-    file(WRITE "${RELEASE_MAKEFILE}" "${_contents}")
-endforeach()
-
-#Build release
-vcpkg_build_qmake_release(TARGETS release)
-
-#Set the correct install directory to packages
-foreach(MAKEFILE ${RELEASE_MAKEFILES} ${DEBUG_MAKEFILES})
-    vcpkg_replace_string(${MAKEFILE} "(INSTALL_ROOT)${INSTALLED_DIR_WITHOUT_DRIVE}" "(INSTALL_ROOT)${PACKAGES_DIR_WITHOUT_DRIVE}")
-endforeach()
-
-set(BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
-
 file(GLOB HEADER_FILES ${SOURCE_PATH}/Qt4Qt5/Qsci/*)
 file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/Qsci)
 
@@ -120,11 +62,10 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
         ${DEBUG_DIR}/debug/qscintilla2_qt5.dll
         DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
     )
+endif()
 
 vcpkg_copy_pdbs()
 
-endif()
-
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/qscintilla)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/qscintilla/LICENSE ${CURRENT_PACKAGES_DIR}/share/qscintilla/copyright)
diff --git a/ports/qt5-modularscripts/CONTROL b/ports/qt5-modularscripts/CONTROL
index ddbdea51e..bf2ab2734 100644
--- a/ports/qt5-modularscripts/CONTROL
+++ b/ports/qt5-modularscripts/CONTROL
@@ -1,3 +1,3 @@
 Source: qt5-modularscripts
-Version: 0
+Version: 1
 Description: Vcpkg helpers to package qt5 modules
diff --git a/ports/qt5-modularscripts/qt_modular_library.cmake b/ports/qt5-modularscripts/qt_modular_library.cmake
index cdffc58fa..0301bcebc 100644
--- a/ports/qt5-modularscripts/qt_modular_library.cmake
+++ b/ports/qt5-modularscripts/qt_modular_library.cmake
@@ -34,8 +34,6 @@ function(qt_modular_library NAME HASH)
     set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
     set(RELEASE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
 
-    file(REMOVE_RECURSE "${DEBUG_DIR}" "${RELEASE_DIR}")
-
     #Find Python and add it to the path
     vcpkg_find_acquire_program(PYTHON2)
     get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY)
@@ -43,51 +41,14 @@ function(qt_modular_library NAME HASH)
 
     file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR)
     file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" NATIVE_PACKAGES_DIR)
-    
+
     string(SUBSTRING "${NATIVE_INSTALLED_DIR}" 2 -1 INSTALLED_DIR_WITHOUT_DRIVE)
     string(SUBSTRING "${NATIVE_PACKAGES_DIR}" 2 -1 PACKAGES_DIR_WITHOUT_DRIVE)
     
-    #Configure debug
-    vcpkg_configure_qmake_debug(
-        SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${SRCDIR_NAME}
-    )
-
-    #First generate the makefiles so we can modify them
-    vcpkg_build_qmake_debug(TARGETS qmake_all)
-
-    #Store debug makefiles path
-    file(GLOB_RECURSE DEBUG_MAKEFILES ${DEBUG_DIR}/*Makefile*)
-
-    foreach(DEBUG_MAKEFILE ${DEBUG_MAKEFILES})
-        file(READ "${DEBUG_MAKEFILE}" _contents)
-        string(REPLACE "zlib.lib" "zlibd.lib" _contents "${_contents}")
-        string(REPLACE "installed\\${TARGET_TRIPLET}\\lib" "installed\\${TARGET_TRIPLET}\\debug\\lib" _contents "${_contents}")
-        string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib qtmaind.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib\\manual-link qtmaind.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib" _contents "${_contents}")
-        file(WRITE "${DEBUG_MAKEFILE}" "${_contents}")
-    endforeach()
-
-    #Build debug
-    vcpkg_build_qmake_debug()
+    #Configure debug+release
+    vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH})
 
-    #Configure release
-    vcpkg_configure_qmake_release(
-        SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${SRCDIR_NAME}
-    )
-
-    #First generate the makefiles so we can modify them
-    vcpkg_build_qmake_release(TARGETS qmake_all)
-
-    #Store release makefile path
-    file(GLOB_RECURSE RELEASE_MAKEFILES ${RELEASE_DIR}/*Makefile*)
-
-    foreach(RELEASE_MAKEFILE ${RELEASE_MAKEFILES})
-        file(READ "${RELEASE_MAKEFILE}" _contents)
-        string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib qtmain.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib\\manual-link qtmain.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib" _contents "${_contents}")
-        file(WRITE "${RELEASE_MAKEFILE}" "${_contents}")
-    endforeach()
-    
-    #Build release
-    vcpkg_build_qmake_release()
+    vcpkg_build_qmake()
 
     #Fix the cmake files if they exist
     if(EXISTS ${RELEASE_DIR}/lib/cmake)
@@ -97,15 +58,16 @@ function(qt_modular_library NAME HASH)
             LOGNAME fix-cmake
         )
     endif()
-    
+
+    file(GLOB_RECURSE MAKEFILES ${DEBUG_DIR}/*Makefile* ${RELEASE_DIR}/*Makefile*)
+
     #Set the correct install directory to packages
-    foreach(MAKEFILE ${RELEASE_MAKEFILES} ${DEBUG_MAKEFILES})
+    foreach(MAKEFILE ${MAKEFILES})
         vcpkg_replace_string(${MAKEFILE} "(INSTALL_ROOT)${INSTALLED_DIR_WITHOUT_DRIVE}" "(INSTALL_ROOT)${PACKAGES_DIR_WITHOUT_DRIVE}")
     endforeach()
 
     #Install the module files
-    vcpkg_build_qmake_debug(TARGETS install)
-    vcpkg_build_qmake_release(TARGETS install)
+    vcpkg_build_qmake(TARGETS install SKIP_MAKEFILES BUILD_LOGNAME install)
 
     #Remove extra cmake files
     if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake)
diff --git a/ports/qwt/CONTROL b/ports/qwt/CONTROL
index 5bf85ad95..9dcf19f5b 100644
--- a/ports/qwt/CONTROL
+++ b/ports/qwt/CONTROL
@@ -1,4 +1,4 @@
 Source: qwt
-Version: 6.1.3-3
+Version: 6.1.3-4
 Description: Qt widgets library for technical applications
 Build-Depends: qt5-base, qt5-svg
diff --git a/ports/qwt/portfile.cmake b/ports/qwt/portfile.cmake
index f4be871b7..918914a01 100644
--- a/ports/qwt/portfile.cmake
+++ b/ports/qwt/portfile.cmake
@@ -21,57 +21,16 @@ else()
     )
 endif()
 
-# The qwt build requires zlib1.dll
-SET(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin;${CURRENT_INSTALLED_DIR}/debug/bin")
-
-#Store build paths
 set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
 set(RELEASE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
 
-file(REMOVE_RECURSE "${DEBUG_DIR}" "${RELEASE_DIR}")
-
-#Configure debug
-vcpkg_configure_qmake_debug(
-    SOURCE_PATH ${SOURCE_PATH}
-)
-
-#First generate the makefiles so we can modify them
-vcpkg_build_qmake_debug(TARGETS qmake_all)
-
-#Store debug makefiles path
-file(GLOB_RECURSE DEBUG_MAKEFILES ${DEBUG_DIR}/*Makefile*)
-
-foreach(DEBUG_MAKEFILE ${DEBUG_MAKEFILES})
-    file(READ "${DEBUG_MAKEFILE}" _contents)
-    string(REPLACE "zlib.lib" "zlibd.lib" _contents "${_contents}")
-    string(REPLACE "installed\\${TARGET_TRIPLET}\\lib" "installed\\${TARGET_TRIPLET}\\debug\\lib" _contents "${_contents}")
-    string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib qtmaind.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib\\manual-link qtmaind.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib" _contents "${_contents}")
-    file(WRITE "${DEBUG_MAKEFILE}" "${_contents}")
-endforeach()
-
-#Build debug
-vcpkg_build_qmake_debug(TARGETS sub-src-debug_ordered)
+vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH})
 
-#Configure release
-vcpkg_configure_qmake_release(
-    SOURCE_PATH ${SOURCE_PATH}
+vcpkg_build_qmake(
+    RELEASE_TARGETS sub-src-release_ordered
+    DEBUG_TARGETS sub-src-debug_ordered
 )
 
-#First generate the makefiles so we can modify them
-vcpkg_build_qmake_release(TARGETS qmake_all)
-
-#Store release makefile path
-file(GLOB_RECURSE RELEASE_MAKEFILES ${RELEASE_DIR}/*Makefile*)
-
-foreach(RELEASE_MAKEFILE ${RELEASE_MAKEFILES})
-    file(READ "${RELEASE_MAKEFILE}" _contents)
-    string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib qtmain.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib\\manual-link qtmain.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib" _contents "${_contents}")
-    file(WRITE "${RELEASE_MAKEFILE}" "${_contents}")
-endforeach()
-
-#Build release
-vcpkg_build_qmake_release(TARGETS sub-src-release_ordered)
-
 #Set the correct install directory to packages
 foreach(MAKEFILE ${RELEASE_MAKEFILES} ${DEBUG_MAKEFILES})
     vcpkg_replace_string(${MAKEFILE} "(INSTALL_ROOT)${INSTALLED_DIR_WITHOUT_DRIVE}" "(INSTALL_ROOT)${PACKAGES_DIR_WITHOUT_DRIVE}")
@@ -92,7 +51,7 @@ file(INSTALL
     DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
 )
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     file(INSTALL
         ${RELEASE_DIR}/lib/qwt.dll
         DESTINATION ${CURRENT_PACKAGES_DIR}/bin
@@ -100,11 +59,12 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
 
     file(INSTALL
         ${DEBUG_DIR}/lib/qwtd.dll
-        ${DEBUG_DIR}/lib/qwtd.pdb
         DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
     )
 endif()
 
+vcpkg_copy_pdbs()
+
 # Handle copyright
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/qwt)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/qwt/COPYING ${CURRENT_PACKAGES_DIR}/share/qwt/copyright)