The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 11:07:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

[open62541] Fix flakiness/bugginess (#7607)

Browse Source 
- We used to `get-pip` on all non-Linux systems; we should be
    downloading and running it only on Windows.
  - `get-pip`'s download link was volatile, and the SHA would change. We
    now download it from a versioned link, which should not change

As part of these, we bumped the number from 0.30.0-2 to 0.30.0-3
This commit is contained in:
nicole mazzuca 2019-08-08 16:43:39 -07:00 committed by Curtis J Bezault
parent 8390d68837
commit 9d53b869a5
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/open62541/CONTROL
View File

@ -1,3 +1,3 @@
Source: open62541 Source: open62541
Version: 0.3.0-2 Version: 0.3.0-3
Description: open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0. Description: open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.

29
ports/open62541/portfile.cmake
View File

@ -1,6 +1,6 @@
include(vcpkg_common_functions) include(vcpkg_common_functions)
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") if(NOT CMAKE_HOST_WIN32)
message("${PORT} currently requires the following tools from the system package manager:\n python-six\n\nThis can be installed on Ubuntu systems via apt-get install python-six python3-six (depending on your current python default interpreter)") message("${PORT} currently requires the following tools from the system package manager:\n python-six\n\nThis can be installed on Ubuntu systems via apt-get install python-six python3-six (depending on your current python default interpreter)")
endif() endif()
@ -31,21 +31,24 @@ endif()
vcpkg_find_acquire_program(PYTHON3) vcpkg_find_acquire_program(PYTHON3)
get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
get_filename_component(PYTHON3_DIR_NAME "${PYTHON3_DIR}" NAME)
vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_add_to_path("${PYTHON3_DIR}")
if(NOT EXISTS ${PYTHON3_DIR}/easy_install${EXECUTABLE_SUFFIX}) if(CMAKE_HOST_WIN32)
if(NOT EXISTS ${PYTHON3_DIR}/Scripts/pip${EXECUTABLE_SUFFIX}) # Must not modify system copy of python3 -- on CMAKE_HOST_WIN32, we have our own private copy
vcpkg_download_distfile(GET_PIP if(NOT EXISTS ${PYTHON3_DIR}/easy_install.exe)
URLS "https://bootstrap.pypa.io/get-pip.py" if(NOT EXISTS ${PYTHON3_DIR}/Scripts/pip.exe)
FILENAME "tools/python/${PYTHON3_DIR_NAME}/get-pip.py" get_filename_component(PYTHON3_DIR_NAME "${PYTHON3_DIR}" NAME)
SHA512 99520d223819708b8f6e4b839d1fa215e4e8adc7fcd0db6c25a0399cf2fa10034b35673cf450609303646d12497f301ef53b7e7cc65c78e7bce4af0c673555ad vcpkg_download_distfile(GET_PIP
) URLS "https://bootstrap.pypa.io/3.3/get-pip.py"
execute_process(COMMAND ${PYTHON3_DIR}/python${EXECUTABLE_SUFFIX} ${PYTHON3_DIR}/get-pip.py) FILENAME "tools/python/${PYTHON3_DIR_NAME}/get-pip.py"
SHA512 92e68525830bb23955a31cb19ebc3021ef16b6337eab83d5db2961b791283d2867207545faf83635f6027f2f7b7f8fee2c85f2cfd8e8267df25406474571c741
)
execute_process(COMMAND ${PYTHON3_DIR}/python.exe ${GET_PIP})
endif()
execute_process(COMMAND ${PYTHON3_DIR}/Scripts/pip.exe install six)
else()
execute_process(COMMAND ${PYTHON3_DIR}/easy_install.exe six)
endif() endif()
execute_process(COMMAND ${PYTHON3_DIR}/Scripts/pip${EXECUTABLE_SUFFIX} install six)
else()
execute_process(COMMAND ${PYTHON3_DIR}/easy_install${EXECUTABLE_SUFFIX} six)
endif() endif()
vcpkg_configure_cmake( vcpkg_configure_cmake(