[asterisk-scf-commits] asterisk-scf/integration/gitall.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Sep 14 09:11:23 CDT 2010
branch "master" has been updated
via c9854d0b759ee981cf65b2644a4fb6af5c256c52 (commit)
from cbf1b57006f6e5e10d757a0c0c677c0f9b08f19e (commit)
Summary of changes:
.gitignore | 3 +-
CMakeLists-all.txt | 7 ----
CMakeLists.txt | 3 ++
build/.gitignore | 4 --
build/runcmake.bat | 6 ---
build/runcmake.sh | 12 -------
gitall-asterisk-scf.sh | 81 ++++++++---------------------------------------
7 files changed, 19 insertions(+), 97 deletions(-)
delete mode 100644 CMakeLists-all.txt
mode change 100644 => 100755 CMakeLists.txt
delete mode 100644 build/.gitignore
delete mode 100644 build/runcmake.bat
delete mode 100755 build/runcmake.sh
- Log -----------------------------------------------------------------
commit c9854d0b759ee981cf65b2644a4fb6af5c256c52
Author: David M. Lee <dlee at digium.com>
Date: Tue Sep 14 00:17:14 2010 -0500
Simplify integrated build. Instead of lots of special cases and file
copying, we now just have an 'integrated' variable we can test to see
if we're in an integrated build or not.
diff --git a/.gitignore b/.gitignore
index 67ade66..c40916b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,9 @@
bridging
+build
cmake
media_rtp_pjmedia
+pjproject*
routing
servicediscovery
sip
slice
-pjproject*
diff --git a/CMakeLists-all.txt b/CMakeLists-all.txt
deleted file mode 100644
index a8cb20a..0000000
--- a/CMakeLists-all.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
old mode 100644
new mode 100755
index 2a1c62c..369437c
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,9 @@
# Minimum we require is 2.6, any lower and stuff would fail horribly
cmake_minimum_required(VERSION 2.6)
+# Indicate that this is an integrated build
+set(integrated_build true)
+
# Include pjproject build integration
include(${CMAKE_SOURCE_DIR}/cmake/modules/pjproject.cmake)
diff --git a/build/.gitignore b/build/.gitignore
deleted file mode 100644
index ec121a9..0000000
--- a/build/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-CMakeCache.txt
-CMakeFiles
-Makefile
-cmake_install.cmake
diff --git a/build/runcmake.bat b/build/runcmake.bat
deleted file mode 100644
index f04369f..0000000
--- a/build/runcmake.bat
+++ /dev/null
@@ -1,6 +0,0 @@
- at ECHO OFF
-REM -Wdev: Enable developer warnings.
-REM --build <sourcedir> : for out-of-source building
-
-cmake -Wdev --build .. -G "Visual Studio 9 2008"
-
diff --git a/build/runcmake.sh b/build/runcmake.sh
deleted file mode 100755
index 28c37d7..0000000
--- a/build/runcmake.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-#
-# Helpful wrapper for cmake.
-# usage: runcmake.sh [cmake-options]
-#
-# Any options are passed on to cmake as-is.
-#
-
-# -Wdev: Enable developer warnings
-# --build <sourcdir> : for out-of-source building
-cmake -Wdev --build .. "$@"
diff --git a/gitall-asterisk-scf.sh b/gitall-asterisk-scf.sh
index 1942082..eb95f56 100755
--- a/gitall-asterisk-scf.sh
+++ b/gitall-asterisk-scf.sh
@@ -19,82 +19,29 @@ if test ${SSH_AUTH_SOCK-no} = no; then
kill_agent=yes
fi
-gitdepot=git.asterisk.org
-cmake=asterisk-scf/release/cmake
+gitdepot=git at git.asterisk.org
# tree should probably be set by menu prompts or command line args
# one day
-tree=asterisk-scf/integration/
+tree=asterisk-scf
-i=0
-repo[i++]=bridging
-repo[i++]=routing
-repo[i++]=servicediscovery
-repo[i++]=sip
-repo[i++]=media_rtp_pjmedia
-repo[i++]=slice
+repos[i++]=integration/bridging
+repos[i++]=integration/routing
+repos[i++]=integration/servicediscovery
+repos[i++]=integration/sip
+repos[i++]=integration/media_rtp_pjmedia
+repos[i++]=integration/slice
+repos[i++]=release/cmake
-numTreeRepos=${i}
+for repo in "${repo[@]}"; do
+ repoUri=${gitdepot}:${tree}/${repo}
-for ((i=0; i < ${numTreeRepos}; i++)) ; do
- repoName="${tree}${repo[i]}"
-
- repoUri="${gitdepot}:${repoName}"
- repoGitDir="${repo[i]}/.git"
-
- if [ -d "${repoGitDir}" ]; then
+ if [ -d ${repo}/.git ]; then
echo ">> Updating from repo ${repoUri}"
- file="${repo[i]}/CMakeLists.txt"
- backup="${repo[i]}/CMakeLists-localBackup.txt"
- if [ -f ${backup} ]; then
- echo "Restoring backup ${backup} to ${file}"
- mv -f ${backup} ${file}
- fi
- ( cd ${repo[i]} && git pull )
+ ( cd ${repo} && git pull && git submodule update --init)
else
echo ">> Cloning from $repoUri to ${repo[i]}"
- git clone "git@${repoUri}" ${repo[i]}
- fi
-done
-
-#
-# Clone/Update the Asterisk SCF custom cmake scripts.
-# Currently this always comes from the release tree.
-#
-gitDir="cmake/.git"
-cmakeUri="${gitdepot}:${cmake}"
-echo "cmakeUri = ${cmakeUri}"
-if [ -d "${gitDir}" ]; then
- echo ">> Updating from repo ${cmakeUri}"
- ( cd cmake && git pull )
-else
- echo ">> Cloning from ${cmakeUri} to cmake"
- 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 our 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}
+ git clone --recursive ${repoUri} ${repo}
fi
done
-----------------------------------------------------------------------
--
asterisk-scf/integration/gitall.git
More information about the asterisk-scf-commits
mailing list