Support selective build configs via cli

Author: auscaster

build.sh

@@ -24,14 +24,15 @@ OPTIONS:
    -c TARGET CPU  The target cpu for cross-compilation. Default is 'x64'. Other values can be 'x86', 'arm64', 'arm'.
    -l BLACKLIST   List *.o objects to exclude from the static library.
    -e ENABLE_RTTI Compile WebRTC with RTII enabled. Default is '1'.
+   -n CONFIGS     Build configurations, space-separated. Default is 'Debug Release'. Other values can be 'Debug', 'Release'.
    -x             Express build mode. Skip repo sync and dependency checks, just build, compile and package.
    -D             [Linux] Generate a debian package
    -d             Debug mode. Print all executed commands.
    -h             Show this message
 EOF
 }
 
-while getopts :o:b:r:t:c:l:e:xDd OPTION; do
+while getopts :o:b:r:t:c:l:e:n:xDd OPTION; do
   case $OPTION in
   o) OUTDIR=$OPTARG ;;
   b) BRANCH=$OPTARG ;;
@@ -40,6 +41,7 @@ while getopts :o:b:r:t:c:l:e:xDd OPTION; do
   c) TARGET_CPU=$OPTARG ;;
   l) BLACKLIST=$OPTARG ;;
   e) ENABLE_RTTI=$OPTARG ;;
+  n) CONFIGS=$OPTARG ;;
   x) BUILD_ONLY=1 ;;
   D) PACKAGE_AS_DEBIAN=1 ;;
   d) DEBUG=1 ;;
@@ -56,6 +58,7 @@ ENABLE_CLANG=0
 ENABLE_STATIC_LIBS=1
 BUILD_ONLY=${BUILD_ONLY:-0}
 DEBUG=${DEBUG:-0}
+CONFIGS=${CONFIGS:-Debug Release}
 COMBINE_LIBRARIES=${COMBINE_LIBRARIES:-1}
 PACKAGE_AS_DEBIAN=${PACKAGE_AS_DEBIAN:-0}
 PACKAGE_FILENAME_PATTERN=${PACKAGE_FILENAME_PATTERN:-"webrtc-%rn%-%sr%-%to%-%tc%"}
@@ -111,15 +114,15 @@ if [ $BUILD_ONLY = 0 ]; then
 fi
 
 echo Compiling WebRTC
-compile $PLATFORM $OUTDIR "$TARGET_OS" "$TARGET_CPU" "$BLACKLIST"
+compile $PLATFORM $OUTDIR "$TARGET_OS" "$TARGET_CPU" "$CONFIGS" "$BLACKLIST"
 
 # Default PACKAGE_FILENAME is <projectname>-<rev-number>-<short-rev-sha>-<target-os>-<target-cpu>
 PACKAGE_FILENAME=$(interpret-pattern "$PACKAGE_FILENAME_PATTERN" "$PLATFORM" "$OUTDIR" "$TARGET_OS" "$TARGET_CPU" "$BRANCH" "$REVISION" "$REVISION_NUMBER")
 PACKAGE_NAME=$(interpret-pattern "$PACKAGE_NAME_PATTERN" "$PLATFORM" "$OUTDIR" "$TARGET_OS" "$TARGET_CPU" "$BRANCH" "$REVISION" "$REVISION_NUMBER")
 PACKAGE_VERSION=$(interpret-pattern "$PACKAGE_VERSION_PATTERN" "$PLATFORM" "$OUTDIR" "$TARGET_OS" "$TARGET_CPU" "$BRANCH" "$REVISION" "$REVISION_NUMBER")
 
 echo "Packaging WebRTC: $PACKAGE_FILENAME"
-package::prepare $PLATFORM $OUTDIR $PACKAGE_FILENAME $DIR/resource $REVISION_NUMBER
+package::prepare $PLATFORM $OUTDIR $PACKAGE_FILENAME $DIR/resource "$CONFIGS" $REVISION_NUMBER
 if [ "$PACKAGE_AS_DEBIAN" = 1 ]; then
   package::debian $OUTDIR $PACKAGE_FILENAME $PACKAGE_NAME $PACKAGE_VERSION "$(debian-arch $TARGET_CPU)"
 else

