[tools] Add python64 bit. (#7964)

* [tools]Add python64 bit.

* [pybind11/shiva]Add version number.

* [duktape]Fix build error using python64 bit.

* [duktape]Fix python2 path.

* [duktape]Fix duketape build: using python2 tools.

* Change subdirs and archive names for PYTHON2 and PYTHON3

* [duktape] Update version info

* [shiva] Add homepage

* update baseline

* update baseline

Co-authored-by: Victor Romero <romerosanchezv@gmail.com>

7 files changed, 39 insertions, 22 deletions

diff --git a/ports/duktape/CMakeLists.txt b/ports/duktape/CMakeLists.txt
index ebf2f32d8..56303d3d9 100644
--- a/ports/duktape/CMakeLists.txt
+++ b/ports/duktape/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.13)
 
 
 set(duktape_MAJOR_VERSION 2)
diff --git a/ports/duktape/CONTROL b/ports/duktape/CONTROL
index 8311a60a0..64dcff2b2 100644
--- a/ports/duktape/CONTROL
+++ b/ports/duktape/CONTROL
@@ -1,4 +1,4 @@
-Source: duktape

-Version: 2.4.0-6

-Homepage: https://github.com/svaarala/duktape

-Description: Embeddable Javascript engine with a focus on portability and compact footprint.

+Source: duktape
+Version: 2.4.0-7
+Homepage: https://github.com/svaarala/duktape
+Description: Embeddable Javascript engine with a focus on portability and compact footprint.
diff --git a/ports/duktape/portfile.cmake b/ports/duktape/portfile.cmake
index 477c76c35..7647d0fc4 100644
--- a/ports/duktape/portfile.cmake
+++ b/ports/duktape/portfile.cmake
@@ -1,6 +1,4 @@
-include(vcpkg_common_functions)
-
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(VCPKG_TARGET_IS_LINUX)
     message("${PORT} currently requires the following tools from the system package manager:\n    python-yaml\n\nThis can be installed on Ubuntu systems via apt-get install python-yaml PYTHON2-yaml (depending on your current python default interpreter)")
 endif()
 
@@ -16,7 +14,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/duktapeConfig.cmake.in DESTINATION ${SOURCE_PATH})
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
 
-if(VCPKG_TARGET_IS_WINDOWS)
+if (VCPKG_TARGET_IS_WINDOWS)
     set(EXECUTABLE_SUFFIX ".exe")
     set(PYTHON_OPTION "")
 else()
@@ -27,6 +25,7 @@ endif()
 vcpkg_find_acquire_program(PYTHON2)
 get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY)
 vcpkg_add_to_path("${PYTHON2_DIR}")
+
 if(NOT EXISTS ${PYTHON2_DIR}/easy_install${EXECUTABLE_SUFFIX})
     if(NOT EXISTS ${PYTHON2_DIR}/Scripts/pip${EXECUTABLE_SUFFIX})
         vcpkg_from_github(
@@ -43,7 +42,11 @@ else()
     execute_process(COMMAND ${PYTHON2_DIR}/easy_install${EXECUTABLE_SUFFIX} pyyaml)
 endif()
 
-execute_process(COMMAND ${PYTHON2} ${SOURCE_PATH}/tools/configure.py --source-directory ${SOURCE_PATH}/src-input --output-directory ${SOURCE_PATH}/src --config-metadata ${SOURCE_PATH}/config -DDUK_USE_FASTINT)
+vcpkg_execute_required_process(
+    COMMAND ${PYTHON2} tools/configure.py --source-directory src-input --output-directory src --config-metadata config -DDUK_USE_FASTINT
+    WORKING_DIRECTORY ${SOURCE_PATH}
+    LOGNAME pre-configure
+)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
   set(DUK_CONFIG_H_PATH "${SOURCE_PATH}/src/duk_config.h")
@@ -63,6 +66,7 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
+vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
diff --git a/ports/shiva/CONTROL b/ports/shiva/CONTROL
index 0ce81203d..2c235fd63 100644
--- a/ports/shiva/CONTROL
+++ b/ports/shiva/CONTROL
@@ -1,4 +1,5 @@
 Source: shiva

-Version: 1.0-2

+Version: 1.0-3

+Homepage: https://github.com/Milerius/shiva

 Description: Modern C++ Game Engine

 Build-Depends: boost-stacktrace, boost-filesystem, boost-dll, entt, lua, luafilesystem (windows), sol2, pybind11, spdlog, nlohmann-json

diff --git a/ports/shiva/portfile.cmake b/ports/shiva/portfile.cmake
index 372c318e0..72beec0e0 100644
--- a/ports/shiva/portfile.cmake
+++ b/ports/shiva/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)

