brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use unzipfx approach for Windows zip executables

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-12-02 09:22:40 +00:00
parent 0c00446480
commit ebb4091a60
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
4 changed files with 17 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.github/workflows/build.yml vendored
View file

@ -929,12 +929,9 @@ jobs:
- name: Pack binaries - name: Pack binaries
run: | run: |
pushd bin pushd bin
mkdir CardinalPortable zip -r -9 ../${{ github.event.repository.name }}-win32-${{ github.event.pull_request.number || env.SHA8 }}.zip $(ls | grep -e lv2 -e vst -e clap)
mv CardinalNative.exe CardinalPortable/
ln -s ../Cardinal.clap/resources CardinalPortable/
zip -r -9 ../${{ github.event.repository.name }}-win32-${{ github.event.pull_request.number || env.SHA8 }}.zip $(ls | grep -e lv2 -e vst -e clap -e CardinalPortable)
popd popd
zip -u -9 ${{ github.event.repository.name }}-win32-${{ github.event.pull_request.number || env.SHA8 }}.zip LICENSE README.md docs/*.* zip -u -9 ${{ github.event.repository.name }}-win32-${{ github.event.pull_request.number || env.SHA8 }}.zip LICENSE README.md docs/*.* CardinalJACK.exe CardinalNative.exe
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
with: with:
name: ${{ github.event.repository.name }}-win32-${{ github.event.pull_request.number || env.SHA8 }} name: ${{ github.event.repository.name }}-win32-${{ github.event.pull_request.number || env.SHA8 }}
@ -1021,12 +1018,9 @@ jobs:
- name: Pack binaries - name: Pack binaries
run: | run: |
pushd bin pushd bin
mkdir CardinalPortable zip -r -9 ../${{ github.event.repository.name }}-win64-${{ github.event.pull_request.number || env.SHA8 }}.zip $(ls | grep -e lv2 -e vst -e clap)
mv CardinalNative.exe CardinalPortable/
ln -s ../Cardinal.clap/resources CardinalPortable/
zip -r -9 ../${{ github.event.repository.name }}-win64-${{ github.event.pull_request.number || env.SHA8 }}.zip $(ls | grep -e lv2 -e vst -e clap -e CardinalPortable)
popd popd
zip -u -9 ${{ github.event.repository.name }}-win64-${{ github.event.pull_request.number || env.SHA8 }}.zip LICENSE README.md docs/*.* zip -u -9 ${{ github.event.repository.name }}-win64-${{ github.event.pull_request.number || env.SHA8 }}.zip LICENSE README.md docs/*.* CardinalJACK.exe CardinalNative.exe
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
with: with:
name: ${{ github.event.repository.name }}-win64-${{ github.event.pull_request.number || env.SHA8 }} name: ${{ github.event.repository.name }}-win64-${{ github.event.pull_request.number || env.SHA8 }}

22
Makefile
View file

@ -226,23 +226,23 @@ endif
# Packaging standalone for CI # Packaging standalone for CI
unzipfx: deps/unzipfx/unzipfx2cat$(APP_EXT) CardinalJACK.zip CardinalNative.zip unzipfx: deps/unzipfx/unzipfx2cat$(APP_EXT) CardinalJACK.zip CardinalNative.zip
cat deps/unzipfx/unzipfx2cat$(APP_EXT) CardinalJACK.zip > CardinalJACK cat deps/unzipfx/unzipfx2cat$(APP_EXT) CardinalJACK.zip > CardinalJACK$(APP_EXT)
cat deps/unzipfx/unzipfx2cat$(APP_EXT) CardinalNative.zip > CardinalNative cat deps/unzipfx/unzipfx2cat$(APP_EXT) CardinalNative.zip > CardinalNative$(APP_EXT)
chmod +x CardinalJACK CardinalNative chmod +x CardinalJACK$(APP_EXT) CardinalNative$(APP_EXT)
CardinalJACK.zip: bin/Cardinal bin/CardinalFX.lv2/resources CardinalJACK.zip: bin/Cardinal$(APP_EXT) bin/CardinalFX.lv2/resources
mkdir -p build/unzipfx-jack mkdir -p build/unzipfx-jack
ln -sf ../../bin/Cardinal build/unzipfx-jack/Cardinal ln -sf ../../bin/Cardinal$(APP_EXT) build/unzipfx-jack/Cardinal$(APP_EXT)
ln -s ../../bin/CardinalFX.lv2/resources build/unzipfx-jack/resources ln -sf ../../bin/CardinalFX.lv2/resources build/unzipfx-jack/resources
cd build/unzipfx-jack && \ cd build/unzipfx-jack && \
zip -r -9 ../../$@ Cardinal resources zip -r -9 ../../$@ Cardinal$(APP_EXT) resources
CardinalNative.zip: bin/CardinalNative bin/CardinalFX.lv2/resources CardinalNative.zip: bin/CardinalNative$(APP_EXT) bin/CardinalFX.lv2/resources
mkdir -p build/unzipfx-native mkdir -p build/unzipfx-native
ln -sf ../../bin/CardinalNative build/unzipfx-native/Cardinal ln -sf ../../bin/CardinalNative$(APP_EXT) build/unzipfx-native/Cardinal$(APP_EXT)
ln -s ../../bin/CardinalFX.lv2/resources build/unzipfx-native/resources ln -sf ../../bin/CardinalFX.lv2/resources build/unzipfx-native/resources
cd build/unzipfx-native && \ cd build/unzipfx-native && \
zip -r -9 ../../$@ Cardinal resources zip -r -9 ../../$@ Cardinal$(APP_EXT) resources
deps/unzipfx/unzipfx2cat: deps/unzipfx/unzipfx2cat:
make -C deps/unzipfx -f Makefile.linux make -C deps/unzipfx -f Makefile.linux

2
deps/unzipfx/Makefile.win32 vendored
View file

@ -21,7 +21,7 @@ all: unzipfx2cat.exe
unzipfx2cat.exe: $(OBJ) unzipfx2cat.exe: $(OBJ)
$(CC) $^ $(LINK_FLAGS) -o $@ $(CC) $^ $(LINK_FLAGS) -o $@
icon.o: ../../../resources/ico/carla.rc icon.o: ../../utils/distrho.rc
$(WINDRES) -i $< -o $@ -O coff $(WINDRES) -i $< -o $@ -O coff
clean: clean:

1
utils/distrho.rc
View file

@ -1 +1,2 @@
id ICON "distrho.ico"
401 ICON "distrho.ico" 401 ICON "distrho.ico"