From 72d81750322b8e8221e76f750e90670340bf4a27 Mon Sep 17 00:00:00 2001 From: Jonathan Kawohl Date: Wed, 19 Oct 2016 11:12:11 +0200 Subject: [PATCH 1/7] updated link for documentation and added more info to osx build --- README.md | 2 +- doc/building.rst | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index cd568062c..f66160698 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ https://github.com/owncloud/client. ## Building the source code -[Building the Client](http://doc.owncloud.org/desktop/2.0/building.html) +[Building the Client](http://doc.owncloud.org/desktop/2.2/building.html) in the ownCloud Desktop Client manual. ## Maintainers and Contributors diff --git a/doc/building.rst b/doc/building.rst index 96059e036..c8bfc374c 100644 --- a/doc/building.rst +++ b/doc/building.rst @@ -66,11 +66,18 @@ recipes. To set up your build environment for development using HomeBrew_: -1. Add the ownCloud repository using the following command:: +1. Install Xcode +2. Install Xcode command line tools:: + xcode-select --install + +3. Install homebrew:: + /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" + +4. Add the ownCloud repository using the following command:: brew tap owncloud/owncloud -2. Install any missing dependencies:: +5. Install any missing dependencies:: brew install $(brew deps owncloud-client) @@ -234,6 +241,7 @@ To build the most up-to-date version of the client: .. note:: On Mac OS X, you need to specify ``-DCMAKE_INSTALL_PREFIX=target``, where ``target`` is a private location, i.e. in parallel to your build dir by specifying ``../install``. + .. note:: Example:: cmake -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 -DCMAKE_INSTALL_PREFIX=/Users/path/to/client/install/ -D_OPENSSL_LIBDIR=/usr/local/opt/openssl/lib/ -D_OPENSSL_INCLUDEDIR=/usr/local/opt/openssl/include/ -D_OPENSSL_VERSION=1.0.2a -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include/ -DNO_SHIBBOLETH=1 4. Call ``make``. From 092c935422cf47a204b01895f39201cc5cf92d6d Mon Sep 17 00:00:00 2001 From: Jonathan Kawohl Date: Thu, 20 Oct 2016 13:05:56 +0200 Subject: [PATCH 2/7] Correcting for PR comments --- doc/building.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/building.rst b/doc/building.rst index c8bfc374c..91d723941 100644 --- a/doc/building.rst +++ b/doc/building.rst @@ -241,6 +241,9 @@ To build the most up-to-date version of the client: .. note:: On Mac OS X, you need to specify ``-DCMAKE_INSTALL_PREFIX=target``, where ``target`` is a private location, i.e. in parallel to your build dir by specifying ``../install``. + + ..note:: qtkeychain must be compiled with the same prefix e.g CMAKE_INSTALL_PREFIX=/Users/path/to/client/install/ + .. note:: Example:: cmake -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 -DCMAKE_INSTALL_PREFIX=/Users/path/to/client/install/ -D_OPENSSL_LIBDIR=/usr/local/opt/openssl/lib/ -D_OPENSSL_INCLUDEDIR=/usr/local/opt/openssl/include/ -D_OPENSSL_VERSION=1.0.2a -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include/ -DNO_SHIBBOLETH=1 4. Call ``make``. From f738cfd7fec9a10724715bb24b1aa7954c4ca0f2 Mon Sep 17 00:00:00 2001 From: Jonathan Kawohl Date: Mon, 24 Oct 2016 09:00:07 +0200 Subject: [PATCH 3/7] added info on qtkeychain added installation info on qtkeychain --- doc/building.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/building.rst b/doc/building.rst index 91d723941..5cdc2aae7 100644 --- a/doc/building.rst +++ b/doc/building.rst @@ -87,6 +87,9 @@ To set up your build environment for development using HomeBrew_: Where ``x.z`` is the current version of Qt 5 that brew has installed on your machine. +4. Install qtkeychain from here: git clone https://github.com/frankosterfeld/qtkeychain.git + make sure you make the same install prefix as later while building the client e.g. - + ``DCMAKE_INSTALL_PREFIX=/Path/to/client-install`` 5. For compilation of the client, follow the :ref:`generic-build-instructions`. From 4f1feab845462a6448626806a39eef44a2c6900e Mon Sep 17 00:00:00 2001 From: Jonathan Kawohl Date: Mon, 24 Oct 2016 15:09:25 +0200 Subject: [PATCH 4/7] fix for https://github.com/owncloud/client/issues/1251 --- admin/osx/macosx.pkgproj | 24 ++++++++++++------------ src/libsync/owncloudtheme.cpp | 5 +++-- src/libsync/theme.cpp | 7 ++++--- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/admin/osx/macosx.pkgproj b/admin/osx/macosx.pkgproj index 9b9b891bc..4883a4e90 100644 --- a/admin/osx/macosx.pkgproj +++ b/admin/osx/macosx.pkgproj @@ -22,7 +22,7 @@ GID 80 PATH - @APPLICATION_EXECUTABLE@.app + owncloud.app PATH_TYPE 3 PERMISSIONS @@ -474,14 +474,14 @@ POSTINSTALL_PATH PATH - @CMAKE_CURRENT_BINARY_DIR@/post_install.sh + /Users/jonathankawohl/github/client/admin/osx/post_install.sh PATH_TYPE 0 PREINSTALL_PATH PATH - @CMAKE_CURRENT_BINARY_DIR@/pre_install.sh + /Users/jonathankawohl/github/client/admin/osx/pre_install.sh PATH_TYPE 0 @@ -495,13 +495,13 @@ CONCLUSION_ACTION 0 IDENTIFIER - @APPLICATION_REV_DOMAIN_INSTALLER@ + com.ownCloud.client NAME - @APPLICATION_NAME_XML_ESCAPED@ + ownCloud OVERWRITE_PERMISSIONS VERSION - @MIRALL_VERSION_FULL@ + 2.3.0.0 UUID 7D7219B7-1897-48C3-8533-842BDEC46F71 @@ -1029,7 +1029,7 @@ OVERWRITE_PERMISSIONS VERSION - @MIRALL_VERSION_FULL@ + 2.3.0.0 TYPE 0 @@ -1065,12 +1065,12 @@ BACKGROUND_PATH PATH - @MAC_INSTALLER_BACKGROUND_FILE@ + /Users/jonathankawohl/github/client/admin/osx/installer-background.png PATH_TYPE 0 CUSTOM - @MAC_INSTALLER_DO_CUSTOM_BACKGROUND@ + 1 SCALING 0 @@ -1245,7 +1245,7 @@ LANGUAGE English VALUE - @APPLICATION_NAME_XML_ESCAPED@ Client + ownCloud Client @@ -1445,9 +1445,9 @@ NAME - @APPLICATION_NAME_XML_ESCAPED@ Installer + ownCloud Installer REFERENCE_FOLDER_PATH - @CMAKE_INSTALL_DIR@ + SHARED_GLOBAL_DATA diff --git a/src/libsync/owncloudtheme.cpp b/src/libsync/owncloudtheme.cpp index 09121acd6..6809d0426 100644 --- a/src/libsync/owncloudtheme.cpp +++ b/src/libsync/owncloudtheme.cpp @@ -45,8 +45,9 @@ QString ownCloudTheme::about() const { QString devString; devString = trUtf8("

