Browse Source

windows build fixes for srht

copy-dylibs-in-bottle
Alexandros Theodotou 2 years ago
parent
commit
b26c5a59ba
Signed by: alex
GPG Key ID: 022EAE42313D70F3
  1. 8
      Makefile
  2. 4
      tools/gen_windows_installer.sh
  3. 2
      tools/inno/installer.iss
  4. 16
      tools/print_mxe_deps.sh

8
Makefile

@ -425,13 +425,11 @@ $(BUILD_WINDOWS_DIR)/plugins/$(MINGW_ZPLUGINS_TRIAL_PKG_TAR): arch-mingw/zplugin @@ -425,13 +425,11 @@ $(BUILD_WINDOWS_DIR)/plugins/$(MINGW_ZPLUGINS_TRIAL_PKG_TAR): arch-mingw/zplugin
# arg 1: '-trial' if trial
# arg 2: 'true' if trial, false otherwise
define make_zrythm_mxe_target
$(ARCH_MXE_64_SHARED_PREFIX)/bin/zrythm$(1).exe: FORCE
$(ARCH_MXE_64_SHARED_PREFIX)/bin/zrythm$(1).exe:
cd $(ARCH_MXE_ROOT) && \
sed -i -e 's/-Dtrial-ver=false/-Dtrial-ver=$(2)/' src/zrythm.mk && \
sed -i -e 's/-Dtrial-ver=true/-Dtrial-ver=$(2)/' src/zrythm.mk && \
sed -i -e 's/_VERSION .*/_VERSION := $(ZRYTHM_VERSION)/' src/zrythm.mk && \
sed -i -e 's,/home/ansible/Documents/git/ZPlugins,$(MXE_ZPLUGINS_CLONE_PATH),' src/zplugins.mk && \
sed -i -e 's,/home/ansible/Documents/non-git/gtk+-3.24.18,$(MXE_GTK3_CLONE_PATH),' src/gtk3.mk && \
./bootstrap && \
make update-checksum-zrythm && \
make $(MXE_FLAGS) zrythm
@ -456,7 +454,7 @@ $(eval $(call make_zrythm_mxe_target,-trial,true)) @@ -456,7 +454,7 @@ $(eval $(call make_zrythm_mxe_target,-trial,true))
# arg 3: AppName
# arg 4: `-trial` if trial
define make_windows_installer_target
$(BUILD_DIR)/$(2): $(ARCH_MXE_64_SHARED_PREFIX)/bin/zrythm$(4).exe $(ARCH_MXE_64_SHARED_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.dll
$(BUILD_DIR)/$(2): $(ARCH_MXE_64_SHARED_PREFIX)/bin/zrythm$(4).exe $(ARCH_MXE_64_SHARED_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.dll $(BUILD_DIR)/$(ZRYTHM_PKG_TARBALL) $(BUILD_DIR)/$(RCEDIT64_EXE)
# create sources distribution
- rm -rf $(BUILD_WINDOWS_DIR)/installer
mkdir -p $(BUILD_WINDOWS_DIR)/installer/dist/plugins$(4)
@ -491,7 +489,7 @@ $(BUILD_DIR)/$(2): $(ARCH_MXE_64_SHARED_PREFIX)/bin/zrythm$(4).exe $(ARCH_MXE_64 @@ -491,7 +489,7 @@ $(BUILD_DIR)/$(2): $(ARCH_MXE_64_SHARED_PREFIX)/bin/zrythm$(4).exe $(ARCH_MXE_64
tools/gen_windows_installer.sh $(ARCH_MXE_64_SHARED_PREFIX) \
$(ZRYTHM_PKG_VERSION) $(BUILD_WINDOWS_DIR)/installer \
$(shell pwd)/tools/inno/installer.iss "$(3)" \
plugins$(4) $(4)
plugins$(4) $(4) $(BREEZE_DARK_PATH)
cp "$(BUILD_WINDOWS_DIR)/installer/dist/Output/$(3) $(ZRYTHM_PKG_VERSION).exe" $(BUILD_DIR)/$(2)
endef

4
tools/gen_windows_installer.sh

@ -37,6 +37,7 @@ MINGW_PREFIX=$1 @@ -37,6 +37,7 @@ MINGW_PREFIX=$1
APP_NAME=$5
PLUGINS_DIR=$6
TRIAL=$7
BREEZE_DARK_PATH=$8
DIST_DIR=$BUILD_DIR/dist # root of the distribution
DIST_BINDIR=$DIST_DIR/bin
DIST_LIBDIR=$DIST_DIR/lib
@ -151,7 +152,7 @@ cp -R $MINGW_PREFIX/etc/fonts $DIST_ETCDIR @@ -151,7 +152,7 @@ cp -R $MINGW_PREFIX/etc/fonts $DIST_ETCDIR
echo "packaging breeze icons"
mkdir -p "$DIST_SHAREDIR/icons"
# the icons are preinstalled here
cp -R "/home/ansible/icons/breeze-dark" "$DIST_SHAREDIR/icons"/
cp -R "$BREEZE_DARK_PATH" "$DIST_SHAREDIR/icons"/
#cp -R "$MINGW_PREFIX/share/icons/Adwaita" "$DIST_SHAREDIR/icons"/
#echo "packaging breeze icons"
#cp -R "$MINGW_PREFIX/bin/data/icons/breeze-dark" "$DIST_SHAREDIR/icons/"
@ -224,5 +225,6 @@ cp "$INNO_ISS" "$DIST_DIR"/ @@ -224,5 +225,6 @@ cp "$INNO_ISS" "$DIST_DIR"/
cd $DIST_DIR
~/.wine/drive_c/Program\ Files\ \(x86\)/Inno\ Setup\ 6/ISCC.exe \
"/DAppName=$APP_NAME" "/DAppVersion=$ZRYTHM_VERSION" \
"/DAppInfoVersion=${ZRYTHM_VERSION:0:7}" \
"/DPluginsDir=$PLUGINS_DIR" \
installer.iss

2
tools/inno/installer.iss

@ -20,7 +20,7 @@ DefaultDirName={autopf}\{#AppName} @@ -20,7 +20,7 @@ DefaultDirName={autopf}\{#AppName}
DefaultGroupName={#AppName}
UninstallDisplayIcon={app}\bin\zrythm.exe
LicenseFile={#file AddBackslash(SourcePath) + "COPYING"}
VersionInfoVersion={#AppVersion}
VersionInfoVersion={#AppInfoVersion}
Compression=lzma2
SolidCompression=yes
ArchitecturesAllowed=x64

16
tools/print_mxe_deps.sh

@ -20,14 +20,16 @@ @@ -20,14 +20,16 @@
set -e
# $1 MXE root
# $2 dest file
mxe_root=$1
dest_file=$2
MXE_ROOT=$1
DEST_FILE=$2
rm -rf $dest_file
rm -rf $DEST_FILE
tmp_file=/tmp/zrythm-deps.txt
for dep in $(make -C $MXE_ROOT show-upstream-deps-zrythm); do
echo "$dep $(make -C $MXE_ROOT print-ver-$dep)" >> $DEST_FILE
deps=$(make -C $mxe_root -s show-upstream-deps-zrythm)
for dep in $deps; do
echo "$dep $(make -C $mxe_root -s print-ver-$dep)" >> $tmp_file
done
mv $tmp_file $dest_file

Loading…
Cancel
Save