vcpkg: switch to manifest
PATCH 1/1 vcpkg: switch to manifest
From: Lev Stipakov <[email protected]...>
Add vcpkg manifest file which lists
dependencies and enable manifest usage in
project file.
This simplifies build process by eliminating separate "vcpkg install" step to install dependencies.
--- .github/workflows/build.yaml | 15 ++++++--------- .gitignore | 1 + src/openvpn/openvpn.vcxproj | 9 +++++++++ src/openvpn/vcpkg.json | 18 ++++++++++++++++++ 4 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 src/openvpn/vcpkg.json
.github/workflows/build.yaml +6 -9
@@ -268,19 +268,16 @@ jobs: - name: Install rst2html run: python -m pip install --upgrade pip rst2html - - name: Restore artifacts, or run vcpkg, build and cache artifacts - uses: lukka/[email protected]... + - name: Restore artifacts, or setup vcpkg (do not install any package) + uses: lukka/[email protected]... with: - vcpkgGitCommitId: 'a69b65229b3956b7f45abd81671b7330114bcaad' - vcpkgArguments: 'openssl lz4 lzo pkcs11-helper tap-windows6' - vcpkgTriplet: '${{ matrix.triplet }}-windows-ovpn' - cleanAfterBuild: false + vcpkgGitCommitId: '4b766c1cd17205e1b768c4fadfd5f867c1d0510e' - - name: Build + - name: Run MSBuild consuming vcpkg.json working-directory: ${{env.GITHUB_WORKSPACE}} run: | - vcpkg integrate install - msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform="${{ matrix.plat }}" . + vcpkg integrate install + msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform="${{ matrix.plat }}" . - name: Archive artifacts uses: actions/[email protected]...
.gitignore +1 -0
@@ -44,6 +44,7 @@ m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 +vcpkg_installed version.sh msvc-env-local.bat
src/openvpn/openvpn.vcxproj +9 -0
@@ -124,26 +124,35 @@ <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'"> <VcpkgEnabled>true</VcpkgEnabled> <VcpkgTriplet>arm64-windows-ovpn</VcpkgTriplet> + <VcpkgAdditionalInstallOptions>--overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports</VcpkgAdditionalInstallOptions> </PropertyGroup> <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> <VcpkgEnabled>true</VcpkgEnabled> <VcpkgTriplet>arm64-windows-ovpn</VcpkgTriplet> + <VcpkgAdditionalInstallOptions>--overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports</VcpkgAdditionalInstallOptions> </PropertyGroup> <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <VcpkgEnabled>true</VcpkgEnabled> <VcpkgTriplet>x86-windows-ovpn</VcpkgTriplet> + <VcpkgAdditionalInstallOptions>--overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports</VcpkgAdditionalInstallOptions> </PropertyGroup> <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <VcpkgEnabled>true</VcpkgEnabled> <VcpkgTriplet>x86-windows-ovpn</VcpkgTriplet> + <VcpkgAdditionalInstallOptions>--overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports</VcpkgAdditionalInstallOptions> </PropertyGroup> <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <VcpkgEnabled>true</VcpkgEnabled> <VcpkgTriplet>x64-windows-ovpn</VcpkgTriplet> + <VcpkgAdditionalInstallOptions>--overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports</VcpkgAdditionalInstallOptions> </PropertyGroup> <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <VcpkgEnabled>true</VcpkgEnabled> <VcpkgTriplet>x64-windows-ovpn</VcpkgTriplet> + <VcpkgAdditionalInstallOptions>--overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports</VcpkgAdditionalInstallOptions> + </PropertyGroup> + <PropertyGroup Label="Vcpkg"> + <VcpkgEnableManifest>true</VcpkgEnableManifest> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile>
src/openvpn/vcpkg.json new file +18 -0
@@ -0,0 +1,18 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", + "name": "openvpn", + "version": "2.5", + "dependencies": [ + "openssl", + "tap-windows6", + "lzo", + "pkcs11-helper" + ], + "builtin-baseline": "4b766c1cd17205e1b768c4fadfd5f867c1d0510e", + "overrides": [ + { + "name": "openssl", + "version-string": "1.1.1n" + } + ] +}
Signature · 1 line
2.23.0.windows.1
PATCH v2 1/1 vcpkg: switch to manifest
From: Lev Stipakov <[email protected]...>
Add vcpkg manifest file which lists
dependencies and enable manifest usage in
project file.
This simplifies build process by eliminating separate "vcpkg install" step to install dependencies.
---
v2: add missing lz4 dependency
.github/workflows/build.yaml | 15 ++++++--------- .gitignore | 1 + src/openvpn/openvpn.vcxproj | 9 +++++++++ src/openvpn/vcpkg.json | 19 +++++++++++++++++++ 4 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 src/openvpn/vcpkg.json
.github/workflows/build.yaml +6 -9
@@ -268,19 +268,16 @@ jobs: - name: Install rst2html run: python -m pip install --upgrade pip rst2html - - name: Restore artifacts, or run vcpkg, build and cache artifacts - uses: lukka/[email protected]... + - name: Restore artifacts, or setup vcpkg (do not install any package) + uses: lukka/[email protected]... with: - vcpkgGitCommitId: 'a69b65229b3956b7f45abd81671b7330114bcaad' - vcpkgArguments: 'openssl lz4 lzo pkcs11-helper tap-windows6' - vcpkgTriplet: '${{ matrix.triplet }}-windows-ovpn' - cleanAfterBuild: false + vcpkgGitCommitId: '4b766c1cd17205e1b768c4fadfd5f867c1d0510e' - - name: Build + - name: Run MSBuild consuming vcpkg.json working-directory: ${{env.GITHUB_WORKSPACE}} run: | - vcpkg integrate install - msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform="${{ matrix.plat }}" . + vcpkg integrate install + msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform="${{ matrix.plat }}" . - name: Archive artifacts uses: actions/[email protected]...
.gitignore +1 -0
@@ -44,6 +44,7 @@ m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 +vcpkg_installed version.sh msvc-env-local.bat
src/openvpn/openvpn.vcxproj +9 -0
@@ -124,26 +124,35 @@ <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'"> <VcpkgEnabled>true</VcpkgEnabled> <VcpkgTriplet>arm64-windows-ovpn</VcpkgTriplet> + <VcpkgAdditionalInstallOptions>--overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports</VcpkgAdditionalInstallOptions> </PropertyGroup> <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> <VcpkgEnabled>true</VcpkgEnabled> <VcpkgTriplet>arm64-windows-ovpn</VcpkgTriplet> + <VcpkgAdditionalInstallOptions>--overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports</VcpkgAdditionalInstallOptions> </PropertyGroup> <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <VcpkgEnabled>true</VcpkgEnabled> <VcpkgTriplet>x86-windows-ovpn</VcpkgTriplet> + <VcpkgAdditionalInstallOptions>--overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports</VcpkgAdditionalInstallOptions> </PropertyGroup> <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <VcpkgEnabled>true</VcpkgEnabled> <VcpkgTriplet>x86-windows-ovpn</VcpkgTriplet> + <VcpkgAdditionalInstallOptions>--overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports</VcpkgAdditionalInstallOptions> </PropertyGroup> <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <VcpkgEnabled>true</VcpkgEnabled> <VcpkgTriplet>x64-windows-ovpn</VcpkgTriplet> + <VcpkgAdditionalInstallOptions>--overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports</VcpkgAdditionalInstallOptions> </PropertyGroup> <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <VcpkgEnabled>true</VcpkgEnabled> <VcpkgTriplet>x64-windows-ovpn</VcpkgTriplet> + <VcpkgAdditionalInstallOptions>--overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports</VcpkgAdditionalInstallOptions> + </PropertyGroup> + <PropertyGroup Label="Vcpkg"> + <VcpkgEnableManifest>true</VcpkgEnableManifest> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile>
src/openvpn/vcpkg.json new file +19 -0
@@ -0,0 +1,19 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", + "name": "openvpn", + "version": "2.5", + "dependencies": [ + "openssl", + "tap-windows6", + "lzo", + "lz4", + "pkcs11-helper" + ], + "builtin-baseline": "4b766c1cd17205e1b768c4fadfd5f867c1d0510e", + "overrides": [ + { + "name": "openssl", + "version-string": "1.1.1n" + } + ] +}
Signature · 1 line
2.23.0.windows.1
PATCH v3 1/1 vcpkg: switch to manifest
From: Lev Stipakov <[email protected]...>
Add vcpkg manifest file which lists
dependencies and enable manifest usage in
project file.
This simplifies build process by eliminating separate "vcpkg install" step to install dependencies.
---
v3: fix GitHub Actions cache
v2: add missing lz4 dependency
.github/workflows/build.yaml | 16 +++++++--------- .gitignore | 1 + src/openvpn/openvpn.vcxproj | 9 +++++++++ src/openvpn/vcpkg.json | 19 +++++++++++++++++++ 4 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 src/openvpn/vcpkg.json
.github/workflows/build.yaml +7 -9
@@ -268,19 +268,17 @@ jobs: - name: Install rst2html run: python -m pip install --upgrade pip rst2html - - name: Restore artifacts, or run vcpkg, build and cache artifacts - uses: lukka/[email protected]... + - name: Restore artifacts, or setup vcpkg (do not install any package) + uses: lukka/[email protected]... with: - vcpkgGitCommitId: 'a69b65229b3956b7f45abd81671b7330114bcaad' - vcpkgArguments: 'openssl lz4 lzo pkcs11-helper tap-windows6' - vcpkgTriplet: '${{ matrix.triplet }}-windows-ovpn' - cleanAfterBuild: false + vcpkgGitCommitId: '4b766c1cd17205e1b768c4fadfd5f867c1d0510e' + appendedCacheKey: '${{matrix.triplet}}' - - name: Build + - name: Run MSBuild consuming vcpkg.json working-directory: ${{env.GITHUB_WORKSPACE}} run: | - vcpkg integrate install - msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform="${{ matrix.plat }}" . + vcpkg integrate install + msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform="${{ matrix.plat }}" . - name: Archive artifacts uses: actions/[email protected]...
.gitignore +1 -0
@@ -44,6 +44,7 @@ m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 +vcpkg_installed version.sh msvc-env-local.bat
src/openvpn/openvpn.vcxproj +9 -0
@@ -124,26 +124,35 @@ <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'"> <VcpkgEnabled>true</VcpkgEnabled> <VcpkgTriplet>arm64-windows-ovpn</VcpkgTriplet> + <VcpkgAdditionalInstallOptions>--overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports</VcpkgAdditionalInstallOptions> </PropertyGroup> <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> <VcpkgEnabled>true</VcpkgEnabled> <VcpkgTriplet>arm64-windows-ovpn</VcpkgTriplet> + <VcpkgAdditionalInstallOptions>--overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports</VcpkgAdditionalInstallOptions> </PropertyGroup> <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <VcpkgEnabled>true</VcpkgEnabled> <VcpkgTriplet>x86-windows-ovpn</VcpkgTriplet> + <VcpkgAdditionalInstallOptions>--overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports</VcpkgAdditionalInstallOptions> </PropertyGroup> <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <VcpkgEnabled>true</VcpkgEnabled> <VcpkgTriplet>x86-windows-ovpn</VcpkgTriplet> + <VcpkgAdditionalInstallOptions>--overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports</VcpkgAdditionalInstallOptions> </PropertyGroup> <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <VcpkgEnabled>true</VcpkgEnabled> <VcpkgTriplet>x64-windows-ovpn</VcpkgTriplet> + <VcpkgAdditionalInstallOptions>--overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports</VcpkgAdditionalInstallOptions> </PropertyGroup> <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <VcpkgEnabled>true</VcpkgEnabled> <VcpkgTriplet>x64-windows-ovpn</VcpkgTriplet> + <VcpkgAdditionalInstallOptions>--overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports</VcpkgAdditionalInstallOptions> + </PropertyGroup> + <PropertyGroup Label="Vcpkg"> + <VcpkgEnableManifest>true</VcpkgEnableManifest> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile>
src/openvpn/vcpkg.json new file +19 -0
@@ -0,0 +1,19 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", + "name": "openvpn", + "version": "2.5", + "dependencies": [ + "openssl", + "tap-windows6", + "lzo", + "lz4", + "pkcs11-helper" + ], + "builtin-baseline": "4b766c1cd17205e1b768c4fadfd5f867c1d0510e", + "overrides": [ + { + "name": "openssl", + "version-string": "1.1.1n" + } + ] +}
Signature · 1 line
2.23.0.windows.1
Not sure what this all does, but github likes it and builds nice things.
I should point out that vcpkg.json will not be contained in the "make dist" tarball (not mentioned in "Makefile.am"), so this is only benefiting people that build from git today.
Your patch has been applied to the release/2.5 branch.
commit 55cfc0b9541ff25fac31059ffcf7eea06fd6c0ec
Author: Lev Stipakov Date: Thu May 5 15:42:05 2022 +0300
vcpkg: switch to manifest
Signed-off-by: Lev Stipakov <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg24286.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering