Skip to content

Commit

Permalink
change executable name
Browse files Browse the repository at this point in the history
  • Loading branch information
aler9 committed Aug 14, 2024
1 parent 0677d2d commit 7d6c973
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*.o
text_font.*
rpicc
rpicc_*
mtxrpicam
mtxrpicam_*
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*.o
text_font.*
rpicc
rpicc_*
mtxrpicam
mtxrpicam_*
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
all: rpicc
all: mtxrpicam

#################################################
# text font
Expand All @@ -17,7 +17,7 @@ $(TEXT_FONT_TARGET): text_font.ttf
xxd --include $< > $@

#################################################
# rpicc
# mtxrpicam

CFLAGS = \
-Ofast \
Expand Down Expand Up @@ -64,5 +64,5 @@ DEPENDENCIES = \
%.o: %.cpp $(DEPENDENCIES)
$(CXX) $(CXXFLAGS) -c $< -o $@

rpicc: $(OBJS)
mtxrpicam: $(OBJS)
$(CXX) $^ $(LDFLAGS) -o $@
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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`
8 changes: 4 additions & 4 deletions utils.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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"

0 comments on commit 7d6c973

Please sign in to comment.