diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-05-22 22:10:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-22 22:10:18 +0300 |
| commit | 30dcfc4553684f3a15e8bfd9da7983d5a255a796 (patch) | |
| tree | a0edc01b52d25ee2906d4307c9dc8b051dedc8d1 | |
| parent | 5ff07d34b6a0ff7aaab6e5f454e9970870e648b0 (diff) | |
| parent | 0569f4ce28af07d01f92980c61d9df225393ce9d (diff) | |
Merge pull request #154 from nextcloud/2.3.2-betav2.3.2-beta1
2.3.2 beta
| m--------- | client | 0 | ||||
| -rw-r--r-- | osx/build.sh | 4 | ||||
| -rwxr-xr-x | win/build.sh | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/client b/client -Subproject 433ba03a2e092fd8de4d2830fff58f65e602d30 +Subproject 820899d07102b990b19e8b02121221e41f7fbf0 diff --git a/osx/build.sh b/osx/build.sh index 4bb1f3f..4e3c6a1 100644 --- a/osx/build.sh +++ b/osx/build.sh @@ -12,7 +12,7 @@ sudo rm -rf install cd ~ git clone --recursive https://github.com/owncloud/client.git cd client -git checkout v2.3.1 +git checkout v2.3.2 git submodule update --recursive # Build qtkeychain @@ -26,7 +26,7 @@ cp client_theming/osx/dsa_pub.pem client/admin/osx/sparkle/ rm -rf build-mac mkdir build-mac cd build-mac -cmake -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.8 -DCMAKE_INSTALL_PREFIX=/Users/builder/install -DCMAKE_PREFIX_PATH=/Users/builder/Qt/5.6/clang_64 -D SPARKLE_INCLUDE_DIR=/Users/builder/Library/Frameworks/Sparkle.framework/ -D SPARKLE_LIBRARY=/Users/builder/Library/Frameworks/Sparkle.framework/ -D OEM_THEME_DIR=/Users/builder/client_theming/nextcloudtheme -DWITH_CRASHREPORTER=ON -DNO_SHIBBOLETH=1 -DMIRALL_VERSION_BUILD=1 ../client +cmake -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.8 -DCMAKE_INSTALL_PREFIX=/Users/builder/install -DCMAKE_PREFIX_PATH=/Users/builder/Qt/5.6/clang_64 -D SPARKLE_INCLUDE_DIR=/Users/builder/Library/Frameworks/Sparkle.framework/ -D SPARKLE_LIBRARY=/Users/builder/Library/Frameworks/Sparkle.framework/ -D OEM_THEME_DIR=/Users/builder/client_theming/nextcloudtheme -DWITH_CRASHREPORTER=ON -DNO_SHIBBOLETH=1 -DMIRALL_VERSION_SUFFIX=beta -DMIRALL_VERSION_BUILD=1 ../client make sudo make install sudo ~/client_theming/client/admin/osx/sign_app.sh ~/install/nextcloud.app 59FA8948AEBAE3F2222AE9BC020D6DA31DF821A7 diff --git a/win/build.sh b/win/build.sh index 6aadf15..2949ec9 100755 --- a/win/build.sh +++ b/win/build.sh @@ -10,6 +10,8 @@ su - user << EOF cmake -DCMAKE_TOOLCHAIN_FILE=../client/admin/win/Toolchain-mingw32-openSUSE.cmake\ -DWITH_CRASHREPORTER=ON \ -DOEM_THEME_DIR=/home/user/nextcloudtheme \ + -DMIRALL_VERSION_SUFFIX=beta \ + -DMIRALL_VERSION_BUILD=1 \ ../client make -j4 make package |