This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/cleanup in repository x2goclient. from 6548d85 macbuild.sh: use out-of-source build and do not overwrite the default shipped Makefile. new 0f49b80 macbuild.sh: also also specify the top dir when defining the path to the generated appbundle and dmg file. new 73d9710 general: move Info.plist to res/ and update reference in x2goclient.pro. new 9e00790 macbuild.sh: BUILD_DIR already includes TOP_DIR, don't specify it two times. new 8122e9f macbuild.sh: fix references of resources to access files from TOP_DIR. new 96b58ef x2goclient.pro: work around a bug in qmake generating incorrect make rules for embedding the OS X app bundle Info.plist file. new 21eac48 x2goclient.pro: work around another bug in qmake and copy icon "manually". The 6 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: debian/changelog | 7 +++++++ macbuild.sh | 10 +++++----- Info.plist => res/Info.plist | 0 x2goclient.pro | 14 ++++++++++++-- 4 files changed, 24 insertions(+), 7 deletions(-) rename Info.plist => res/Info.plist (100%) -- 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 0f49b80cb8d5c0a9092b3aec70ae5725cfed3df2 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 05:54:27 2015 +0100 macbuild.sh: also also specify the top dir when defining the path to the generated appbundle and dmg file. --- debian/changelog | 2 ++ macbuild.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 11e2cba..2449d48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -184,6 +184,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - 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. + - Also also specify the top dir when defining the path to the generated + appbundle and dmg file 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 ac3cb4e..f8e369b 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -2,8 +2,8 @@ NAME="x2goclient" TOP_DIR="${PWD}" BUILD_DIR="${TOP_DIR}/build_client" -APPBUNDLE="${BUILD_DIR}/${NAME}.app" -DMGFILE="${BUILD_DIR}/${NAME}.dmg" +APPBUNDLE="${TOP_DIR}/${BUILD_DIR}/${NAME}.app" +DMGFILE="${TOP_DIR}/${BUILD_DIR}/${NAME}.dmg" PROJECT="${TOP_DIR}/${NAME}.pro" PKG_DMG="${TOP_DIR}/pkg-dmg" -- 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 73d97100a87a592d5d6452c5f60f2b0f7d6738f0 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 06:01:47 2015 +0100 general: move Info.plist to res/ and update reference in x2goclient.pro. --- debian/changelog | 1 + Info.plist => res/Info.plist | 0 x2goclient.pro | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2449d48..9f25fa8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -186,6 +186,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium Makefile in macbuild.sh. - Also also specify the top dir when defining the path to the generated appbundle and dmg file in macbuild.sh. + - Move Info.plist to res/ and update reference in x2goclient.pro. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/Info.plist b/res/Info.plist similarity index 100% rename from Info.plist rename to res/Info.plist diff --git a/x2goclient.pro b/x2goclient.pro index 9ac24a5..77ce345 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -194,7 +194,7 @@ win32-* { } QT += svg network ICON = res/img/icons/x2go-mac.icns -QMAKE_INFO_PLIST = Info.plist +QMAKE_INFO_PLIST = res/Info.plist plugin { DEFINES += CFGPLUGIN -- 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 9e007905bf971a38895d73d3aae0e19efde5f925 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 06:22:50 2015 +0100 macbuild.sh: BUILD_DIR already includes TOP_DIR, don't specify it two times. --- macbuild.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/macbuild.sh b/macbuild.sh index f8e369b..ac3cb4e 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -2,8 +2,8 @@ NAME="x2goclient" TOP_DIR="${PWD}" BUILD_DIR="${TOP_DIR}/build_client" -APPBUNDLE="${TOP_DIR}/${BUILD_DIR}/${NAME}.app" -DMGFILE="${TOP_DIR}/${BUILD_DIR}/${NAME}.dmg" +APPBUNDLE="${BUILD_DIR}/${NAME}.app" +DMGFILE="${BUILD_DIR}/${NAME}.dmg" PROJECT="${TOP_DIR}/${NAME}.pro" PKG_DMG="${TOP_DIR}/pkg-dmg" -- 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 8122e9faaa0b0c5d7ad384cb1db9659381b1746a Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 06:31:21 2015 +0100 macbuild.sh: fix references of resources to access files from TOP_DIR. --- debian/changelog | 1 + macbuild.sh | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9f25fa8..1f31910 100644 --- a/debian/changelog +++ b/debian/changelog @@ -187,6 +187,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Also also specify the top dir when defining the path to the generated appbundle and dmg file in macbuild.sh. - Move Info.plist to res/ and update reference in x2goclient.pro. + - Fix references of resources in macbuild.sh to access files from TOP_DIR. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index ac3cb4e..ffe21ff 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -69,12 +69,12 @@ ${PKG_DMG} \ --volname "x2goclient" \ --verbosity 2 \ --mkdir "/.background" \ - --copy "./res/img/png/macinstaller_background.png:/.background" \ - --copy "./macdmg.DS_Store:/.DS_Store" \ - --copy "./LICENSE" \ - --copy "./COPYING" \ + --copy "${TOP_DIR}/res/img/png/macinstaller_background.png:/.background" \ + --copy "${TOP_DIR}/macdmg.DS_Store:/.DS_Store" \ + --copy "${TOP_DIR}/LICENSE" \ + --copy "${TOP_DIR}/COPYING" \ --symlink "/Applications: " \ - --icon "./res/img/icons/x2go-mac.icns" \ + --icon "${TOP_DIR}/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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 96b58efe068460d78875da3dc5f2323f4da008e9 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 07:11:06 2015 +0100 x2goclient.pro: work around a bug in qmake generating incorrect make rules for embedding the OS X app bundle Info.plist file. --- debian/changelog | 2 ++ x2goclient.pro | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1f31910..f8faca5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -188,6 +188,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium appbundle and dmg file in macbuild.sh. - Move Info.plist to res/ and update reference in x2goclient.pro. - Fix references of resources in macbuild.sh to access files from TOP_DIR. + - Work around a bug in qmake generating incorrect make rules for embedding + the OS X app bundle Info.plist file. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/x2goclient.pro b/x2goclient.pro index 77ce345..c4b75cb 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -193,8 +193,15 @@ win32-* { CONFIG += static release } QT += svg network -ICON = res/img/icons/x2go-mac.icns -QMAKE_INFO_PLIST = res/Info.plist +ICON = $${PWD}/res/img/icons/x2go-mac.icns + +# Strictly speaking, this is a bug in qmake and we should neither need $${PWD} +# nor QMAKE_INFO_PLIST_OUT nor PRE_TARGETDEPS. +# Not defining the latter two will however lead to it being empty and no +# Info.plist file being created in the first place. Bummer. +QMAKE_INFO_PLIST = $${PWD}/res/Info.plist +QMAKE_INFO_PLIST_OUT = $${TARGET}.app/Contents/Info.plist +PRE_TARGETDEPS += $${TARGET}.app/Contents/Info.plist plugin { DEFINES += CFGPLUGIN -- 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 21eac48b08a240faf29fc1f45c40db6981845b3e Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 07:30:39 2015 +0100 x2goclient.pro: work around another bug in qmake and copy icon "manually". --- debian/changelog | 1 + x2goclient.pro | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f8faca5..b15dc3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -190,6 +190,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Fix references of resources in macbuild.sh to access files from TOP_DIR. - Work around a bug in qmake generating incorrect make rules for embedding the OS X app bundle Info.plist file. + - Work around another bug in qmake and copy icon "manually". -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/x2goclient.pro b/x2goclient.pro index c4b75cb..9d5ca8a 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -196,12 +196,15 @@ QT += svg network ICON = $${PWD}/res/img/icons/x2go-mac.icns # Strictly speaking, this is a bug in qmake and we should neither need $${PWD} -# nor QMAKE_INFO_PLIST_OUT nor PRE_TARGETDEPS. +# nor QMAKE_INFO_PLIST_OUT nor PRE_TARGETDEPS nor QMAKE_POST_LINK. # Not defining the latter two will however lead to it being empty and no -# Info.plist file being created in the first place. Bummer. +# Info.plist file being created in the first place. +# The last command takes care of actually putting the icon in place - yet +# another bug in qmake. Bummer. QMAKE_INFO_PLIST = $${PWD}/res/Info.plist QMAKE_INFO_PLIST_OUT = $${TARGET}.app/Contents/Info.plist PRE_TARGETDEPS += $${TARGET}.app/Contents/Info.plist +QMAKE_POST_LINK += /bin/cp -n $${ICON} $${OUT_PWD}/$${TARGET}.app/Contents/Resources/ plugin { DEFINES += CFGPLUGIN -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org