This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 3502beb1caa5cd92aaea4e13fd4fb45596615be3 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 3 16:34:22 2017 +0100 macbuild.sh: also bundle xauth binary as nxauth binary. --- debian/changelog | 1 + macbuild.sh | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6ef9dba..6e39042 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * New upstream version (4.1.1.1): - src/pulsemanager.cpp: print out PA --version output as a debug message. + - macbuild.sh: also bundle xauth binary as nxauth binary. -- X2Go Release Manager <git-admin@x2go.org> Sun, 29 Oct 2017 11:44:44 +0100 diff --git a/macbuild.sh b/macbuild.sh index a495e0c..2204bb1 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -32,7 +32,7 @@ usage() { printf "\tDEBUG\t\t\t\tenables or disables debug builds [boolean]\n\t\t\t\t\tdefault: disabled\n" printf "\tBUNDLE\t\t\t\tenables or disables library bundling and the creation of a .dmg installer [boolean]\n\t\t\t\t\tdefault: enabled\n" printf "\tUNIVERSAL\t\t\tenables or disables x86 support. x86_64 support is always enabled [boolean]\n\t\t\t\t\tdefault: enabled\n" - printf "\tMACPORTS_PREFIX\t\t\tsets the (MacPorts) prefix used to detect PulseAudio and nxproxy binaries\n\t\t\t\t\tdefault: /opt/local/\n" + printf "\tMACPORTS_PREFIX\t\t\tsets the (MacPorts) prefix used to detect PulseAudio, nxproxy and xauth binaries [string]\n\t\t\t\t\tdefault: /opt/local/\n" printf "\n" printf "Boolean values help:\n" printf "\ta value of ${NO_VAL} will be treated as false\n" @@ -175,6 +175,7 @@ else fi NXPROXY="nxproxy" +NXAUTH="xauth" PULSEAUDIO_BINARIES=( "pulseaudio" "esdcompat" "pacat" "pacmd" "pactl" "pamon" "paplay" "parec" "parecord" "pasuspender" ) PULSEAUDIO_LIBRARIES=( "libpulse-simple.0.dylib" @@ -232,8 +233,10 @@ fi # Gather files. NXPROXY="$(lazy_canonical_path "${MACPORTS_PREFIX}/bin/${NXPROXY}")" +NXAUTH="$(lazy_canonical_path "${MACPORTS_PREFIX}/bin/${NXAUTH}")" [ -x "${NXPROXY}" ] || dependency_error "nxproxy" "nxproxy" "binary" +[ -x "${NXAUTH}" ] || dependency_error "xauth" "xauth" "binary" typeset -i i typeset -i fail @@ -331,6 +334,9 @@ mkdir -p "${FRAMEWORKS_DIR}/" phase "Copying nxproxy" cp -av "${NXPROXY}" "${EXE_DIR}/" +phase "Copying (n)xauth" +cp -av "${NXAUTH}" "${EXE_DIR}/nxauth" + phase "Copying misc resources" typeset cur_res_file for cur_res_file in ${RESOURCE_FILES[@]}; do @@ -363,6 +369,14 @@ if [ "${BUNDLE}" = "1" ]; then --install-path "@executable_path/../Frameworks/" \ --create-dir + phase "Bundling (n)xauth" + dylibbundler \ + --fix-file "${EXE_DIR}/nxauth" \ + --bundle-deps \ + --dest-dir "${FRAMEWORKS_DIR}/" \ + --install-path "@executable_path/../Frameworks/" \ + --create-dir + phase "Bundling PulseAudio" typeset cur_binary_name="" for cur_binary in ${PULSEAUDIO_BINARIES_FULL[@]}; do -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git