Version %2. For more information visit %4

" - "

By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, " - "Olivier Goffart, Markus Götz and others.

" + "

For known issues and help, please visit: central.owncloud.org

" + "

By Klaas Freitag, Daniel Molkentin,Olivier Goffart, Markus Götz" + ", Jan-Christoph Borchardt, and others.

" "

Copyright ownCloud GmbH

" "

Licensed under the GNU General Public License (GPL) Version 2.0
" "ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH " diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp index 53e850b99..9b67f88f8 100644 --- a/src/libsync/theme.cpp +++ b/src/libsync/theme.cpp @@ -285,7 +285,8 @@ QString Theme::gitSHA1() const const QString gitSha1(QLatin1String(GIT_SHA1)); devString = QCoreApplication::translate("ownCloudTheme::about()", "

Built from Git revision %2" - " on %3, %4 using Qt %5, %6

") + " on %3, %4 using Qt %5, %6") + .arg(githubPrefix+gitSha1).arg(gitSha1.left(6)) .arg(__DATE__).arg(__TIME__) .arg(QT_VERSION_STR) @@ -300,11 +301,11 @@ QString Theme::about() const re = tr("

Version %1. For more information please visit %3.

") .arg(MIRALL_VERSION_STRING).arg("http://" MIRALL_STRINGIFY(APPLICATION_DOMAIN)) .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN)); - + re += tr("

