submodules: move them to submodules/ subdirectory

.gitmodules

-[submodule "belle-sip"]
-	path = belle-sip
-	url = git://git.linphone.org/belle-sip.git
-[submodule "linphone"]
-	path = linphone
-	url = git://git.linphone.org/linphone
-[submodule "cmake-builder"]
-	path = cmake-builder
+[submodule "submodules/belle-sip"]
+	path = submodules/belle-sip
+	url = git://git.linphone.org/belle-sip
+[submodule "submodules/cmake-builder"]
+	path = submodules/cmake-builder
 	url = git://git.linphone.org/linphone-cmake-builder
+[submodule "submodules/linphone"]
+	path = submodules/linphone
+	url = git://git.linphone.org/linphone

belle-sip @ 298264c5

-Subproject commit 298264c56d933a9305395439c988d6ad916a3266

cmake-builder @ 968ce552

-Subproject commit 968ce552cb8fee383272406f78a7b817712cb5e5

linphone @ 34e9384f

-Subproject commit 34e9384ff15610af1ca2314f4332e183c3658d55

prepare.py

@@ -28,12 +28,12 @@ import sys
 from subprocess import Popen
 from distutils.spawn import find_executable
 sys.dont_write_bytecode = True
-sys.path.insert(0, 'cmake-builder')
+sys.path.insert(0, 'submodules/cmake-builder')
 try:
     import prepare
 except:
     print(
-        "Could not find prepare module, probably missing cmake-builder? Try running: git submodule update --init --recursive")
+        "Could not find prepare module, probably missing submodules/cmake-builder? Try running:\ngit submodule update --init --recursive")
     exit(1)
 
 
@@ -44,7 +44,8 @@ class DesktopTarget(prepare.Target):
         current_path = os.path.dirname(os.path.realpath(__file__))
         self.config_file = 'configs/config-desktop.cmake'
         self.additional_args = [
-            '-DLINPHONE_BUILDER_EXTERNAL_SOURCE_PATH=' + current_path
+            '-DLINPHONE_BUILDER_EXTERNAL_SOURCE_PATH=' +
+            current_path + '/submodules'
         ]
 
 
@@ -63,70 +64,9 @@ def check_tools():
         print("Invalid location: path should not contain any spaces.")
         ret = 1
 
