This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/cleanup in repository x2goclient. from cb74623 general: move txt/ to res/text/ and update references in: new ff5c53c Info.plist: whitespace fix. new 343073a macbuild.sh: use more quoting and curly braces for referencing variables. new 25e0844 macbuild.sh: define TOP_DIR variable -- set to $PWD. new de90014 macbuild.sh: define the new variables $SDK and $MACOSX_DEPLOYMENT_TARGET which can also be (pre-)set through the environment. new 6189c27 macbuild.sh: fix up previously overlooked variables deserving curly braces and quotes. new 2ebfb1a macbuild.sh: specify -spec macx-g++ when using qmake. new d20c672 macbuild.sh: directly reference project file for qmake. new 6548d85 macbuild.sh: use out-of-source build and do not overwrite the default shipped Makefile. The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: Info.plist | 2 +- debian/changelog | 12 +++++++++++ macbuild.sh | 62 ++++++++++++++++++++++++++++++++---------------------- 3 files changed, 50 insertions(+), 26 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit ff5c53c59e67372405dede6daa165f39b95f77ef Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 05:10:55 2015 +0100 Info.plist: whitespace fix. --- Info.plist | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Info.plist b/Info.plist index 69e0cb8..3c4bc90 100644 --- a/Info.plist +++ b/Info.plist @@ -6,7 +6,7 @@ <string>x2go-mac.icns</string> <key>CFBundlePackageType</key> <string>APPL</string> - <key>CFBundleGetInfoString</key> + <key>CFBundleGetInfoString</key> <string>Created by Qt/QMake</string> <key>CFBundleSignature</key> <string>????</string> diff --git a/debian/changelog b/debian/changelog index 7bdfa98..dd7a26a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -172,6 +172,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium + Makefile + debian/rules + x2goclient.spec + - Whitespace fix in Info.plist. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 343073a1ffae1d8e494e1ca35e12d9fb118c3d92 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 05:16:32 2015 +0100 macbuild.sh: use more quoting and curly braces for referencing variables. --- debian/changelog | 2 ++ macbuild.sh | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index dd7a26a..6838152 100644 --- a/debian/changelog +++ b/debian/changelog @@ -173,6 +173,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium + debian/rules + x2goclient.spec - Whitespace fix in Info.plist. + - Use more quoting and curly braces for referencing variables in + macbuild.sh. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index bda1866..729ec13 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -1,15 +1,15 @@ #!/bin/sh -NAME=x2goclient -APPBUNDLE=./$NAME.app -DMGFILE=./$NAME.dmg -PROJECT=./$NAME.pro -PKG_DMG=./pkg-dmg +NAME="x2goclient" +APPBUNDLE="./${NAME}.app" +DMGFILE="./${NAME}.dmg" +PROJECT="./${NAME}.pro" +PKG_DMG="./pkg-dmg" -NXPROXY=`which nxproxy` -LIBXCOMP=libXcomp.3.dylib -LIBPNG=libpng15.15.dylib -LIBJPEG=libjpeg.9.dylib -LIBZ=libz.1.dylib +NXPROXY="$(which nxproxy)" +LIBXCOMP="libXcomp.3.dylib" +LIBPNG="libpng15.15.dylib" +LIBJPEG="libjpeg.9.dylib" +LIBZ="libz.1.dylib" set -e @@ -39,23 +39,23 @@ phase "Running make" make -j2 phase "Copying nxproxy" -mkdir -p "$APPBUNDLE/Contents/exe" -cp "$NXPROXY" "$APPBUNDLE/Contents/exe" +mkdir -p "${APPBUNDLE}/Contents/exe" +cp "${NXPROXY}" "${APPBUNDLE}/Contents/exe" dylibbundler \ - --fix-file "$APPBUNDLE/Contents/exe/nxproxy" \ + --fix-file "${APPBUNDLE}/Contents/exe/nxproxy" \ --bundle-deps \ - --dest-dir "$APPBUNDLE/Contents/Frameworks" \ + --dest-dir "${APPBUNDLE}/Contents/Frameworks" \ --install-path "@executable_path/../Frameworks/" \ --create-dir phase "Bundling up using macdeployqt" -macdeployqt "$APPBUNDLE" -verbose=2 +macdeployqt "${APPBUNDLE}" -verbose=2 phase "Creating DMG" -$PKG_DMG \ - --source "$APPBUNDLE" \ +${PKG_DMG} \ + --source "${APPBUNDLE}" \ --sourcefile \ - --target "$DMGFILE" \ + --target "${DMGFILE}" \ --volname "x2goclient" \ --verbosity 2 \ --mkdir "/.background" \ -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 25e0844c16439bb83fac03280fdac3e77b2c36c6 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 05:35:02 2015 +0100 macbuild.sh: define TOP_DIR variable -- set to $PWD. --- debian/changelog | 1 + macbuild.sh | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6838152..0c49152 100644 --- a/debian/changelog +++ b/debian/changelog @@ -175,6 +175,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Whitespace fix in Info.plist. - Use more quoting and curly braces for referencing variables in macbuild.sh. + - Define TOP_DIR variable in macbuild.sh -- set to $PWD. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index 729ec13..fafce18 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -1,9 +1,11 @@ #!/bin/sh NAME="x2goclient" -APPBUNDLE="./${NAME}.app" -DMGFILE="./${NAME}.dmg" -PROJECT="./${NAME}.pro" -PKG_DMG="./pkg-dmg" +TOP_DIR="${PWD}" +BUILD_DIR="${TOP_DIR}/build_client" +APPBUNDLE="${BUILD_DIR}/${NAME}.app" +DMGFILE="${BUILD_DIR}/${NAME}.dmg" +PROJECT="${TOP_DIR}/${NAME}.pro" +PKG_DMG="${TOP_DIR}/pkg-dmg" NXPROXY="$(which nxproxy)" LIBXCOMP="libXcomp.3.dylib" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit de900145bbd76ac923d274aa29762655aa09b09d Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 05:37:55 2015 +0100 macbuild.sh: define the new variables $SDK and $MACOSX_DEPLOYMENT_TARGET which can also be (pre-)set through the environment. Default to the 10.7 SDK and deployment target. Use the variables when calling qmake. --- debian/changelog | 4 ++++ macbuild.sh | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0c49152..75af266 100644 --- a/debian/changelog +++ b/debian/changelog @@ -176,6 +176,10 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Use more quoting and curly braces for referencing variables in macbuild.sh. - Define TOP_DIR variable in macbuild.sh -- set to $PWD. + - Define the new variables $SDK and $MACOSX_DEPLOYMENT_TARGET in + macbuild.sh which can also be (pre-)set through the environment. Default + to the 10.7 SDK and deployment target. Use the variables when calling + qmake. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index fafce18..30944ff 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -13,6 +13,9 @@ LIBPNG="libpng15.15.dylib" LIBJPEG="libjpeg.9.dylib" LIBZ="libz.1.dylib" +: SDK="${SDK:-"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"}" +: MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-"10.7"}" + set -e function phase() { @@ -34,8 +37,8 @@ lrelease "$PROJECT" phase "Running qmake" qmake -config release \ CONFIG+=x86_64 \ - QMAKE_MAC_SDK=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk \ - QMAKE_MACOSX_DEPLOYMENT_TARGET=10.7 + QMAKE_MAC_SDK="${SDK}" \ + QMAKE_MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" phase "Running make" make -j2 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 6189c2770d62e3b7f3be8518bb839a7b790408b5 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 05:40:58 2015 +0100 macbuild.sh: fix up previously overlooked variables deserving curly braces and quotes. --- macbuild.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/macbuild.sh b/macbuild.sh index 30944ff..2d583c2 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -28,15 +28,15 @@ function phase() { phase "Cleaning" make clean -rm -rf "$APPBUNDLE" -rm -rf "$DMGFILE" +rm -rf "${APPBUNDLE}" +rm -rf "${DMGFILE}" phase "Running lrelease" -lrelease "$PROJECT" +lrelease "${PROJECT}" phase "Running qmake" qmake -config release \ - CONFIG+=x86_64 \ + CONFIG+="x86_64" \ QMAKE_MAC_SDK="${SDK}" \ QMAKE_MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 2ebfb1ae195da7014231f5bfca541ddb4fbd86e4 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 05:42:43 2015 +0100 macbuild.sh: specify -spec macx-g++ when using qmake. --- debian/changelog | 1 + macbuild.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 75af266..bb41b4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -180,6 +180,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium macbuild.sh which can also be (pre-)set through the environment. Default to the 10.7 SDK and deployment target. Use the variables when calling qmake. + - Specify -spec macx-g++ when using qmake in macbuild.sh. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index 2d583c2..cf29d4f 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -35,7 +35,7 @@ phase "Running lrelease" lrelease "${PROJECT}" phase "Running qmake" -qmake -config release \ +qmake -config release -spec macx-g++ \ CONFIG+="x86_64" \ QMAKE_MAC_SDK="${SDK}" \ QMAKE_MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit d20c672a2d5053a97f047b9fe3fe7c2a7c5c5a0a Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 05:49:21 2015 +0100 macbuild.sh: directly reference project file for qmake. --- debian/changelog | 1 + macbuild.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bb41b4f..f108947 100644 --- a/debian/changelog +++ b/debian/changelog @@ -181,6 +181,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium to the 10.7 SDK and deployment target. Use the variables when calling qmake. - Specify -spec macx-g++ when using qmake in macbuild.sh. + - Directly reference project file for qmake in macbuild.sh. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index cf29d4f..e5c4394 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -35,7 +35,7 @@ phase "Running lrelease" lrelease "${PROJECT}" phase "Running qmake" -qmake -config release -spec macx-g++ \ +qmake -config release -spec macx-g++ "${PROJECT}" \ CONFIG+="x86_64" \ QMAKE_MAC_SDK="${SDK}" \ QMAKE_MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 6548d85e80c2fc539ab712fe75c89394061efcf6 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 05:50:41 2015 +0100 macbuild.sh: use out-of-source build and do not overwrite the default shipped Makefile. --- debian/changelog | 2 ++ macbuild.sh | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index f108947..11e2cba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -182,6 +182,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium qmake. - Specify -spec macx-g++ when using qmake in macbuild.sh. - Directly reference project file for qmake in macbuild.sh. + - Use out-of-source build and do not overwrite the default shipped + Makefile in macbuild.sh. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index e5c4394..ac3cb4e 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -31,6 +31,11 @@ make clean rm -rf "${APPBUNDLE}" rm -rf "${DMGFILE}" +[ -e "${BUILD_DIR}" ] && rm -rf "${BUILD_DIR}" + +mkdir "${BUILD_DIR}" +pushd "${BUILD_DIR}" + phase "Running lrelease" lrelease "${PROJECT}" @@ -71,3 +76,5 @@ ${PKG_DMG} \ --symlink "/Applications: " \ --icon "./res/img/icons/x2go-mac.icns" \ --format "UDBZ" + +popd -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org