diff --git a/.github/workflows/build-gh_runner.yml b/.github/workflows/build-gh_runner.yml new file mode 100644 index 00000000..c24e2f82 --- /dev/null +++ b/.github/workflows/build-gh_runner.yml @@ -0,0 +1,144 @@ +name: Build Package (gh-runner) + +env: + VCPKG_BINARY_SOURCES: "clear;nuget,GitHub,read" + VCPKG_NUGET_REPOSITORY: "https://github.com/hpcc-systems/vcpkg" + +on: + workflow_call: + inputs: + os: + type: string + description: 'Operating System' + required: false + default: 'windows-2022' + build-type: + type: string + description: 'CMake Build Type' + required: false + default: 'RelWithDebInfo' + cmake-configuration: + type: string + description: 'CMake Configuration' + required: false + default: '' + cmake-configuration-ex: + type: string + description: 'CMake Configuration Extra' + required: false + default: '' + update-cache: + type: boolean + description: 'Update Cache' + required: false + default: true + upload-package: + type: boolean + description: 'Upload Package as Asset' + required: false + default: false + asset-name: + type: string + description: 'Asset Name (if upload-package is true)' + required: false + default: 'build-package' + secrets: + LNB_TOKEN: + required: false + +jobs: + + build-gh_runner: + runs-on: ${{ inputs.os }} + steps: + - name: "Remove builtin vcpkg (old)" + working-directory: . + shell: "bash" + run: | + ${{ !contains(inputs.os, 'windows') && 'sudo' || '' }} rm -rf "$VCPKG_INSTALLATION_ROOT" + + - name: Checkout ECLIDE + uses: actions/checkout@v3 + with: + submodules: recursive + path: ${{ github.workspace }}/eclide + + - name: Fetch vcpkg history + shell: "bash" + working-directory: ${{ github.workspace }}/eclide/vcpkg + run: | + git fetch --unshallow + + - name: "vcpkg Bootstrap" + shell: "bash" + run: | + ./eclide/vcpkg/bootstrap-vcpkg.sh + + - name: "Setup NuGet credentials" + shell: "bash" + run: | + `./eclide/vcpkg/vcpkg fetch nuget | tail -n 1` \ + sources add \ + -name "GitHub" \ + -source "https://nuget.pkg.github.com/hpcc-systems/index.json" \ + -storepasswordincleartext \ + -username "${{ github.actor }}" \ + -password "${{ secrets.GITHUB_TOKEN }}" + + - name: Calculate vars + id: vars + working-directory: ${{ github.workspace }}/eclide/vcpkg + shell: "bash" + run: | + branch_label_1=${{ github.base_ref }} + branch_label_2=$(echo ${{ github.ref }} | cut -d'/' -f3) + echo "branch_label=${branch_label_1:-$branch_label_2}" >> $GITHUB_OUTPUT + vcpkg_sha_short=$(git rev-parse --short=8 HEAD) + echo "vcpkg_sha_short=$vcpkg_sha_short" >> $GITHUB_OUTPUT + + - name: Print vars + shell: "bash" + run: | + echo "${{ toJSON(steps.vars.outputs) }}" + + - uses: actions/cache@v3 + id: cache + with: + path: | + ${{github.workspace}}/build/vcpkg_installed + key: vcpkg-${{ inputs.os }}-${{ steps.vars.outputs.vcpkg_sha_short }} + + - uses: hendrikmuhs/ccache-action@v1.2 + with: + save: ${{ inputs.update-cache == true }} + key: gh-runner-${{ inputs.os }}-${{ inputs.build-type }}-${{ steps.vars.outputs.branch_label }}-eclide + restore-keys: | + gh-runner-${{ inputs.os }}-${{ inputs.build-type }}-${{ steps.vars.outputs.branch_label }}- + gh-runner-${{ inputs.os }}-${{ inputs.build-type }}- + gh-runner-${{ inputs.os }}- + + - name: CMake Configure + shell: "bash" + run: | + mkdir -p ${{ github.workspace }}/build + cmake -S ./eclide -B ./build -T host=x86 -A Win32 -DCMAKE_BUILD_TYPE=${{ inputs.build-type }} + + - name: CMake Build + run: | + cmake --build ./build --config RelWithDebInfo --parallel ${{ inputs.upload-package == true && '--target package' || ''}} + + - name: Upload Package + if: ${{ inputs.upload-package == true }} + uses: actions/upload-artifact@v3 + with: + name: ${{ inputs.asset-name }} + path: | + ${{ github.workspace }}/build/*.exe + if-no-files-found: error + + - name: Upload Error Logs + if: ${{ failure() || cancelled() }} + uses: actions/upload-artifact@v3 + with: + name: ${{ inputs.os }}-eclide-logs + path: ${{ github.workspace }}/build/**/*.log diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml index 7f802c9e..f709518f 100644 --- a/.github/workflows/build-vcpkg.yml +++ b/.github/workflows/build-vcpkg.yml @@ -1,10 +1,20 @@ name: Test Build -env: - VCPKG_BINARY_SOURCES: "clear;nuget,GitHub,read" - VCPKG_NUGET_REPOSITORY: "https://github.com/hpcc-systems/vcpkg" - on: + workflow_dispatch: + inputs: + os: + type: choice + options: + - 'windows-2022' + - 'windows-2019' + description: 'Operating System' + required: false + default: 'windows-2022' + + # Do not include "push" in final version (uncomment for testing on users own repo) + # push: + pull_request: branches: - "master" @@ -17,119 +27,28 @@ on: - "!candidate-7.0.*" - "!candidate-6.*" -jobs: - preamble: - name: Preamble - runs-on: ubuntu-22.04 - outputs: - folder_platform: ${{ steps.vars.outputs.folder_platform }} - mount_platform: ${{ steps.vars.outputs.mount_platform }} - folder_ln: ${{ steps.vars.outputs.folder_ln }} - mount_ln: ${{ steps.vars.outputs.mount_ln }} - folder_build: ${{ steps.vars.outputs.folder_build }} - mount_build: ${{ steps.vars.outputs.mount_build }} - community_ref: ${{ steps.vars.outputs.community_ref }} - internal_ref: ${{ steps.vars.outputs.internal_ref }} - community_tag: ${{ steps.vars.outputs.community_tag }} - internal_tag: ${{ steps.vars.outputs.internal_tag }} - community_branch: ${{ steps.vars.outputs.community_branch }} - cmake_docker_config: ${{ steps.vars.outputs.cmake_docker_config }} - platform: "1" - platform_testing_do_not_release: ${{ steps.skip_check.outputs.platform }} - include_plugins: ${{ (steps.skip_check.outputs.plugins && 'ON') || 'OFF' }} - steps: - - name: Calculate vars - id: vars - run: | - echo "folder_platform=${{ github.workspace }}/eclide" >> $GITHUB_OUTPUT - echo 'mount_platform=source="${{ github.workspace }}/eclide",target=/hpcc-dev/eclide,type=bind,consistency=cached' >> $GITHUB_OUTPUT - echo "folder_ln=${{ github.workspace }}/LN" >> $GITHUB_OUTPUT - echo 'mount_ln=source="${{ github.workspace }}/LN",target=/hpcc-dev/LN,type=bind,consistency=cached' >> $GITHUB_OUTPUT - echo "folder_build=${{ github.workspace }}/build" >> $GITHUB_OUTPUT - echo 'mount_build=source="${{ github.workspace }}/build",target=/hpcc-dev/build,type=bind,consistency=cached' >> $GITHUB_OUTPUT - community_ref=${{ github.ref }} - echo "community_ref=$community_ref" >> $GITHUB_OUTPUT - echo "internal_ref=${{ github.base_ref }}" >> $GITHUB_OUTPUT - community_tag=$(echo $community_ref | cut -d'/' -f3) - echo "community_tag=$community_tag" >> $GITHUB_OUTPUT - echo "internal_tag=$(echo $community_tag | sed 's/community/internal/')" >> $GITHUB_OUTPUT - community_base_ref=${{ github.event.base_ref || github.ref }} - echo "community_branch=$(echo $community_base_ref | cut -d'/' -f3)" >> $GITHUB_OUTPUT - echo "cmake_docker_config=-DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_FILES_DIR=/hpcc-dev -DCPACK_THREADS=0 -DUSE_OPTIONAL=OFF" >> $GITHUB_OUTPUT - - - name: Print vars - run: | - echo "${{ toJSON(steps.vars.outputs) }})" - echo "${{ toJSON(steps.skip_check.outputs) }})" - - build-bare-metal: - name: Build Bare Metal - needs: preamble - strategy: - matrix: - include: - - os: "windows-2019" - mono: "" - sudo: "" - cmake_config_options: '-G "Visual Studio 16 2019" -A Win32' - cmake_build_options: "--config RelWithDebInfo --parallel $NUMBER_OF_PROCESSORS" - event_name: "schedule" - - os: "windows-2022" - mono: "" - sudo: "" - cmake_config_options: '-G "Visual Studio 17 2022" -A Win32' - cmake_build_options: "--config RelWithDebInfo --parallel $NUMBER_OF_PROCESSORS" - event_name: "pull_request" - fail-fast: false - - runs-on: ${{ matrix.os }} - steps: - - name: Print vars - shell: "bash" - run: | - echo ${{ matrix.os }} - echo "${{ toJSON(needs.preamble.outputs) }})" + schedule: + - cron: "0 0 * * *" - - name: "Remove builtin vcpkg (old)" - working-directory: . - shell: "bash" - run: | - ${{ matrix.sudo }} rm -rf "$VCPKG_INSTALLATION_ROOT" - - - name: Checkout eclide - uses: actions/checkout@v3.5.2 - with: - ref: ${{ needs.preamble.outputs.community_ref }} - submodules: recursive - path: ./eclide - fetch-depth: 0 - - - name: "vcpkg Bootstrap" - shell: "bash" - run: | - ./eclide/vcpkg/bootstrap-vcpkg.sh - - - name: "Setup NuGet credentials" - shell: "bash" - run: | - ${{ matrix.mono }} `./eclide/vcpkg/vcpkg fetch nuget | tail -n 1` \ - sources add \ - -name "GitHub" \ - -source "https://nuget.pkg.github.com/hpcc-systems/index.json" \ - -storepasswordincleartext \ - -username "${{ github.actor }}" \ - -password "${{ secrets.GITHUB_TOKEN }}" - - - name: CMake Packages - shell: "bash" - run: | - mkdir -p ./eclide/build - cmake -S ./eclide -B ./eclide/build ${{ matrix.cmake_config_options }} - cmake --build ./eclide/build ${{ matrix.cmake_build_options }} +jobs: - - name: Upload error logs - if: ${{ failure() || cancelled() }} - uses: actions/upload-artifact@v3 - with: - name: ${{ matrix.os }}-${{ matrix.package }}-logs - path: ./build/**/*.log + build-workflow-dispatch: + if: ${{ contains('workflow_dispatch', github.event_name) }} + uses: ./.github/workflows/build-gh_runner.yml + with: + os: ${{ inputs.os }} + secrets: inherit + + build-gh_runner-windows-2022: + if: ${{ contains('pull_request,push', github.event_name) }} + uses: ./.github/workflows/build-gh_runner.yml + with: + os: windows-2022 + secrets: inherit + + build-gh_runner-windows-2019: + if: ${{ contains('schedule,push', github.event_name) }} + uses: ./.github/workflows/build-gh_runner.yml + with: + os: windows-2019 + secrets: inherit diff --git a/CMakeLists.txt b/CMakeLists.txt index ebc55eb8..3ef0e6e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.20) set(VCPKG_FILES_DIR "${CMAKE_BINARY_DIR}" CACHE STRING "Folder for vcpkg download, build and installed files") set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake) set(VCPKG_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg) -set(VCPKG_OVERLAY_PORTS ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg_overlays) +set(VCPKG_OVERLAY_PORTS ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg_overlays;${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/overlays) set(VCPKG_INSTALLED_DIR "${VCPKG_FILES_DIR}/vcpkg_installed") set(VCPKG_INSTALL_OPTIONS "--downloads-root=${VCPKG_FILES_DIR}/vcpkg_downloads;--x-buildtrees-root=${VCPKG_FILES_DIR}/vcpkg_buildtrees;--x-packages-root=${VCPKG_FILES_DIR}/vcpkg_packages") set(VCPKG_VERBOSE OFF) diff --git a/comms/6_4_0/gsoap_build.bat b/comms/6_4_0/gsoap_build.bat deleted file mode 100644 index 5c20edb2..00000000 --- a/comms/6_4_0/gsoap_build.bat +++ /dev/null @@ -1,10 +0,0 @@ -set GSOAP=..\..\build\vcpkg_installed\x86-windows\share\gsoap -set GSOAP_BIN=%GSOAP%\bin\win32 -set wsdl2h=%GSOAP_BIN%\wsdl2h.exe -I%GSOAP% -I.\hpcc -set soapcpp2=%GSOAP_BIN%\soapcpp2.exe -C -x -i -I%GSOAP%\import - -%wsdl2h% -o Services.h Ws_Account.wsdl WsAttributes.wsdl WsDfu.wsdl WsSMC.wsdl WsTopology.wsdl WsWorkunits.wsdl - -%soapcpp2% Services.h - -%soapcpp2% -penv .\hpcc\env.h diff --git a/comms/CMakeLists.txt b/comms/CMakeLists.txt index 5c376f5e..6d6e9e84 100644 --- a/comms/CMakeLists.txt +++ b/comms/CMakeLists.txt @@ -10,10 +10,25 @@ SET (GEN_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/6_4_0/soapWsWorkunitsServiceSoapProxy.cpp ) +SET (GEN_DEPS + ${CMAKE_CURRENT_SOURCE_DIR}/6_4_0/Ws_Account.wsdl + ${CMAKE_CURRENT_SOURCE_DIR}/6_4_0/WsAttributes.wsdl + ${CMAKE_CURRENT_SOURCE_DIR}/6_4_0/WsDfu.wsdl + ${CMAKE_CURRENT_SOURCE_DIR}/6_4_0/WsSMC.wsdl + ${CMAKE_CURRENT_SOURCE_DIR}/6_4_0/WsStore.wsdl + ${CMAKE_CURRENT_SOURCE_DIR}/6_4_0/WsTopology.wsdl + ${CMAKE_CURRENT_SOURCE_DIR}/6_4_0/WsWorkunits.wsdl +) + +SET(GSOAP "${CMAKE_BINARY_DIR}/vcpkg_installed/x86-windows/share/gsoap") +SET(GSOAP_BIN "${GSOAP}/bin/win32") + ADD_CUSTOM_COMMAND( OUTPUT ${GEN_SRCS} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/6_4_0/gsoap_build.bat - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/6_4_0/gsoap_build.bat + DEPENDS ${GEN_DEPS} + COMMAND ${GSOAP_BIN}/wsdl2h.exe -I${GSOAP} -I./hpcc -o Services.h Ws_Account.wsdl WsAttributes.wsdl WsDfu.wsdl WsSMC.wsdl WsTopology.wsdl WsWorkunits.wsdl + COMMAND ${GSOAP_BIN}/soapcpp2.exe -C -x -i -I${GSOAP}/import Services.h + COMMAND ${GSOAP_BIN}/soapcpp2.exe -C -x -i -I${GSOAP}/import -penv ./hpcc/env.h WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/6_4_0 ) diff --git a/vcpkg b/vcpkg index 501db0f1..ae010a8a 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1 +Subproject commit ae010a8a71254d7c85fc86814485d6390904c63b diff --git a/vcpkg_overlays/.gitkeep b/vcpkg_overlays/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/vcpkg_overlays/boost-signals/CONTROL b/vcpkg_overlays/boost-signals/CONTROL deleted file mode 100644 index 570b8857..00000000 --- a/vcpkg_overlays/boost-signals/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 -Source: boost-signals -Version: 1.68.0 -Build-Depends: boost-any, boost-build, boost-config, boost-core, boost-function, boost-iterator, boost-modular-build-helper, boost-optional, boost-smart-ptr, boost-type-traits, boost-utility, boost-vcpkg-helpers -Homepage: https://github.com/boostorg/signals -Description: Boost signals module diff --git a/vcpkg_overlays/boost-signals/portfile.cmake b/vcpkg_overlays/boost-signals/portfile.cmake deleted file mode 100644 index f5da93fc..00000000 --- a/vcpkg_overlays/boost-signals/portfile.cmake +++ /dev/null @@ -1,16 +0,0 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 - -include(vcpkg_common_functions) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO boostorg/signals - REF boost-1.68.0 - SHA512 3d5a26de28050e03779a26f6af5f96bdab0023d6be3047be9652a660c607e7839b46b3abb257ec5b1791e2e4dc5cbcbefe433244ddc6140ee64ae531b2c0b01d - HEAD_REF master -) - -include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) -boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) -include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) -boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/vcpkg_overlays/bugtrap/portfile.cmake b/vcpkg_overlays/bugtrap/portfile.cmake deleted file mode 100644 index fcfac401..00000000 --- a/vcpkg_overlays/bugtrap/portfile.cmake +++ /dev/null @@ -1,28 +0,0 @@ -# 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 = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - -include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/BugTrap-${VERSION}) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/bchavez/BugTrap/archive/v${VERSION}.tar.gz" - FILENAME "BugTrap-${VERSION}.tar.gz" - SHA512 67df0f45a0c0078a749483fdd6cde9851fb22437da353b3727c7194210637863f118c67caef31d3450ca4462b008297e552fcf2cb6e1bef45a89edff1f71cb28 -) -vcpkg_extract_source_archive(${ARCHIVE}) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include ${CURRENT_PACKAGES_DIR}/src) - -file(COPY ${SOURCE_PATH}/source/Client/BugTrap.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/bugtrap) - -file(INSTALL ${SOURCE_PATH}/source DESTINATION ${CURRENT_PACKAGES_DIR}/share/bugtrap) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bugtrap RENAME copyright) - diff --git a/vcpkg_overlays/bugtrap/vcpkg.json b/vcpkg_overlays/bugtrap/vcpkg.json deleted file mode 100644 index 05316bc5..00000000 --- a/vcpkg_overlays/bugtrap/vcpkg.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "bugtrap", - "version": "1.4.9", - "port-version": 0, - "description": "BugTrap is a free, open-source, crash reporting library for Windows applications.", - "dependencies": [ - ] -} diff --git a/vcpkg_overlays/gsoap/CONTROL b/vcpkg_overlays/gsoap/CONTROL deleted file mode 100644 index 8fbdc720..00000000 --- a/vcpkg_overlays/gsoap/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: gsoap -Version: 2.7.13 -Description: Development toolkit for Web Services and XML data bindings for C & C++ diff --git a/vcpkg_overlays/gsoap/fix-build-in-windows.patch b/vcpkg_overlays/gsoap/fix-build-in-windows.patch deleted file mode 100644 index e661fb7c..00000000 --- a/vcpkg_overlays/gsoap/fix-build-in-windows.patch +++ /dev/null @@ -1,307 +0,0 @@ - gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln | 8 +- - .../soapcpp2/soapcpp2/soapcpp2.vcxproj | 114 +++++++++++++++++ - gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln | 8 +- - .../VisualStudio2005/wsdl2h/wsdl2h/wsdl2h.vcxproj | 139 +++++++++++++++++++++ - 4 files changed, 263 insertions(+), 6 deletions(-) - -diff --git a/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln b/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln -index 68bacf1..5d74e6b 100644 ---- a/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln -+++ b/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln -@@ -1,7 +1,9 @@ -  --Microsoft Visual Studio Solution File, Format Version 9.00 --# Visual C++ Express 2005 --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soapcpp2", "soapcpp2\soapcpp2.vcproj", "{BDD1B293-CE39-4BEC-8E63-8B1621F3EB56}" -+Microsoft Visual Studio Solution File, Format Version 12.00 -+# Visual Studio 14 -+VisualStudioVersion = 14.0.25420.1 -+MinimumVisualStudioVersion = 10.0.40219.1 -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soapcpp2", "soapcpp2\soapcpp2.vcxproj", "{BDD1B293-CE39-4BEC-8E63-8B1621F3EB56}" - EndProject - Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution -diff --git a/gsoap/VisualStudio2005/soapcpp2/soapcpp2/soapcpp2.vcxproj b/gsoap/VisualStudio2005/soapcpp2/soapcpp2/soapcpp2.vcxproj -new file mode 100644 -index 0000000..17f1d75 ---- /dev/null -+++ b/gsoap/VisualStudio2005/soapcpp2/soapcpp2/soapcpp2.vcxproj -@@ -0,0 +1,114 @@ -+ -+ -+ -+ -+ Debug -+ Win32 -+ -+ -+ Release -+ Win32 -+ -+ -+ -+ {BDD1B293-CE39-4BEC-8E63-8B1621F3EB56} -+ soapcpp2 -+ Win32Proj -+ 8.1 -+ -+ -+ -+ Application -+ v140 -+ Unicode -+ true -+ -+ -+ Application -+ v140 -+ Unicode -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ <_ProjectFileVersion>14.0.25431.1 -+ -+ -+ $(SolutionDir)$(Configuration)\ -+ $(Configuration)\ -+ true -+ -+ -+ $(SolutionDir)$(Configuration)\ -+ $(Configuration)\ -+ false -+ -+ -+ -+ Disabled -+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -+ true -+ EnableFastChecks -+ MultiThreadedDebugDLL -+ -+ Level3 -+ EditAndContinue -+ -+ -+ kernel32.lib -+ true -+ Console -+ MachineX86 -+ -+ -+ -+ -+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -+ MultiThreaded -+ -+ Level3 -+ ProgramDatabase -+ -+ -+ kernel32.lib -+ true -+ Console -+ true -+ true -+ MachineX86 -+ -+ -+ -+ -+ -+ -+ -+ $(IntDir)%(Filename)1.obj -+ $(IntDir)%(Filename)1.xdc -+ $(IntDir)%(Filename)1.obj -+ $(IntDir)%(Filename)1.xdc -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -\ No newline at end of file -diff --git a/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln b/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln -index ffa3fa4..3f23607 100644 ---- a/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln -+++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln -@@ -1,7 +1,9 @@ -  --Microsoft Visual Studio Solution File, Format Version 9.00 --# Visual C++ Express 2005 --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wsdl2h", "wsdl2h\wsdl2h.vcproj", "{6CBC554A-4FFB-461F-91D4-11B358802815}" -+Microsoft Visual Studio Solution File, Format Version 12.00 -+# Visual Studio 14 -+VisualStudioVersion = 14.0.25420.1 -+MinimumVisualStudioVersion = 10.0.40219.1 -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wsdl2h", "wsdl2h\wsdl2h.vcxproj", "{6CBC554A-4FFB-461F-91D4-11B358802815}" - EndProject - Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution -diff --git a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/wsdl2h.vcxproj b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/wsdl2h.vcxproj -new file mode 100644 -index 0000000..abf3ea6 ---- /dev/null -+++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/wsdl2h.vcxproj -@@ -0,0 +1,139 @@ -+ -+ -+ -+ -+ Debug -+ Win32 -+ -+ -+ Release -+ Win32 -+ -+ -+ -+ {6CBC554A-4FFB-461F-91D4-11B358802815} -+ wsdl2h -+ Win32Proj -+ 8.1 -+ -+ -+ -+ Application -+ v140 -+ Unicode -+ true -+ -+ -+ Application -+ v140 -+ Unicode -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ <_ProjectFileVersion>14.0.25431.1 -+ -+ -+ $(SolutionDir)$(Configuration)\ -+ $(Configuration)\ -+ true -+ -+ -+ $(SolutionDir)$(Configuration)\ -+ $(Configuration)\ -+ false -+ -+ -+ -+ Disabled -+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -+ true -+ EnableFastChecks -+ MultiThreadedDebugDLL -+ -+ Level3 -+ EditAndContinue -+ -+ -+ kernel32.lib -+ true -+ Console -+ MachineX86 -+ -+ -+ -+ -+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -+ MultiThreaded -+ -+ Level3 -+ ProgramDatabase -+ -+ -+ kernel32.lib -+ true -+ Console -+ true -+ true -+ MachineX86 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ Parsing WSDL and Schema definitions -+ soapcpp2.exe -SC -pwsdl %(Filename)%(Extension) -+ -+ wsdlStub.h wsdlH.h wsdlC.cpp;%(Outputs) -+ Parsing WSDL and Schema definitions -+ soapcpp2.exe -SC -pwsdl %(Filename)%(Extension) -+ -+ wsdlStub.h wsdlH.h wsdlC.cpp;%(Outputs) -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -\ No newline at end of file diff --git a/vcpkg_overlays/gsoap/portfile.cmake b/vcpkg_overlays/gsoap/portfile.cmake deleted file mode 100644 index 6a3e06ce..00000000 --- a/vcpkg_overlays/gsoap/portfile.cmake +++ /dev/null @@ -1,47 +0,0 @@ -# Header-only library - -include(vcpkg_common_functions) - -vcpkg_from_github( - OUT_SOURCE_PATH CURRENT_BUILDTREES_DIR - REPO hpcc-systems/gsoap - REF v2.7.13 - SHA512 d4b5b967cf3e8e5134cb2b0d575c41dbde1a298d3c47aefc89ff58be6120e78e9b76179a3cc09a9e4a42f97adb5c117b121811c98a1b319b4390e39e6fe494c0 - HEAD_REF master -) - -file(COPY ${CURRENT_BUILDTREES_DIR}/gsoap DESTINATION ${CURRENT_PACKAGES_DIR}/share) - -file(COPY ${CURRENT_BUILDTREES_DIR}/gsoap/stdsoap2.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/gsoap) - -file(INSTALL ${CURRENT_BUILDTREES_DIR}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gsoap RENAME copyright) - - - -# 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 = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - -#include(vcpkg_common_functions) -#set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gsoap_2.7.13) -#vcpkg_download_distfile(ARCHIVE - #URLS "https://sourceforge.net/projects/gsoap2/files/gsoap-2.7/gsoap_2.7.13.zip/download" - #FILENAME "gsoap_2.7.13.zip" - #SHA512 9d10fde082ac1b20cbf0713f813d118e60bc5b3a9136d99915959a06c8e67aa9983524c0c18a26fc0430a63d82c5c5d83717f8437c1433c2068f2ee34de40ccf -#) -#vcpkg_extract_source_archive(${ARCHIVE}) - -#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include ${CURRENT_PACKAGES_DIR}/src) - -#file(COPY ${CURRENT_BUILDTREES_DIR}/src/gsoap-2.7/gsoap/stdsoap2.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/gsoap) - -#file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/gsoap-2.7/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gsoap RENAME copyright) - diff --git a/vcpkg_overlays/scintilla/CONTROL b/vcpkg_overlays/scintilla/CONTROL deleted file mode 100644 index e833bcb4..00000000 --- a/vcpkg_overlays/scintilla/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: scintilla -Version: 3.7.6-1 -Description: A free source code editing component for Win32, GTK+, and OS X diff --git a/vcpkg_overlays/scintilla/portfile.cmake b/vcpkg_overlays/scintilla/portfile.cmake deleted file mode 100644 index 800eb6fe..00000000 --- a/vcpkg_overlays/scintilla/portfile.cmake +++ /dev/null @@ -1,23 +0,0 @@ -include(vcpkg_common_functions) - -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) - -vcpkg_download_distfile(ARCHIVE - URLS "http://www.scintilla.org/scintilla376.zip" - FILENAME "scintilla376.zip" - SHA512 618a50405eede3277d7696ac58122aeeb490d10ae392c60c7f78baaa96c965a8e1a599948e0ebd61bed7f75894b01bdf4574a0e5d0e20996bfdfb2e1bdb33203 -) - -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF 3.7.6 - PATCHES - "use-string-in-platwin.patch" -) - -file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}/include/scintilla) -file(INSTALL ${SOURCE_PATH}/src DESTINATION ${CURRENT_PACKAGES_DIR}/share/scintilla) -file(INSTALL ${SOURCE_PATH}/LexLib DESTINATION ${CURRENT_PACKAGES_DIR}/share/scintilla) -file(INSTALL ${SOURCE_PATH}/Win32 DESTINATION ${CURRENT_PACKAGES_DIR}/share/scintilla) -file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/scintilla RENAME copyright) diff --git a/vcpkg_overlays/scintilla/use-string-in-platwin.patch b/vcpkg_overlays/scintilla/use-string-in-platwin.patch deleted file mode 100644 index 0b022e7c..00000000 --- a/vcpkg_overlays/scintilla/use-string-in-platwin.patch +++ /dev/null @@ -1,15 +0,0 @@ - win32/PlatWin.cxx | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx -index f1d73c2..4b0afa5 100644 ---- a/win32/PlatWin.cxx -+++ b/win32/PlatWin.cxx -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - - #undef _WIN32_WINNT - #define _WIN32_WINNT 0x0500 diff --git a/vcpkg_overlays/webview2/portfile.cmake b/vcpkg_overlays/webview2/portfile.cmake deleted file mode 100644 index 6a47ad75..00000000 --- a/vcpkg_overlays/webview2/portfile.cmake +++ /dev/null @@ -1,55 +0,0 @@ -if(VCPKG_TARGET_IS_UWP) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -endif() - -set(VERSION 1.0.1210.39) - -vcpkg_download_distfile(ARCHIVE - URLS "https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/${VERSION}" - FILENAME "microsoft.web.webview2.${VERSION}.zip" - SHA512 c87812247a466f4aaeac8be8b32be49166b4ddb5bbf65581d5df81d69eda340e9911144a8dd8401baa6e51f95337001cd18ff90cd36ca0af86cc65227e8e2ccf -) - -vcpkg_extract_source_archive( - SOURCE_PATH - ARCHIVE "${ARCHIVE}" - SOURCE_BASE "${VERSION}" - NO_REMOVE_ONE_LEVEL -) - -file(COPY - "${SOURCE_PATH}/build/native/include/" - DESTINATION "${CURRENT_PACKAGES_DIR}/include") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(COPY - "${SOURCE_PATH}/build/native/${VCPKG_TARGET_ARCHITECTURE}/WebView2LoaderStatic.lib" - DESTINATION "${CURRENT_PACKAGES_DIR}/lib") -else() - file(COPY - "${SOURCE_PATH}/build/native/include-winrt/" - DESTINATION "${CURRENT_PACKAGES_DIR}/include") - file(COPY - "${SOURCE_PATH}/lib/Microsoft.Web.WebView2.Core.winmd" - DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(COPY - "${SOURCE_PATH}/build/native/${VCPKG_TARGET_ARCHITECTURE}/WebView2Loader.dll.lib" - DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(COPY - "${SOURCE_PATH}/build/native/${VCPKG_TARGET_ARCHITECTURE}/WebView2Loader.dll" - "${SOURCE_PATH}/runtimes/win-${VCPKG_TARGET_ARCHITECTURE}/native_uap/Microsoft.Web.WebView2.Core.dll" - DESTINATION "${CURRENT_PACKAGES_DIR}/bin") -endif() -if(NOT VCPKG_BUILD_TYPE) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(COPY "${CURRENT_PACKAGES_DIR}/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") - endif() - file(COPY "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") -endif() - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-webview2-config.cmake" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-webview2") - -# The import libraries for webview fail with "Could not find proper second linker member" -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - -configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/vcpkg_overlays/webview2/unofficial-webview2-config.cmake b/vcpkg_overlays/webview2/unofficial-webview2-config.cmake deleted file mode 100644 index 60851bc2..00000000 --- a/vcpkg_overlays/webview2/unofficial-webview2-config.cmake +++ /dev/null @@ -1,21 +0,0 @@ -get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_DIR}" PATH) -get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) - -if(NOT TARGET unofficial::webview2::webview2) - if(EXISTS "${_IMPORT_PREFIX}/lib/WebView2LoaderStatic.lib") - add_library(unofficial::webview2::webview2 STATIC IMPORTED) - set_target_properties(unofficial::webview2::webview2 - PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" - IMPORTED_LOCATION "${_IMPORT_PREFIX}/lib/WebView2LoaderStatic.lib") - else() - add_library(unofficial::webview2::webview2 SHARED IMPORTED) - set_target_properties(unofficial::webview2::webview2 - PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" - IMPORTED_LOCATION "${_IMPORT_PREFIX}/bin/WebView2Loader.dll" - IMPORTED_IMPLIB "${_IMPORT_PREFIX}/lib/WebView2Loader.dll.lib") - endif() -endif() - -unset(_IMPORT_PREFIX) diff --git a/vcpkg_overlays/webview2/vcpkg.json b/vcpkg_overlays/webview2/vcpkg.json deleted file mode 100644 index 34a407b0..00000000 --- a/vcpkg_overlays/webview2/vcpkg.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "webview2", - "version": "1.0.1210.39", - "port-version": 1, - "description": "The WebView2 control allows you to embed web technologies (HTML, CSS, and JavaScript) using Microsoft Edge", - "homepage": "https://docs.microsoft.com/en-us/microsoft-edge/webview2", - "documentation": "https://docs.microsoft.com/en-us/microsoft-edge/webview2", - "license": "BSD-3-Clause", - "supports": "windows & (x86 | x64 | arm64)", - "dependencies": [ - "wil" - ] -} diff --git a/vcpkg_overlays/wtl/CONTROL b/vcpkg_overlays/wtl/CONTROL deleted file mode 100644 index 0b78d02b..00000000 --- a/vcpkg_overlays/wtl/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: wtl -Maintainer: jfrederich@gmail.com -Version: 9.1.5321 -Description: Windows Template Library (WTL) is a C++ library for developing Windows applications and UI components. -Build-Depends: diff --git a/vcpkg_overlays/wtl/portfile.cmake b/vcpkg_overlays/wtl/portfile.cmake deleted file mode 100644 index 9723a838..00000000 --- a/vcpkg_overlays/wtl/portfile.cmake +++ /dev/null @@ -1,18 +0,0 @@ -# Header-only library - -include(vcpkg_common_functions) - -vcpkg_from_github( - OUT_SOURCE_PATH CURRENT_BUILDTREES_DIR - REPO hpcc-systems/wtl - REF WTL91_5321_Final - SHA512 39dffa960533f868cfe1592535d631d6b246c689161afd2795810a602a9c6887fef153c0e3bd858f68a760555104ab59beefc518a60e36149fc0472643f54a41 - HEAD_REF WTL91_5321_Final -) - -file(INSTALL ${CURRENT_BUILDTREES_DIR}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/wtl FILES_MATCHING PATTERN "*.h") - -file(COPY ${CURRENT_BUILDTREES_DIR}/MS-PL.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wtl) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/wtl/MS-PL.txt ${CURRENT_PACKAGES_DIR}/share/wtl/copyright) - -file(COPY ${CURRENT_BUILDTREES_DIR}/samples DESTINATION ${CURRENT_PACKAGES_DIR}/share/wtl)