diff options
author | Klaas Freitag <freitag@owncloud.com> | 2013-11-06 14:13:55 +0400 |
---|---|---|
committer | Klaas Freitag <freitag@owncloud.com> | 2013-11-06 14:13:55 +0400 |
commit | b6152c19d6e8be8fc974bf00959f1658cb9474ee (patch) | |
tree | 57301b9f9b74d1845006ac3eecda40c91469bd7a /doc | |
parent | ee4cbf52dce693120943d74eb51ab00a98c594e1 (diff) |
Adjust generic build documentation to the current state.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/building.rst | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/doc/building.rst b/doc/building.rst index cdbde4773..16f0dfbc9 100644 --- a/doc/building.rst +++ b/doc/building.rst @@ -7,6 +7,11 @@ This section explains how to build the ownCloud Client from source for all major platforms. You should read this section if you want to development on the desktop client. +Note that the building instruction are subject to change as development +proceeds. It is important to check the version which is to built. + +This instructions were updated to work with ownCloud Client 1.5. + Linux ----- @@ -39,10 +44,6 @@ Next, install the missing dependencies:: brew install $(brew deps ocsync) brew install $(brew deps mirall) - bug: - iniparser is not provideed by $(brew deps ocsync) - fix with brew install iniparser - To build mirall and csync, follow the `generic build instructions`_. @@ -70,12 +71,12 @@ Next, install the cross-compiler packages and the cross-compiled dependencies:: zypper install cmake make mingw32-cross-binutils mingw32-cross-cpp mingw32-cross-gcc \ mingw32-cross-gcc-c++ mingw32-cross-pkg-config mingw32-filesystem \ - mingw32-headers mingw32-runtime site-config mingw32-iniparser-devel \ + mingw32-headers mingw32-runtime site-config \ mingw32-libsqlite-devel mingw32-dlfcn-devel mingw32-libssh2-devel \ kdewin-png2ico mingw32-libqt4 mingw32-libqt4-devel mingw32-libgcrypt \ mingw32-libgnutls mingw32-libneon mingw32-libneon-devel mingw32-libbeecrypt \ mingw32-libopenssl mingw32-openssl mingw32-libpng-devel mingw32-libsqlite \ - mingw32-qtkeychain mingw32-qtkeychain-devel mingw32-iniparser mingw32-dlfcn \ + mingw32-qtkeychain mingw32-qtkeychain-devel mingw32-dlfcn \ mingw32-libintl-devel mingw32-libneon-devel mingw32-libopenssl-devel \ mingw32-libproxy-devel mingw32-libxml2-devel mingw32-zlib-devel @@ -122,7 +123,7 @@ CMake and Mirall can be downloaded at ownCloud's `Client Download Page`_. If you want to build the leading edge version of the client, you should use the latest versions of Mirall and CSync via Git_, like so:: - git clone git://git.csync.org/users/freitag/csync.git ocsync + git clone git://git.csync.org/users/owncloud/csync.git ocsync git clone git://github.com/owncloud/mirall.git Next, create build directories:: @@ -131,11 +132,11 @@ Next, create build directories:: mkdir mirall-build This guide assumes that all directories are residing next to each other. -Next, make sure to check out the 'dav' branch in the newly checked out +Next, make sure to check out the 'ocsync' branch in the newly checked out `ocsync` directory:: cd ocsync - git checkout dav + git checkout ocsync The first package to build is CSync:: @@ -144,9 +145,10 @@ The first package to build is CSync:: make You probably have to satisfy some dependencies. Make sure to install all the -needed development packages. You will need ``iniparser``, ``sqlite3`` as well as -``neon`` for the ownCloud module. Take special care about ``neon``. If that is -missing, the cmake run will succeed but silently not build the ownCloud module. +needed development packages. You will need ``sqlite3`` as well as ``neon`` for +the ownCloud module. Take special care about ``neon``. If that is missing, the +cmake run will succeed but silently not build the ownCloud module. + ``libssh`` and ``libsmbclient`` are optional and not required for the client to work. If you want to install the client, run ``make install`` as a final step. |