-

 vcpkg_find_acquire_program(PYTHON2)

 

 vcpkg_from_github(

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index b658bcea3..99f9bceb0 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1564,11 +1564,11 @@ sfgui:x64-linux=ignore
 sfml:arm64-windows=fail

 shapelib:arm-uwp=fail

 shapelib:x64-uwp=fail

-shiva:x64-windows=fail

 shiva:x64-windows-static=fail

 shiva-sfml:x64-linux=fail

 shiva-sfml:x64-osx=fail

 shiva-sfml:x86-windows=fail

+shiva-sfml:x64-windows=fail

 shogun:arm64-windows      = skip

 shogun:arm-uwp            = skip

 shogun:x64-osx=fail

diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index cb17ece21..a525dbc11 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -93,11 +93,18 @@ function(vcpkg_find_acquire_program VAR)
   elseif(VAR MATCHES "PYTHON3")
     if(CMAKE_HOST_WIN32)
       set(PROGNAME python)
-      set(SUBDIR "python-3.7.3")
+      if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
+        set(SUBDIR "python-3.7.3-x86")
+        set(URL "https://www.python.org/ftp/python/3.7.3/python-3.7.3-embed-win32.zip")
+        set(ARCHIVE "python-3.7.3-embed-win32.zip")
+        set(HASH 2c1b1f0a29d40a91771ae21a5f733eedc10984cd182cb10c2793bbd24191a89f20612a3f23c34047f37fb06369016bfd4a52915ed1b4a56f8bd2b4ca6994eb31)
+      else()
+        set(SUBDIR "python-3.7.3-x64")
+        set(URL "https://www.python.org/ftp/python/3.7.3/python-3.7.3-embed-amd64.zip")
+        set(ARCHIVE "python-3.7.3-embed-amd64.zip")
+        set(HASH 4b3e0067b5e8d00b1cac5d556ab4fbd71df2a1852afb3354ee62363aabc8801aca84da09dbd26125527ae54b50488f808c1d82abf18969c23a51dcd57576885f)
+      endif()
       set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR})
-      set(URL "https://www.python.org/ftp/python/3.7.3/python-3.7.3-embed-win32.zip")
-      set(ARCHIVE "python-3.7.3-embed-win32.zip")
-      set(HASH 2c1b1f0a29d40a91771ae21a5f733eedc10984cd182cb10c2793bbd24191a89f20612a3f23c34047f37fb06369016bfd4a52915ed1b4a56f8bd2b4ca6994eb31)
       set(POST_INSTALL_COMMAND ${CMAKE_COMMAND} -E remove python37._pth)
     else()
       set(PROGNAME python3)
@@ -107,11 +114,18 @@ function(vcpkg_find_acquire_program VAR)
   elseif(VAR MATCHES "PYTHON2")
     if(CMAKE_HOST_WIN32)
       set(PROGNAME python)
-      set(SUBDIR "python2")
+      if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
+        set(SUBDIR "python-2.7.16-x86")
+        set(URL "https://www.python.org/ftp/python/2.7.16/python-2.7.16.msi")
+        set(ARCHIVE "python-2.7.16.msi")
+        set(HASH c34a6fa2438682104dccb53650a2bdb79eac7996deff075201a0f71bb835d60d3ed866652a1931f15a29510fe8e1009ac04e423b285122d2e5747fefc4c10254)
+      else()
+        set(SUBDIR "python-2.7.16-x64")
+        set(URL "https://www.python.org/ftp/python/2.7.16/python-2.7.16.amd64.msi")
+        set(ARCHIVE "python-2.7.16.amd64.msi")
+        set(HASH 47c1518d1da939e3ba6722c54747778b93a44c525bcb358b253c23b2510374a49a43739c8d0454cedade858f54efa6319763ba33316fdc721305bc457efe4ffb)
+      endif()
       set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR})
-      set(URL "https://www.python.org/ftp/python/2.7.16/python-2.7.16.msi")
-      set(ARCHIVE "python-2.7.16.msi")
-      set(HASH c34a6fa2438682104dccb53650a2bdb79eac7996deff075201a0f71bb835d60d3ed866652a1931f15a29510fe8e1009ac04e423b285122d2e5747fefc4c10254)
     else()
       set(PROGNAME python2)
       set(BREW_PACKAGE_NAME "python2")