[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  c7e28686ffef5307cf1dfb2a582eecf7934cd755 (commit)
       via  a522f2c136c1c9874ab232cc771041b7ef25a19e (commit)
      from  d9fc6fe6ed4292b2b2179d279359b2f00b885223 (commit)

Summary of changes:
 README.txt             |   41 +++++++++++++++++++++++++++--------------
 gitall-asterisk-scf.sh |    2 +-
 2 files changed, 28 insertions(+), 15 deletions(-)


- Log -----------------------------------------------------------------
commit c7e28686ffef5307cf1dfb2a582eecf7934cd755
Author: David M. Lee <dlee at digium.com>
Date:   Wed Sep 15 16:05:05 2010 -0500

    Updated README.txt for new scripts.

diff --git a/README.txt b/README.txt
index 765916d..c6177d4 100644
--- a/README.txt
+++ b/README.txt
@@ -5,11 +5,14 @@ README.txt - Asterisk SCF gitall repo
 
 Prequisites
 -----------
- a.) You have SSH certificate installed so that ssh-agent can be used. 
- b.) You have Boost libs installed.
- c.) You have lua installed.
- d.) You have Cmake installed.
- e.) Ice version 3.4 installed.  Note that we have patches that have
+ a.) You have SSH certificate installed so that ssh-agent can be
+     used. 
+ b.) You have Git installed and on the path.  Note that Git on Windows
+     comes with a Bash interpreter for running provided scripts.
+ c.) You have Boost libs installed.
+ d.) You have lua installed.
+ e.) You have Cmake installed.
+ f.) Ice version 3.4 installed.  Note that we have patches that have
      not yet been accepted upstream.  Clone
      git at git.asterisk.org:asterisk-scf/release/ice and build from
      source. If you choose to install Ice in a non-default location,
@@ -19,20 +22,30 @@ To set up for an intergrated build:
 ------------------------------------
 
  1.) Run the bash script gitall-asterisk-scf.sh.
-     Windows Note: All Windows Git installs will include bash. From a DOS command prompt, 
-                   you will have to preface the script with the bash command: bash gitall-asterisk-scf.sh
 
- 2.) Copy pjproject<version> to this directory, and rename it to pjproject. (For example, pjproject-1.7 becomes pjproject).  Download from http://www.pjsip.org/download.htm.
+    $ ./gitall-asterisk-scf.sh
+    > bash gitall-asterisk-scf.sh
+
+ 2.) Copy pjproject<version> to this directory, and rename/symlink it
+     to pjproject. (For example, pjproject-1.7 becomes pjproject).
+     Download from http://www.pjsip.org/download.htm.
  
- 3.) cd into the 'build' directory.
+ 3.) Run an out-of-source-tree cmake build.  There is a helper script
+     for doing this, which creates a ./build directory.
 
- 4.) Run an out-of-source-tree cmake build like this:
-      Windows: runcmake.bat
-      Other:   runcmake.sh
+    $ ./build/init-cmake.sh [optional cmake args]
+    > bash ./build/init-cmake.sh [optional cmake args]
 
 Build all components:
 ---------------------
 
-Windows:
+You can use Cmake to build the components.  For Windows, you should
+run this from a Visual Studio command prompt.
+
+    $ cmake --build ./build
+    > cmake --build .\build
+
+Or you can use the native build tool:
 
-Other:   A Makefile has been generated.  Just run 'make'.
+    $ make -C ./build
+    > nmake /f ./build/Makefile.mak

commit a522f2c136c1c9874ab232cc771041b7ef25a19e
Author: David M. Lee <dlee at digium.com>
Date:   Tue Sep 14 17:08:38 2010 -0500

    Update submodules recursively

diff --git a/gitall-asterisk-scf.sh b/gitall-asterisk-scf.sh
index dfdda23..0905083 100755
--- a/gitall-asterisk-scf.sh
+++ b/gitall-asterisk-scf.sh
@@ -39,7 +39,7 @@ for repo in "${repos[@]}"; do
 
    if [ -d ${repoDir}/.git ]; then
       echo ">> Updating from repo ${repoUri}"
-      ( cd ${repoDir} && git pull && git submodule update --init)
+      ( cd ${repoDir} && git pull && git submodule update --init --recursive)
    else
       echo ">> Cloning from $repoUri to ${repo[i]}"
       git clone --recursive ${repoUri} ${repoDir}

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


-- 
asterisk-scf/integration/gitall.git