Skip to content

Commit 55645a2

Browse files
committed
tooling: Rename package-auto target to package
Since having two very similar targets is confusing and package-auto works more reliably anyway.
1 parent c621be9 commit 55645a2

10 files changed

+16
-17
lines changed

.github/workflows/build-cloe.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
runs-on: ${{ matrix.os }}
1717
strategy:
1818
matrix:
19-
os: [ ubuntu-18.04, ubuntu-20.04 ]
20-
build_type: [ RelWithDebInfo ]
21-
package_target: [ package-auto ]
19+
os: [ubuntu-18.04, ubuntu-20.04]
20+
build_type: [RelWithDebInfo]
21+
package_target: [package]
2222
env:
2323
CONAN_NON_INTERACTIVE: "yes"
2424
DEBIAN_FRONTEND: noninteractive
@@ -49,7 +49,7 @@ jobs:
4949
conan profile new --detect default &&
5050
conan profile update settings.build_type=${{ matrix.build_type }} default &&
5151
conan profile update settings.compiler.libcxx=libstdc++11 default
52-
- name: Build cloe w/ package-auto
52+
- name: Build cloe w/ package
5353
run: |
5454
make -f Makefile.all export-vendor &&
5555
make ${{ matrix.package_target }}

Makefile.all

+3-4
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,9 @@ help::
251251
echo
252252

253253
$(call make_every_target, export, "export all package recipes [conan-cache]")
254-
$(call make_cloe_target, package, "create cloe package with build policy [conan-cache]")
255254
$(call make_cloe_target, package-all, "create cloe package and all dependencies [conan-cache]")
256255
$(call make_cloe_target, package-outdated, "create cloe package if outdated [conan-cache]")
257-
$(call make_help_target, package-auto, "create select packages together with cloe [conan-cache]")
256+
$(call make_help_target, package, "create select packages together with cloe [conan-cache]")
258257

259258
help::
260259
echo
@@ -301,8 +300,8 @@ help::
301300
echo " Please see Makefile.all for more details and usage tips."
302301
echo
303302

304-
.PHONY: package-auto
305-
package-auto: export-select
303+
.PHONY: package
304+
package: export-select
306305
# Build cloe with all targets and options together.
307306
#
308307
# This is different from the package target in that it always builds the

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ See the Conan [documentation][6] for more information on how to do this.
9090
To build all packages, you should run the following:
9191
9292
make export-vendor
93-
make package-auto
93+
make package
9494
9595
This will export all Conan recipes from this repository and create the cloe
9696
package. Conan will download and build all necessary dependencies. Should

dist/docker/Dockerfile.archlinux

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ RUN --mount=type=cache,target=/ccache \
6363
# Build Cloe.
6464
COPY . /cloe
6565
ARG PROJECT_VERSION=unknown
66-
ARG PACKAGE_TARGET="package-auto smoketest-deps"
66+
ARG PACKAGE_TARGET="package smoketest-deps"
6767
RUN --mount=type=cache,target=/ccache \
6868
--mount=type=secret,target=/root/setup.sh,id=setup,mode=0400 \
6969
if [ -r /root/setup.sh ]; then . /root/setup.sh; fi && \

dist/docker/Dockerfile.bionic

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ RUN --mount=type=cache,target=/ccache \
6666
# Build Cloe.
6767
COPY . /cloe
6868
ARG PROJECT_VERSION=unknown
69-
ARG PACKAGE_TARGET="package-auto smoketest-deps"
69+
ARG PACKAGE_TARGET="package smoketest-deps"
7070
RUN --mount=type=cache,target=/ccache \
7171
--mount=type=secret,target=/root/setup.sh,id=setup,mode=0400 \
7272
if [ -r /root/setup.sh ]; then . /root/setup.sh; fi && \

dist/docker/Dockerfile.focal

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ RUN --mount=type=cache,target=/ccache \
6666
# Build Cloe.
6767
COPY . /cloe
6868
ARG PROJECT_VERSION=unknown
69-
ARG PACKAGE_TARGET="package-auto smoketest-deps"
69+
ARG PACKAGE_TARGET="package smoketest-deps"
7070
RUN --mount=type=cache,target=/ccache \
7171
--mount=type=secret,target=/root/setup.sh,id=setup,mode=0400 \
7272
if [ -r /root/setup.sh ]; then . /root/setup.sh; fi && \

dist/docker/Dockerfile.jammy

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ RUN --mount=type=cache,target=/ccache \
8686
# Build Cloe.
8787
COPY . /cloe
8888
ARG PROJECT_VERSION=unknown
89-
ARG PACKAGE_TARGET="package-auto smoketest-deps"
89+
ARG PACKAGE_TARGET="package smoketest-deps"
9090
RUN --mount=type=cache,target=/ccache \
9191
--mount=type=secret,target=/root/setup.sh,id=setup,mode=0400 \
9292
if [ -r /root/setup.sh ]; then . /root/setup.sh; fi && \

dist/docker/Dockerfile.xenial

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ RUN --mount=type=cache,target=/ccache \
118118
# Build Cloe.
119119
COPY . /cloe
120120
ARG PROJECT_VERSION=unknown
121-
ARG PACKAGE_TARGET="package-auto smoketest-deps"
121+
ARG PACKAGE_TARGET="package smoketest-deps"
122122
RUN --mount=type=cache,target=/ccache \
123123
--mount=type=secret,target=/root/setup.sh,id=setup,mode=0400 \
124124
if [ -r /root/setup.sh ]; then . /root/setup.sh; fi && \

dist/docker/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ command line when calling make:
4444
- `BUILD_TYPE`: optional, one of `Release`, `RelWithDebInfo`, `Debug`;
4545
defaults to `RelWithDebInfo`.
4646
- `VENDOR_TARGET`: optional; defaults to `export-vendor download-vendor`.
47-
- `PACKAGE_TARGET`: optional, one of `package`, `package-auto`,
48-
`package-select`, and `package-all`; defaults to `package-auto`.
47+
- `PACKAGE_TARGET`: optional, one of `package`, `package`,
48+
`package-select`, and `package-all`; defaults to `package`.
4949

5050
If you want to use a different Conan remote from the default, you need to
5151
copy `setup.sh.example` to `setup.sh` and modify the values to match your

docs/install.rst

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

7070
make export-vendor
71-
make package-auto
71+
make package
7272

7373
This will export all Conan recipes from this repository and create the cloe
7474
package. Conan will download and build all necessary dependencies. Should

0 commit comments

Comments
 (0)