Skip to content

Commit b8a75a1

Browse files
committed
vendor: Remove cppnetlib
This is the last package that is in vendor and necessitates updating the Dockerfile to remove the vendor build stage.
1 parent 63368f7 commit b8a75a1

File tree

9 files changed

+11
-118
lines changed

9 files changed

+11
-118
lines changed

.github/workflows/build-cloe.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ jobs:
5555
fi
5656
- name: Build cloe w/ package
5757
run: |
58-
make -f Makefile.all export-vendor &&
5958
make ${{ matrix.package_target }}
6059
- name: Build smoketest dependencies
6160
run: |

Dockerfile

+1-21
Original file line numberDiff line numberDiff line change
@@ -69,31 +69,11 @@ RUN make -f /cloe/Makefile.setup setup-conan && \
6969
# All common processes are made easy to apply by writing target recipes in the
7070
# Makefile at the root of the repository. This also acts as a form of
7171
# documentation.
72-
FROM stage-setup-conan AS stage-vendor
73-
ARG VENDOR_TARGET="export-vendor download-vendor"
74-
ARG KEEP_SOURCES=0
72+
FROM stage-setup-conan AS stage-build
7573

7674
WORKDIR /cloe
7775
SHELL ["/bin/bash", "-c"]
7876

79-
# Download or build dependencies:
80-
COPY vendor /cloe/vendor
81-
COPY Makefile.package /cloe
82-
COPY Makefile.all /cloe
83-
RUN --mount=type=cache,target=/ccache \
84-
--mount=type=secret,target=/root/setup.sh,id=setup,mode=0400 \
85-
if [ -r /root/setup.sh ]; then . /root/setup.sh; fi && \
86-
make -f Makefile.all ${VENDOR_TARGET} && \
87-
# Clean up:
88-
if [ ${KEEP_SOURCES} -eq 0 ]; then \
89-
find /root/.conan/data -name dl -type d -maxdepth 5 -exec rm -r {} + && \
90-
conan remove \* -s -b -f; \
91-
else \
92-
conan remove \* -b -f; \
93-
fi
94-
95-
# Build Cloe:
96-
FROM stage-vendor AS stage-build
9777
ARG PROJECT_VERSION=unknown
9878
ARG PACKAGE_TARGET="export smoketest-deps"
9979
ARG KEEP_SOURCES=0

Makefile.all

+10-10
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ SELECT_PKGS := $(call uniq, $(filter-out ${UNSELECT_PKGS}, ${ALL_PKGS}) ${WITH_P
4848
##
4949
## Functions analogously to normal package selection.
5050
##
51-
ALL_VENDOR := $(wildcard vendor/*)
51+
ALL_VENDOR :=
5252
WITHOUT_VENDOR :=
5353
UNSELECT_VENDOR := ${WITHOUT_VENDOR}
5454
WITH_VENDOR :=
@@ -119,9 +119,9 @@ ${META_PKG}:
119119
done
120120

121121
# Usage: $(call make_vendor_target, TARGET-NAME, HELP-DESCRIPTION, HELP-CATEGORY)
122-
define make_vendor_target
123-
$(eval $(call _make_target_rules,${1},${2},${3},${SELECT_VENDOR}))
124-
endef
122+
# define make_vendor_target
123+
# $(eval $(call _make_target_rules,${1},${2},${3},${SELECT_VENDOR}))
124+
# endef
125125

126126
# Usage: $(call make_every_target, TARGET-NAME, HELP-DESCRIPTION, HELP-CATEGORY)
127127
define make_every_target
@@ -141,9 +141,9 @@ endef
141141
help::
142142
$(call print_help_section, "Available build targets")
143143

144-
$(call make_vendor_target, export-vendor, "export all vendor packages", "[conan-cache]")
145-
$(call make_vendor_target, package-vendor, "create all vendor packages", "[conan-cache]")
146-
$(call make_vendor_target, download-vendor, "download or build vendor packages", "[conan-cache]")
144+
# $(call make_vendor_target, export-vendor, "export all vendor packages", "[conan-cache]")
145+
# $(call make_vendor_target, package-vendor, "create all vendor packages", "[conan-cache]")
146+
# $(call make_vendor_target, download-vendor, "download or build vendor packages", "[conan-cache]")
147147

148148
help::
149149
echo
@@ -180,15 +180,15 @@ $(call make_select_target, clean-select, "remove build artifacts", "[in-source]"
180180
help::
181181
echo
182182
$(call print_help_subsection, "Options")
183-
$(call print_help_option, WITH_VENDOR, "", "include optional vendor packages from ${_grn}UNSELECT_VENDOR${_rst}")
183+
# $(call print_help_option, WITH_VENDOR, "", "include optional vendor packages from ${_grn}UNSELECT_VENDOR${_rst}")
184184
$(call print_help_option, WITH_PKGS, "", "include optional packages from ${_grn}UNSELECT_PKGS${_rst}")
185185
$(call print_help_option, LOCKFILE_SOURCE, "", "use specified conanfile as lockfile source for build")
186186
echo
187187
$(call print_help_subsection, "Defines")
188188
$(call print_help_option, BUILD_POLICY, ${BUILD_POLICY})
189189
$(call print_help_define, CONAN_OPTIONS, ${CONAN_OPTIONS})
190-
$(call print_help_define_lines, UNSELECT_VENDOR, ${UNSELECT_VENDOR})
191-
$(call print_help_define_lines, SELECT_VENDOR, ${SELECT_VENDOR})
190+
# $(call print_help_define_lines, UNSELECT_VENDOR, ${UNSELECT_VENDOR})
191+
# $(call print_help_define_lines, SELECT_VENDOR, ${SELECT_VENDOR})
192192
$(call print_help_define_lines, UNSELECT_PKGS, ${UNSELECT_PKGS})
193193
$(call print_help_define_lines, SELECT_PKGS, ${SELECT_PKGS})
194194
echo

NOTICE.md

-6
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,6 @@ installed with the help of Conan):
104104
- Website: https://eigen.tuxfamily.org
105105
- Conan-Package: eigen
106106

107-
- Cpp-Netlib
108-
- License: Boost
109-
- License-Source: https://www.boost.org/LICENSE_1_0.txt
110-
- Website: https://cpp-netlib.org
111-
- Conan-Package: cpp-netlib
112-
113107
- Oat++
114108
- License: Apache-2.0
115109
- License-Source: https://github.com/oatpp/oatpp/blob/master/LICENSE

README.md

-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ See the Conan [documentation][6] for more information on how to do this.
8484
8585
To build all packages, you should run the following:
8686
87-
make export-vendor
8887
make package
8988
9089
This will export all Conan recipes from this repository and create the cloe
@@ -205,7 +204,6 @@ Run `make -f Makefile.docker help` to get an impression of what is possible:
205204
206205
User configuration:
207206
CONAN_PROFILE=
208-
VENDOR_TARGET=
209207
PACKAGE_TARGET=
210208
KEEP_SOURCES=
211209
DOCKER_USER_ARGS=

docs/install.rst

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ Build Cloe Packages
6969
-------------------
7070
To build all packages, you should run the following::
7171

72-
make export-vendor
7372
make package
7473

7574
This will export all Conan recipes from this repository and create the cloe

vendor/cpp-netlib/.gitignore

-1
This file was deleted.

vendor/cpp-netlib/Makefile

-6
This file was deleted.

vendor/cpp-netlib/conanfile.py

-70
This file was deleted.

0 commit comments

Comments
 (0)