Copyright ownCloud GmbH

"); re += tr("

Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.
" "%2 and the %2 logo are registered trademarks of %1 in the " - "United States, other countries, or both.

") + "United States, other countries, or both.
") .arg(APPLICATION_VENDOR).arg(APPLICATION_NAME); re += gitSHA1(); From ffac3f62133a587a9948f83ae5e466efaaf28879 Mon Sep 17 00:00:00 2001 From: Jonathan Kawohl Date: Mon, 24 Oct 2016 15:16:06 +0200 Subject: [PATCH 5/7] fixing wrong files Revert "fix for https://github.com/owncloud/client/issues/1251" This reverts commit 4f1feab845462a6448626806a39eef44a2c6900e. --- admin/osx/macosx.pkgproj | 24 ++++++++++++------------ src/libsync/owncloudtheme.cpp | 5 ++--- src/libsync/theme.cpp | 7 +++---- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/admin/osx/macosx.pkgproj b/admin/osx/macosx.pkgproj index 4883a4e90..9b9b891bc 100644 --- a/admin/osx/macosx.pkgproj +++ b/admin/osx/macosx.pkgproj @@ -22,7 +22,7 @@ GID 80 PATH - owncloud.app + @APPLICATION_EXECUTABLE@.app PATH_TYPE 3 PERMISSIONS @@ -474,14 +474,14 @@ POSTINSTALL_PATH PATH - /Users/jonathankawohl/github/client/admin/osx/post_install.sh + @CMAKE_CURRENT_BINARY_DIR@/post_install.sh PATH_TYPE 0 PREINSTALL_PATH PATH - /Users/jonathankawohl/github/client/admin/osx/pre_install.sh + @CMAKE_CURRENT_BINARY_DIR@/pre_install.sh PATH_TYPE 0 @@ -495,13 +495,13 @@ CONCLUSION_ACTION 0 IDENTIFIER - com.ownCloud.client + @APPLICATION_REV_DOMAIN_INSTALLER@ NAME - ownCloud + @APPLICATION_NAME_XML_ESCAPED@ OVERWRITE_PERMISSIONS VERSION - 2.3.0.0 + @MIRALL_VERSION_FULL@ UUID 7D7219B7-1897-48C3-8533-842BDEC46F71 @@ -1029,7 +1029,7 @@ OVERWRITE_PERMISSIONS VERSION - 2.3.0.0 + @MIRALL_VERSION_FULL@ TYPE 0 @@ -1065,12 +1065,12 @@ BACKGROUND_PATH PATH - /Users/jonathankawohl/github/client/admin/osx/installer-background.png + @MAC_INSTALLER_BACKGROUND_FILE@ PATH_TYPE 0 CUSTOM - 1 + @MAC_INSTALLER_DO_CUSTOM_BACKGROUND@ SCALING 0 @@ -1245,7 +1245,7 @@ LANGUAGE English VALUE - ownCloud Client + @APPLICATION_NAME_XML_ESCAPED@ Client @@ -1445,9 +1445,9 @@ NAME - ownCloud Installer + @APPLICATION_NAME_XML_ESCAPED@ Installer REFERENCE_FOLDER_PATH - + @CMAKE_INSTALL_DIR@ SHARED_GLOBAL_DATA diff --git a/src/libsync/owncloudtheme.cpp b/src/libsync/owncloudtheme.cpp index 6809d0426..09121acd6 100644 --- a/src/libsync/owncloudtheme.cpp +++ b/src/libsync/owncloudtheme.cpp @@ -45,9 +45,8 @@ QString ownCloudTheme::about() const { QString devString; devString = trUtf8("

Version %2. For more information visit %4

" - "

For known issues and help, please visit: central.owncloud.org

" - "

By Klaas Freitag, Daniel Molkentin,Olivier Goffart, Markus Götz" - ", Jan-Christoph Borchardt, and others.

