[asterisk-commits] dsessions: testsuite/bamboo/trunk r1448 - /bamboo/trunk/bin/

[SVN commits to the Asterisk project]

Author: dsessions
Date: Mon Mar 28 08:37:50 2011
New Revision: 1448

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1448
Log:
Added support for make arguments in the build scripts for Asterisk SCF.

Modified:
    bamboo/trunk/bin/build-asterisk-scf-wrapper.bat
    bamboo/trunk/bin/build-asterisk-scf-wrapper.sh

Modified: bamboo/trunk/bin/build-asterisk-scf-wrapper.bat
URL: http://svnview.digium.com/svn/testsuite/bamboo/trunk/bin/build-asterisk-scf-wrapper.bat?view=diff&rev=1448&r1=1447&r2=1448
==============================================================================
--- bamboo/trunk/bin/build-asterisk-scf-wrapper.bat (original)
+++ bamboo/trunk/bin/build-asterisk-scf-wrapper.bat Mon Mar 28 08:37:50 2011
@@ -3,11 +3,13 @@
 if "%1" == "" goto usage
 if "%2" == "" goto usage
 if "%3" == "" goto usage
-if not "%4" == "" goto usage
+if "%4" == "" goto usage
+if not "%5" == "" goto usage
 
 echo 1 = %1
 echo 2 = %2
 echo 3 = %3
+echo 4 = %4
 echo B = %BINDIR%
 
 @call "C:\Program Files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %1
@@ -26,7 +28,7 @@
 rmdir /S /Q bamboo
 
 bash -c "set -e"
-bash -c "%BINDIR%build-asterisk-scf.sh %2 %BINDIR% %3"
+bash -c "%BINDIR%build-asterisk-scf.sh %2 %BINDIR% %3 %4"
 
 goto :eof
 
@@ -36,7 +38,7 @@
 echo 3 = %3
 echo:
 echo Error in script usage. The correct usage is:
-echo     %0 [arch] [asterisk scf repo]
+echo     %0 [arch] [asterisk scf repo] [make utility] [make arg]
 echo:
 echo where [arch] is: x86 ^| amd64
 echo     and

Modified: bamboo/trunk/bin/build-asterisk-scf-wrapper.sh
URL: http://svnview.digium.com/svn/testsuite/bamboo/trunk/bin/build-asterisk-scf-wrapper.sh?view=diff&rev=1448&r1=1447&r2=1448
==============================================================================
--- bamboo/trunk/bin/build-asterisk-scf-wrapper.sh (original)
+++ bamboo/trunk/bin/build-asterisk-scf-wrapper.sh Mon Mar 28 08:37:50 2011
@@ -12,4 +12,4 @@
 
 set -e
 
-${BINDIR}/build-asterisk-scf.sh $1 ${BINDIR} $2
+${BINDIR}/build-asterisk-scf.sh $1 ${BINDIR} $2 $3