Skip to content

Commit

Permalink
Merge pull request #303 from SilverRainZ/bugfix/windows-meson-prefix
Browse files Browse the repository at this point in the history
Use hardcode meson prefix in window build
  • Loading branch information
SilverRainZ authored Apr 23, 2021
2 parents 7934e84 + 5355602 commit f5495f4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/pack-mingw64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ output_file=$3
gdbus=$prefix/bin/gdbus.exe

# srain
cp -vf $srain_exe $prefix/bin/srain # make DLLs of mingw64 have the highest priority
get_dll $prefix/bin/srain
cp -vf $srain_exe $prefix/bin/srain.exe # make DLLs of mingw64 have the highest priority
get_dll $prefix/bin/srain.exe
mingw64_dlls=$ret

# glib-networking
Expand All @@ -56,7 +56,7 @@ mkdir -pv $dst_etc
mkdir -pv $dst_share

# portable installation of srain
cp -rfv $srain_exe $dst_bin/srain
cp -rfv $srain_exe $dst_bin/srain.exe
cp -rfv $srain_etc $dst_etc/
cp -rfv $srain_share $dst_share/
mkdir -pv $dst_bin/logs
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,15 @@ jobs:
INSTALL_DIR=srain-$SRAIN_TAG-mingw64-install;
PACKAGE_DIR=srain-$SRAIN_TAG-mingw64;
PACKAGE_NAME=$PACKAGE_DIR.zip;
PREFIX=a/_temp/msys/msys64/mingw64; # Hardcoded meson prefix
mkdir -pv out;
mkdir -pv $INSTALL_DIR;
meson setup -Ddoc_builders=[] \
--prefix=$MINGW_PREFIX \
--datadir=$MINGW_PREFIX/share \
--sysconfdir=$MINGW_PREFIX/etc \
--buildtype=release \
builddir && \
ninja -C builddir && \
DESTDIR=$PWD/$INSTALL_DIR ninja -C builddir install && \
.github/workflows/pack-mingw64.sh $INSTALL_DIR/$MINGW_PREFIX $PACKAGE_DIR $PACKAGE_NAME && \
.github/workflows/pack-mingw64.sh $INSTALL_DIR/$PREFIX $PACKAGE_DIR $PACKAGE_NAME && \
mv $PACKAGE_NAME ./out
- name: Upload
run: /mingw64/bin/python3 .github/workflows/release-assets-upload.py

0 comments on commit f5495f4

Please sign in to comment.