updated build.sh to take into account CISCO CI

Author: AndriyP

build.sh

@@ -6,7 +6,7 @@ mode=$3
 current_dir=`pwd`
 if [ -z $output_gen ];
 then
-  output_gen=`pwd`
+  output_gen=`pwd`/out
   platform="desktop"
 fi
 
@@ -26,6 +26,10 @@ else
   modes=$mode
 fi
 
+OUT_LIB_FILES="libchromium_base.a libWebDriver_core.a libWebDriver_extension_qt_base.a libWebDriver_extension_qt_web.a"
+OUT_BIN_FILES="WebDriver WebDriver_noWebkit"
+GYP=`which gyp`
+
 #generate wdversion.cc
 python generate_wdversion.py
 
@@ -34,27 +38,31 @@ do
   for mode in $modes
   do
     cd $current_dir
-    gyp --depth . -G output_dir=. -D platform=$platform -D mode=$mode -D ROOT_PATH=${base_output_gen} --generator-output=${output_gen}/out/$platform/$mode wd.gyp
+
+    OUTPUT_DIR=${output_gen}/$platform/$mode
+    OUTPUT_DIR_OUT=${output_gen}/$platform/$mode/Default
+    OUTPUT_BIN_DIR=${output_gen}/bin/$platform/$mode
+
+    python $GYP --depth . -G output_dir=. -D platform=$platform -D mode=$mode -D ROOT_PATH=${base_output_gen} --generator-output=${output_gen}/$platform/$mode wd.gyp
     [ $? -ne 0 ] && exit 1
-    cd ${output_gen}/out/$platform/$mode
-    [ $? -ne 0 ] && echo "**** ERROR: Can't access to ${output_gen}/$platform/$mode" && exit 1
+    cd $OUTPUT_DIR
+    [ $? -ne 0 ] && echo "**** ERROR: Can't access to $OUTPUT_DIR" && exit 1
     make
     [ $? -ne 0 ] && exit 1
     mkdir -p ${output_gen}/bin/$platform/$mode/
-    [ $? -ne 0 ] && echo "**** ERROR: Can't create ${output_gen}/bin/$platform/$mode" && exit 1
-
-    cp -f ${output_gen}/out/$platform/$mode/Default/libchromium_base.a ${output_gen}/bin/$platform/$mode/ 2>/dev/null
-    cp -f ${output_gen}/out/$platform/$mode/Default/libWebDriver_core.a ${output_gen}/bin/$platform/$mode/ 2>/dev/null
-    cp -f ${output_gen}/out/$platform/$mode/Default/libWebDriver_extension_qt_base.a ${output_gen}/bin/$platform/$mode/ 2>/dev/null
-    cp -f ${output_gen}/out/$platform/$mode/Default/libWebDriver_extension_qt_web.a ${output_gen}/bin/$platform/$mode/ 2>/dev/null
-    #cp -f ${output_gen}/out/$platform/$mode/Default/lib.target/libWebDriver.so ${output_gen}/bin/$platform/$mode/ 2>/dev/null
-    if [ -f ${output_gen}/out/$platform/$mode/Default/WebDriver ]
-    then
-      cp -f ${output_gen}/out/$platform/$mode/Default/WebDriver ${output_gen}/bin/$platform/$mode/ 2>/dev/null
-    fi
-    if [ -f ${output_gen}/out/$platform/$mode/Default/WebDriver_noWebkit ]
-    then
-      cp -f ${output_gen}/out/$platform/$mode/Default/WebDriver_noWebkit ${output_gen}/bin/$platform/$mode/ 2>/dev/null
-    fi
+    [ $? -ne 0 ] && echo "**** ERROR: Can't create $OUTPUT_BIN_DIR" && exit 1
+
+    # copy libraries
+    for file in $OUT_LIB_FILES; do cp -f $OUTPUT_DIR_OUT/$file $OUTPUT_BIN_DIR 2>/dev/null; done
+
+    # copy test binaries
+    for file in $OUT_BIN_FILES
+    do
+      if [ -f $OUTPUT_DIR_OUT/$file ]
+      then
+        cp -f $OUTPUT_DIR_OUT/$file $OUTPUT_BIN_DIR 2>/dev/null
+      fi
+    done
+    
   done
 done