From 7d6c9734d6c4ce25e86658451ccdc5636a69b785 Mon Sep 17 00:00:00 2001 From: aler9 <46489434+aler9@users.noreply.github.com> Date: Wed, 14 Aug 2024 23:13:24 +0200 Subject: [PATCH] change executable name --- .dockerignore | 4 ++-- .github/workflows/release.yml | 12 ++++++------ .gitignore | 4 ++-- Makefile | 6 +++--- README.md | 4 ++-- utils.mk | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.dockerignore b/.dockerignore index 569b66b..3b02d14 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,4 @@ *.o text_font.* -rpicc -rpicc_* +mtxrpicam +mtxrpicam_* diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3bbbc5a..988a42e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,8 +16,8 @@ jobs: - uses: actions/upload-artifact@v3 with: - path: rpicc_32 - name: rpicc_32 + path: mtxrpicam_32 + name: mtxrpicam_32 build_64: runs-on: ubuntu-22.04 @@ -29,8 +29,8 @@ jobs: - uses: actions/upload-artifact@v3 with: - path: rpicc_64 - name: rpicc_64 + path: mtxrpicam_64 + name: mtxrpicam_64 github_release: needs: @@ -41,12 +41,12 @@ jobs: steps: - uses: actions/download-artifact@v3 with: - name: rpicc_32 + name: mtxrpicam_32 path: binaries/ - uses: actions/download-artifact@v3 with: - name: rpicc_64 + name: mtxrpicam_64 path: binaries/ - uses: actions/github-script@v6 diff --git a/.gitignore b/.gitignore index 569b66b..3b02d14 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ *.o text_font.* -rpicc -rpicc_* +mtxrpicam +mtxrpicam_* diff --git a/Makefile b/Makefile index 94dc16f..3346bfc 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all: rpicc +all: mtxrpicam ################################################# # text font @@ -17,7 +17,7 @@ $(TEXT_FONT_TARGET): text_font.ttf xxd --include $< > $@ ################################################# -# rpicc +# mtxrpicam CFLAGS = \ -Ofast \ @@ -64,5 +64,5 @@ DEPENDENCIES = \ %.o: %.cpp $(DEPENDENCIES) $(CXX) $(CXXFLAGS) -c $< -o $@ -rpicc: $(OBJS) +mtxrpicam: $(OBJS) $(CXX) $^ $(LDFLAGS) -o $@ diff --git a/README.md b/README.md index 4b9343e..497fcca 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ This is embedded into all MediaMTX releases and shouldn't normally be downloaded make -j$(nproc) ``` -4. The resulting executable will be available in `rpicc` +4. The resulting executable will be available in `mtxrpicam` ## Cross-compile @@ -43,4 +43,4 @@ This is embedded into all MediaMTX releases and shouldn't normally be downloaded make -f utils.mk build ``` -4. The resulting executables will be available in `rpicc_32` and `rpicc_64` +4. The resulting executables will be available in `mtxrpicam_32` and `mtxrpicam_64` diff --git a/utils.mk b/utils.mk index 5738bf0..8bfde15 100644 --- a/utils.mk +++ b/utils.mk @@ -29,7 +29,7 @@ WORKDIR /s COPY . . RUN make -j$$(nproc) FROM $(ALPINE_IMAGE) -COPY --from=build /s/rpicc /s/rpicc +COPY --from=build /s/mtxrpicam /s/mtxrpicam endef export DOCKERFILE_BUILD32 @@ -48,14 +48,14 @@ WORKDIR /s COPY . . RUN make -j$$(nproc) FROM $(ALPINE_IMAGE) -COPY --from=build /s/rpicc /s/rpicc +COPY --from=build /s/mtxrpicam /s/mtxrpicam endef export DOCKERFILE_BUILD64 build32: echo "$$DOCKERFILE_BUILD32" | docker build . -f - -t build32 - docker run --rm -v $(PWD):/o build32 sh -c "mv /s/rpicc /o/rpicc_32" + docker run --rm -v $(PWD):/o build32 sh -c "mv /s/mtxrpicam /o/mtxrpicam_32" build64: echo "$$DOCKERFILE_BUILD64" | docker build . -f - -t build64 - docker run --rm -v $(PWD):/o build64 sh -c "mv /s/rpicc /o/rpicc_64" + docker run --rm -v $(PWD):/o build64 sh -c "mv /s/mtxrpicam /o/mtxrpicam_64"