" + "

By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, " + "Olivier Goffart, Markus Götz and others.

" "

Copyright ownCloud GmbH

" "

Licensed under the GNU General Public License (GPL) Version 2.0
" "ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH " diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp index 9b67f88f8..53e850b99 100644 --- a/src/libsync/theme.cpp +++ b/src/libsync/theme.cpp @@ -285,8 +285,7 @@ QString Theme::gitSHA1() const const QString gitSha1(QLatin1String(GIT_SHA1)); devString = QCoreApplication::translate("ownCloudTheme::about()", "

Built from Git revision %2" - " on %3, %4 using Qt %5, %6") - + " on %3, %4 using Qt %5, %6

") .arg(githubPrefix+gitSha1).arg(gitSha1.left(6)) .arg(__DATE__).arg(__TIME__) .arg(QT_VERSION_STR) @@ -301,11 +300,11 @@ QString Theme::about() const re = tr("

Version %1. For more information please visit %3.

") .arg(MIRALL_VERSION_STRING).arg("http://" MIRALL_STRINGIFY(APPLICATION_DOMAIN)) .arg(MIRALL_STRINGIFY(APPLICATION_DOMAIN)); - + re += tr("

Copyright ownCloud GmbH

"); re += tr("

Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.
" "%2 and the %2 logo are registered trademarks of %1 in the " - "United States, other countries, or both.
") + "United States, other countries, or both.

") .arg(APPLICATION_VENDOR).arg(APPLICATION_NAME); re += gitSHA1(); From a92eec160a719dc733d43334edc04951a5bf05ca Mon Sep 17 00:00:00 2001 From: Jonathan Kawohl Date: Wed, 23 Nov 2016 09:10:58 +0100 Subject: [PATCH 6/7] fixed review https://github.com/owncloud/client/pull/5259#pullrequestreview-9743725 --- doc/building.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/building.rst b/doc/building.rst index 5cdc2aae7..fda1fcf3d 100644 --- a/doc/building.rst +++ b/doc/building.rst @@ -68,9 +68,11 @@ To set up your build environment for development using HomeBrew_: 1. Install Xcode 2. Install Xcode command line tools:: + xcode-select --install 3. Install homebrew:: + /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" 4. Add the ownCloud repository using the following command:: @@ -244,11 +246,11 @@ To build the most up-to-date version of the client: .. note:: On Mac OS X, you need to specify ``-DCMAKE_INSTALL_PREFIX=target``, where ``target`` is a private location, i.e. in parallel to your build dir by specifying ``../install``. - - ..note:: qtkeychain must be compiled with the same prefix e.g CMAKE_INSTALL_PREFIX=/Users/path/to/client/install/ .. note:: Example:: cmake -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 -DCMAKE_INSTALL_PREFIX=/Users/path/to/client/install/ -D_OPENSSL_LIBDIR=/usr/local/opt/openssl/lib/ -D_OPENSSL_INCLUDEDIR=/usr/local/opt/openssl/include/ -D_OPENSSL_VERSION=1.0.2a -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include/ -DNO_SHIBBOLETH=1 + qtkeychain must be compiled with the same prefix e.g CMAKE_INSTALL_PREFIX=/Users/path/to/client/install/ . + 4. Call ``make``. The owncloud binary will appear in the ``bin`` directory. From ca9ec4625391ae23940b3a62aaa0afe89f3d98e8 Mon Sep 17 00:00:00 2001 From: Jonathan Kawohl Date: Wed, 23 Nov 2016 09:17:33 +0100 Subject: [PATCH 7/7] fixed note --- doc/building.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/building.rst b/doc/building.rst index fda1fcf3d..f4866adc4 100644 --- a/doc/building.rst +++ b/doc/building.rst @@ -102,7 +102,7 @@ To set up your build environment for development using HomeBrew_: its Common Name as a third parameter (use quotes) to have the package signed automatically. - .. note:: Contrary to earlier versions, ownCloud 1.7 and later are packaged + .. note:: Contrary to earlier versions, ownCloud 1.7 and later are packaged as a ``pkg`` installer. Do not call "make package" at any time when compiling for OS X, as this will build a disk image, and will not work correctly.