-    # for prog in ["autoconf", "automake", "pkg-config", "doxygen", "java", "nasm", "cmake", "wget", "yasm", "optipng"]:
-    #     ret |= not check_is_installed(prog, "it")
-    # ret |= not check_is_installed("ginstall", "coreutils")
-    # ret |= not check_is_installed("intltoolize", "intltool")
-    # ret |= not check_is_installed("convert", "imagemagick")
-
-    # if not check_is_installed("libtoolize", warn=False):
-    #     if check_is_installed("glibtoolize", "libtool"):
-    #         glibtoolize_path = find_executable(glibtoolize)
-    #         ret = 1
-    #         error = "Please do a symbolic link from glibtoolize to libtoolize: 'ln -s {} ${}'."
-    #         print(error.format(glibtoolize_path, glibtoolize_path.replace("glibtoolize", "libtoolize")))
-
-    # devnull = open(os.devnull, 'wb')
-    # just ensure that JDK is installed - if not, it will automatiaclyl display a popup to user
-    # p = Popen("java -version".split(" "), stderr=devnull, stdout=devnull)
-    # p.wait()
-    # if p.returncode != 0:
-    #     print(p.returncode)
-    #     print("Please install Java JDK (not just JRE).")
-    #     ret = 1
-
-    # needed by x264
-    # check_is_installed("gas-preprocessor.pl", """it:
-    #     wget --no-check-certificate https://raw.github.com/yuvi/gas-preprocessor/master/gas-preprocessor.pl
-    #     chmod +x gas-preprocessor.pl
-    #     sudo mv gas-preprocessor.pl /usr/local/bin/""")
-
-    # nasm_output = Popen("nasm -f elf32".split(" "), stderr=PIPE, stdout=PIPE).stderr.read()
-    # if "fatal: unrecognised output format" in nasm_output:
-    #     print(
-    #         "Invalid version of nasm: your version does not support elf32 output format. If you have installed nasm, please check that your PATH env variable is set correctly.")
-    #     ret = 1
-
-    #     if not os.path.isdir("submodules/linphone/mediastreamer2") or not os.path.isdir("submodules/linphone/oRTP"):
-    #         print("Missing some git submodules. Did you run 'git submodule update --init --recursive'?")
-    #         ret = 1
-    # p = Popen("xcrun --sdk iphoneos --show-sdk-path".split(" "), stdout=devnull, stderr=devnull)
-    # p.wait()
-    # if p.returncode != 0:
-    #     print("iOS SDK not found, please install Xcode from AppStore or equivalent.")
-    #     ret = 1
-    # else:
-    #     sdk_platform_path = Popen("xcrun --sdk iphonesimulator --show-sdk-platform-path".split(" "), stdout=PIPE, stderr=devnull).stdout.read()[:-1]
-    #     sdk_strings_path = "{}/{}".format(sdk_platform_path, "Developer/usr/bin/strings")
-    #     if not os.path.isfile(sdk_strings_path):
-    #         strings_path = find_executable("strings")
-    #         print("strings binary missing, please run 'sudo ln -s {} {}'.".format(strings_path, sdk_strings_path))
-    #         ret = 1
-
-    # if ret == 1:
-    #     print("Failed to detect required tools, aborting.")
-
+    print("check_tools: todo.. (see ios)")
     return ret
 
-
-# def install_git_hook():
-    # git_hook_path = ".git{sep}hooks{sep}pre-commit".format(sep=os.sep)
-    # if os.path.isdir(".git{sep}hooks".format(sep=os.sep)) and not os.path.isfile(git_hook_path):
-    #     print("Installing Git pre-commit hook")
-    #     shutil.copyfile(".git-pre-commit", git_hook_path)
-    #     os.chmod(git_hook_path, 0755)
-
-
 def generate_makefile(generator):
     packages = os.listdir('WORK/Build')
     packages.sort()
@@ -269,14 +209,16 @@ def main(argv=None):
     if check_tools() != 0:
         return 1
 
-    if args.tunnel:
-        if not os.path.isdir("tunnel"):
-            print("Tunnel enabled but not found, trying to clone it...")
-            if check_is_installed("git", "it", True):
-                Popen("git clone gitosis@git.linphone.org:tunnel.git submodules/tunnel".split(" ")).wait()
-            else:
+    if args.tunnel or os.path.isdir("submodules/tunnel"):
+        if not os.path.isdir("submodules/tunnel"):
+            print("Tunnel wanted but not found yet, trying to clone it...")
+            p = Popen("git clone gitosis@git.linphone.org:tunnel.git submodules/tunnel".split(" "))
+            p.wait()
+            if p.retcode != 0:
+                print("Could not clone tunnel. Please see http://www.belledonne-communications.com/voiptunnel.html")
                 return 1
-        additional_args += ["-DENABLE_TUNNEL=YES"]
+        print("Tunnel enabled, disabling GPL third parties.")
+        additional_args += ["-DENABLE_TUNNEL=ON", "-DENABLE_GPL_THIRD_PARTIES=OFF"]
 
     additional_args += ["-G", args.G__generator]
     if args.G__generator == 'Ninja':

belle-sip @ d67583e0

+Subproject commit d67583e0f5f4bc9625fbcbea4c1e2b186bbe4f78

cmake-builder @ 6fac99f8

+Subproject commit 6fac99f8d1bac12a921afb3b9697d24a50a034dd

linphone @ 5c1ba58c

+Subproject commit 5c1ba58c7b35c3a052eb1674bba3b8156e721c22