[asterisk-scf-commits] asterisk-scf/integration/gitall.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  8cd5a15ec7283613dd1db8fa11d42a3b8fcc3245 (commit)
      from  395e6b127ee30597d2415eaa6d6e0c949a6b17e7 (commit)

Summary of changes:
 CMakeLists-all.txt     |    7 +++++++
 CMakeLists.txt         |   22 ++++++++++++++++++++++
 gitall-asterisk-scf.sh |   43 ++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 69 insertions(+), 3 deletions(-)
 create mode 100644 CMakeLists-all.txt
 create mode 100644 CMakeLists.txt


- Log -----------------------------------------------------------------
commit 8cd5a15ec7283613dd1db8fa11d42a3b8fcc3245
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Thu Aug 26 12:01:42 2010 -0500

    Not quite there yet, but almost. Some problems getting pjproject linked
    in and found by each component.

diff --git a/CMakeLists-all.txt b/CMakeLists-all.txt
new file mode 100644
index 0000000..a8cb20a
--- /dev/null
+++ b/CMakeLists-all.txt
@@ -0,0 +1,7 @@
+# The integrated build script will rename this file to CMakeLists.txt (after
+# backing up the standalone build script currently in CMakeLists.txt)
+
+# Include the subdirectory information. This is separate so that
+# a higher-level CMakeLists.txt can act as a master for integrated
+# builds.
+include(CMakeSubDirs.txt)
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..15f0148
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Asterisk SCF integrated build.
+
+# Minimum we require is 2.6, any lower and stuff would fail horribly
+cmake_minimum_required(VERSION 2.6)
+
+# Include pjproject build integration
+include(cmake/modules/pjproject.cmake)
+
+# Include common Hydra build infrastructure
+include(cmake/Hydra_v4.cmake)
+
+# This project is C++ based and requires a minimum of 3.4
+hydra_project("Asterisk SCF" 3.4 CXX)
+
+# Take care of slice definitions
+add_subdirectory(slice EXCLUDE_FROM_ALL)
+
+add_subdirectory(bridging)
+add_subdirectory(media_rtp_pjmedia)
+add_subdirectory(routing)
+add_subdirectory(servicediscovery)
+add_subdirectory(sip)
diff --git a/gitall-asterisk-scf.sh b/gitall-asterisk-scf.sh
index 3ea7356..d9f7aaf 100644
--- a/gitall-asterisk-scf.sh
+++ b/gitall-asterisk-scf.sh
@@ -17,6 +17,9 @@ exec `ssh-add ${1}`
 
 gitdepot=git.asterisk.org
 cmake=asterisk-scf/release/cmake
+
+# tree should probably be set by menu prompts or command line args 
+# one day
 tree=asterisk-scf/integration/
 
 i=0
@@ -27,9 +30,9 @@ repo[i++]=sip
 repo[i++]=media_rtp_pjmedia
 repo[i++]=slice
 
-imax=${i}
+numTreeRepos=${i}
 
-for ((i=0; i < ${imax}; i++)) ; do
+for ((i=0; i < ${numTreeRepos}; i++)) ; do
   repoName="${tree}${repo[i]}"
 
   repoUri="${gitdepot}:${repoName}"
@@ -44,7 +47,8 @@ for ((i=0; i < ${imax}; i++)) ; do
 done
 
 #
-# Clone/Update the cmake scripts. 
+# Clone/Update the Asterisk SCF custom cmake scripts. 
+# Currently this always comes from the release tree.
 # 
 gitDir="cmake/.git"
 cmakeUri="${gitdepot}:${cmake}"
@@ -56,3 +60,36 @@ else
   git clone "git@${cmakeUri}" cmake
 fi
 
+# Build a list of just the components, sans slice.
+j=0
+for ((i=0; i < ${numTreeRepos}; i++)) ; do
+   if [ "${repo[i]}" != "slice" ]; then
+      component[j++]=${repo[i]}
+   fi
+done
+numComponents=${j}
+
+
+#
+# Backup each component's current CMakeLists.txt file then
+# give it a new one that fits are need. (Unless we've already
+# done this, which would obliterate the backed up copy.) 
+#
+for ((i=0; i < ${numComponents}; i++)) ; do
+   file="${component[i]}/CMakeLists.txt"
+   backup="${component[i]}/CMakeLists-localBackup.txt"
+   if [ ! -f ${backup} ]; then
+     echo "Backing up ${file} to ${backup}"
+     cp ${file} ${backup}
+     echo "Installing new ${file}"
+     cp CMakeLists-all.txt ${file}
+   fi
+done
+
+if [ ! -d pjproject ]; then
+   echo " "
+   echo "--------- "
+   echo "REMINDER: You must manually install pjproject to the media_rtp_pjmedia directory."
+   echo "--------- "
+   echo " "
+fi

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/gitall.git