[X2Go-Commits] [x2goclient] 13/15: macbuild.sh: add support for copying resource files.

git-admin at x2go.org git-admin at x2go.org
Thu May 12 22:59:33 CEST 2016


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit c6d2d85e40fbd943740e151d119d37eb71595939
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat May 7 22:38:37 2016 +0200

    macbuild.sh: add support for copying resource files.
    
    Currently only used for startup.wav.
---
 debian/changelog |    2 ++
 macbuild.sh      |    8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b1d8515..6e08c1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -296,6 +296,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
       daemon in debug mode.
     - src/pulsemanager.cpp: don't time out while trying to start PA or paplay.
       "Handle" errors by printing out debug messages.
+    - macbuild.sh: add support for copying resource files. Currently only used
+      for startup.wav.
 
   [ Mike DePaulo ]
   * New upstream release (4.0.5.2):
diff --git a/macbuild.sh b/macbuild.sh
index d5aadfe..f57d43c 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -158,6 +158,7 @@ BUILD_DIR="${TOP_DIR}/client_build"
 APPBUNDLE="${BUILD_DIR}/${NAME}.app"
 EXE_DIR="${APPBUNDLE}/Contents/exe/"
 FRAMEWORKS_DIR="${APPBUNDLE}/Contents/Frameworks/"
+RESOURCES_DIR="${APPBUNDLE}/Contents/Resources/"
 DMGFILE="${BUILD_DIR}/${NAME}.dmg"
 PROJECT="${TOP_DIR}/${NAME}.pro"
 PKG_DMG="${TOP_DIR}/pkg-dmg"
@@ -179,6 +180,7 @@ PULSEAUDIO_BINARIES=( "pulseaudio" "esdcompat" "pacat" "pacmd"      "pactl"
 PULSEAUDIO_LIBRARIES=( "libpulse-simple.0.dylib"
                        "pulse-8.0"
                        "pulseaudio" )
+RESOURCE_FILES=( "audio/startup.wav" )
 
 typeset -a special_files_regex
 special_files_regex+=( "pulseaudio/libpulsecommon-[0-9]\.[0-9]\.dylib"
@@ -328,6 +330,12 @@ mkdir -p "${FRAMEWORKS_DIR}/"
 phase "Copying nxproxy"
 cp -av "${NXPROXY}" "${EXE_DIR}/"
 
+phase "Copying misc resources"
+typeset cur_res_file
+for cur_res_file in ${RESOURCE_FILES[@]}; do
+  cp -av "res/${cur_res_file}" "${RESOURCES_DIR}/"
+done
+
 phase "Copying PulseAudio"
 for cur_binary in ${PULSEAUDIO_BINARIES_FULL[@]}; do
   cp -av "${cur_binary}" "${EXE_DIR}/"

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list