circle.yml

@@ -8,6 +8,6 @@ dependencies:
     - sudo update-alternatives --install /usr/bin/ld ld /usr/lib/binutils-2.26/bin/ld 90
 test:
   override:
-    - ./build.sh
+    - ./build.sh -n Release
     - cd out; tar -xvzf *.tar.gz; cd -
     - test/run_tests.sh $(ls -d -1 out/webrtc*/)

util.sh

@@ -406,10 +406,12 @@ function compile() {
   local outdir="$2"
   local target_os="$3"
   local target_cpu="$4"
+  local configs="$5"
   local blacklist="$5"
 
   # Set default default common  and target args.
   # `rtc_include_tests=false`: Disable all unit tests
+  # `treat_warnings_as_errors=false`: Don't error out on compiler warnings
   local common_args="rtc_include_tests=false treat_warnings_as_errors=false"
   local target_args="target_os=\"$target_os\" target_cpu=\"$target_cpu\""
 
@@ -434,24 +436,24 @@ function compile() {
   # like the clang compiled libraries, so the option is there.
   # Set `is_clang=false` and `use_sysroot=false` to build using gcc.
   if [ $ENABLE_CLANG = 0 ]; then
-    target_args+=" is_clang=false"
-    [ $platform = 'linux' ] && target_args+=" use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false use_custom_libcxx_for_host=false"
+    common_args+=" is_clang=false"
+    [ $platform = 'linux' ] && common_args+=" use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false use_custom_libcxx_for_host=false"
   fi
 
   pushd $outdir/src >/dev/null
-    compile::ninja "out/$TARGET_CPU/Debug" "$common_args $target_args is_debug=true"
-    compile::ninja "out/$TARGET_CPU/Release" "$common_args $target_args is_debug=false strip_debug_info=true symbol_level=0"
+    for cfg in $configs; do
+      [ "$cfg" = 'Release' ] && common_args+=' is_debug=false strip_debug_info=true symbol_level=0'
+      compile::ninja "out/$target_cpu/$cfg" "$common_args $target_args"
 
-    if [ $COMBINE_LIBRARIES = 1 ]; then
-      # Method 2: Merge the static .a/.lib libraries.
-      combine::static $platform "out/$TARGET_CPU/Debug" libwebrtc_full
-      combine::static $platform "out/$TARGET_CPU/Release" libwebrtc_full
-      
-      # Method 2: Merge .o/.obj objects to create the library, although results 
-      # have been inconsistent so the static merging method is default.
-      # combine::objects $platform "out/$TARGET_CPU/Debug" libwebrtc_full
-      # combine::objects $platform "out/$TARGET_CPU/Release" libwebrtc_full
-    fi
+      if [ $COMBINE_LIBRARIES = 1 ]; then
+        # Method 1: Merge the static .a/.lib libraries.
+        combine::static $platform "out/$target_cpu/$cfg" libwebrtc_full
+        
+        # Method 2: Merge .o/.obj objects to create the library, although results 
+        # have been inconsistent so the static merging method is default.
+        # combine::objects $platform "out/$target_cpu/$cfg" libwebrtc_full
+      fi 
+    done
   popd >/dev/null
 }
 
@@ -461,13 +463,15 @@ function compile() {
 # $2: The output directory.
 # $3: The package filename.
 # $4: The project's resource dirctory.
+# $5: The build configurations.
+# $6: The revision number.
 function package::prepare() {
   local platform="$1"
   local outdir="$2"
   local package_filename="$3"
   local resource_dir="$4"
-  local revision_number="$5"
-  local configs="Debug Release"
+  local configs="$5"
+  local revision_number="$6"
 
   if [ $platform = 'mac' ]; then
     CP='gcp'