submodules: update nightly branch

build.py

@@ -532,12 +532,14 @@ def run_clean():
 
 
 def run_run(args):
-    if args.distribution == OSX_DISTRIBUTION_NAME:
+    if args.distribution == OSX_DISTRIBUTION_NAME and args.qt is None:
         subprocess.Popen(
             ["install/client-macosx/Ring.app/Contents/MacOS/Ring"])
         return True
 
     run_env = os.environ
+    if args.gnome or (args.distribution == OSX_DISTRIBUTION_NAME \
+                     and args.qt is None):
         run_env['LD_LIBRARY_PATH'] = run_env.get(
             'LD_LIBRARY_PATH', '') + ":install/lrc/lib"
 
@@ -718,7 +720,6 @@ def parse_args():
     ap.add_argument('--no-priv-install', dest='priv_install',
                     default=True, action='store_false')
     ap.add_argument('--gnome', default=False, action='store_true')
-    ap.add_argument('--macos', default=False, action='store_true')
     ap.add_argument('--qt', nargs='?', const='', type=str,
                     help='Build the Qt client with the Qt path supplied')
     ap.add_argument('--no-libwrap', dest='no_libwrap',

client-android @ 6895da29

-Subproject commit 92263678591742d88fdde18ff439dc689a820744
+Subproject commit 6895da29f7764ac2167f478aa461f13e71c7f3e8

client-ios @ bd6f9974

-Subproject commit 10335f25c5b4c70ab91dcb72973d472885691928
+Subproject commit bd6f9974f6c96228d3c7abe20ad64c71198c6bb3

client-qt @ 9535c88b

-Subproject commit a7735dfa7d5bf099dde99283ba5151f3f3633310
+Subproject commit 9535c88bdf312432e19f4727bf5679e4ca9bccc0

daemon @ 37d1d9a5

-Subproject commit 4ff4a32d66194eb953017709f52fd33a73e68240
+Subproject commit 37d1d9a5e36f245e0b577a2279c22df6a4869e4a

scripts/install.sh

@@ -151,7 +151,8 @@ if [ "${client}" = "client-qt" ] && [ -z "$qtpath" ]; then
     fi
 fi
 
-# libringclient
+# libringclient (only if not client-qt)
+if [ "${client}" != "client-qt" ]; then
     cd "${TOP}/lrc"
     mkdir -p "${BUILDDIR}"
     cd "${BUILDDIR}"
@@ -170,6 +171,7 @@ echo "info: Configuring LRC with flags: ${lrc_cmake_flags[*]}"
     cmake .. "${lrc_cmake_flags[@]}"
     make -j"${proc}" V=1
     make_install "${global}" "${priv_install}"
+fi
 
 # client
 cd "${TOP}/${client}"
@@ -180,13 +182,14 @@ client_cmake_flags=(-DCMAKE_BUILD_TYPE="${BUILD_TYPE}"
                     -DCMAKE_PREFIX_PATH="${qtpath}")
 
 if [ "${client}" = "client-qt" ]; then
-    client_cmake_flags+=(-DWITH_WEBENGINE="${enable_webengine}")
+    client_cmake_flags+=(-DENABLE_LIBWRAP="${enable_libwrap}"
+                         -DWITH_WEBENGINE="${enable_webengine}")
     if [ "${global}" = "true" ]; then
         client_cmake_flags+=(${prefix:+"-DCMAKE_INSTALL_PREFIX=$prefix"}
                              $static)
     else
         client_cmake_flags+=(-DCMAKE_INSTALL_PREFIX="${INSTALL}/${client}"
-                             -DLRC="${INSTALL}/lrc")
+                             -DLIBJAMI_BUILD_DIR="${DAEMON}/src")
     fi
 else
     # Compute GNOME client CMake flags.