Merge branch 'master' into zselman_ci

CI/ci-linux-build.sh

@@ -9,7 +9,11 @@ set -e
 # QTVERSION= qt5
 # BUILDTYPE= debug / eelease
 
-
+echo "====================================="
+echo "====================================="
+echo "Sourcing CI/ci-linux-config.sh"
+echo "====================================="
+echo "====================================="
 #include ci options script
 MY_DIR=$(dirname $(readlink -f $0))
 source CI/ci-linux-config.sh
@@ -17,22 +21,26 @@ source CI/ci-linux-config.sh
 echo "Building with path: $BUILDPATH"
 echo "Full cmake options: $OPTIONS  "
 
-########################################
-# Fetch test data
-########################################
+echo "====================================="
+echo "====================================="
+echo "Cloning Test Data:"
+echo "====================================="
+echo "====================================="
+
 rm -rf TestData
-#git clone git@roosevelt:moebius/OpenFlipper-Test-Data.git TestData
 git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@www.graphics.rwth-aachen.de:9000/moebius/OpenFlipper-Test-Data.git TestData
 
-#########################################
-# Build Release version and Unittests
-#########################################
+
+echo "====================================="
+echo "====================================="
+echo "Building: in $BUILDPATH"
+echo "====================================="
+echo "====================================="
 
 # Make release build folder
 if [ ! -d $BUILDPATH ]; then
   mkdir $BUILDPATH
 fi
-
 cd $BUILDPATH
 
 cmake -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON $OPTIONS ../
@@ -40,26 +48,43 @@ cmake -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON $OPTIONS ../
 #build it
 make $MAKE_OPTIONS
 
+echo "====================================="
+echo "====================================="
+echo "Collecting required libraries:"
+echo "====================================="
+echo "====================================="
+
 # copy the used shared libraries to the lib folder
 cd Build
 
+# Creating System Library folder to contain all dependend libraries to run OpenFlipper
 if [ ! -d systemlib ]; then
+  echo "Creating systemlib folder"
   mkdir systemlib
 fi
 
+echo "Copying all required libraries of OpenFlipper to the systemlib directory"
 ldd bin/OpenFlipper | grep "=> /" | awk '{print $3}' | xargs -I '{}' cp -v '{}' systemlib
 cd ../..
 
+
+#echo "====================================="
+#echo "====================================="
+#echo "Collecting artifacts"
+#echo "====================================="
+#echo "====================================="
+
 #create an artifact directory
 #if [ ! -d artifacts ]; then
+#  echo "Creating artifacts folder"
 #  mkdir artifacts
 #fi
 
-#cp -R * artifacts
-#rsync -a --exclude=artifacts --exclude=.git . ./artifacts
-#cd artifacts
-#rm -rf .git
+#echo "Current directory is : $(pwd)"
+
+# Copy all Build 
+#rsync -aq * artifacts --exclude=artifacts --exclude=.git
 
 # create an archive with all the build files so we can use them in the test script
-#tar -cvf ../buildfiles.tar .
-cd ..
\ No newline at end of file
+#tar -cvf buildfiles.tar artifacts
+#cd ..

CI/ci-linux-config.sh

@@ -21,7 +21,7 @@ if [ "$COMPILER" == "gcc" ]; then
   BUILDPATH="$BUILDPATH-gcc"
 
   # without icecc: no options required
-  # OPTIONS="$OPTIONS -DCMAKE_CXX_COMPILER=/usr/lib/icecc/bin/g++ -DCMAKE_C_COMPILER=/usr/lib/icecc/bin/gcc"
+  OPTIONS="$OPTIONS -DCMAKE_CXX_COMPILER=/usr/lib/icecc/bin/g++ -DCMAKE_C_COMPILER=/usr/lib/icecc/bin/gcc"
   MAKE_OPTIONS="-j16"
   export ICECC_CXX=/usr/bin/g++ ; export ICECC_CC=/usr/bin/gcc
 
@@ -80,18 +80,20 @@ if [ "$PYTHON" == "no" ]; then
   OPTIONS="$OPTIONS -DDISABLE_OPENFLIPPER_PYTHON_SYSTEM=TRUE"
 fi
 
-if test -z "$SSH_PRIVATE_KEY" 
-then
-    echo Skipping ssh environment preparation
-else
-    # Preparing ssh environment
-    echo Prepare ssh environment
-    which ssh-agent || ( echo No SSH Agent found && exit 1 )
-    eval $(ssh-agent -s)
-    echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
-    mkdir -p ~/.ssh
-    chmod 700 ~/.ssh
-fi
+# Not in Docker, so don't mess with the keys
+
+#if test -z "$SSH_PRIVATE_KEY" 
+#then
+#    echo Skipping ssh environment preparation
+#else
+#    # Preparing ssh environment
+#    echo Prepare ssh environment
+#    which ssh-agent || ( echo No SSH Agent found && exit 1 )
+#    eval $(ssh-agent -s)
+#    echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
+#    mkdir -p ~/.ssh
+#    chmod 700 ~/.ssh
+#fi
 
 if [ ! -d "~/sw/.git" ]; then
     echo Library update skipped

CI/ci-linux-test.sh

@@ -13,57 +13,96 @@ set -e
 MY_DIR=$(dirname $(readlink -f $0))
 source CI/ci-linux-config.sh
 
+echo "====================================="
+echo "====================================="
+echo "Current Directory structure:"
+echo "====================================="
+echo "====================================="
+
 # copy artifact files to toplevel and remove subdirectory
 #mv artifacts-$BUILDPATH artifacts
 #rsync -a $MY_DIR/.. $MY_DIR/../..
 #rm -rf artifacts
 
-########################################
-# Fetch test data
-########################################
+echo "====================================="
+echo "====================================="
+echo "Cloning Test Data:"
+echo "====================================="
+echo "====================================="
+
 rm -rf TestData
-#git clone git@roosevelt:moebius/OpenFlipper-Test-Data.git TestData
 git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@www.graphics.rwth-aachen.de:9000/moebius/OpenFlipper-Test-Data.git TestData
 
 #########################################
 # Run Release Unittests
 #########################################
+# Make release build folder
+if [ ! -d $BUILDPATH ]; then
+  echo "ERROR!!! Build Path not found !!!!"
+  exit 10
+else
+  echo "Changing to build path $BUILDPATH"
+  cd $BUILDPATH
+fi
+
+
+ls
 
-cd $BUILDPATH
 
 # copy the used shared libraries to the lib folder
-cd Build
+#cd Build
 
-if [ ! -d systemlib ]; then
-  mkdir systemlib
-fi
+#if [ ! -d systemlib ]; then
+#  mkdir systemlib
+#fi
 
-ldd bin/OpenFlipper | grep "=> /" | awk '{print $3}' | xargs -I '{}' cp -v '{}' systemlib
-cd ..
+#ldd bin/OpenFlipper | grep "=> /" | awk '{print $3}' | xargs -I '{}' cp -v '{}' systemlib
+#cd ..
 
 #clean old cmake cache as the path might have changed
-#find . -name "CMakeCache.txt" -type f -delete
+find . -name "CMakeCache.txt" -type f -delete
 
 #just to be safe clean the test file definitions too
-#if [ -f CTestTestfile.cmake ]
-#then
-#	rm CTestTestfile.cmake
-#fi
+if [ -f CTestTestfile.cmake ]
+then
+	echo "Removing old CTestTestfile.cmake"
+	rm CTestTestfile.cmake
+fi
 #just to be safe clean the test file definitions too
-#if [ -f DartConfiguration.tcl ]
-#then
-#	rm DartConfiguration.tcl
-#fi
+if [ -f DartConfiguration.tcl ]
+then
+	echo "Removing old DartConfiguration.tcl"
+	rm DartConfiguration.tcl
+fi
 
-#cmake -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON $OPTIONS ../
+# Run cmake to make sure the tests are configured correctly for this system
+cmake -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON $OPTIONS ../
 
 #tell the location to the libs from build jobs
 export LD_LIBRARY_PATH=$(pwd)/Build/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=$(pwd)/Build/systemlib:$LD_LIBRARY_PATH
 
+# The tests should be build by the build job already!
 #make test
 
+echo "====================================="
+echo "====================================="
+echo "Test directory:"
+echo "====================================="
+echo "====================================="
+
+
 cd tests
+
+ls
+
+echo "====================================="
+echo "====================================="
+echo "Running tests:"
+echo "====================================="
+echo "====================================="
+
+
 bash run_tests.sh
 
 cd ..

CI/ci-windows-build.bat

@@ -13,6 +13,38 @@ call %~dp0\ci-windows-config.bat
 
 
 echo "CMAKE_CONFIGURATION: %CMAKE_CONFIGURATION%"
+s
+ECHO "============================================================="
+ECHO "============================================================="
+ECHO "Building with :"
+whoami
+ECHO "ARCHITECTURE        : %ARCHITECTURE%"
+ECHO "BUILD_PLATFORM      : %BUILD_PLATFORM%"
+ECHO "GTESTVERSION        : %GTESTVERSION%"
+ECHO "GENERATOR           : %GENERATOR%"
+ECHO "VS_PATH             : %VS_PATH%"
+ECHO "LIBPATH             : %LIBPATH%"
+ECHO "QT_INSTALL_PATH     : %QT_INSTALL_PATH%"
+ECHO "CMAKE_CONFIGURATION : %CMAKE_CONFIGURATION%"
+ECHO "============================================================="
+ECHO "============================================================="
+ECHO ""
+ECHO "Running Build environment checks"
+
+IF EXIST %LIBPATH%\ (
+  ECHO "LIBPATH ... Ok"
+) ELSE (
+  ECHO "LIBPATH not found!"
+  exit 10;
+)
+
+
+IF EXIST %QT_INSTALL_PATH%\ (
+  ECHO "QT_INSTALL_PATH ... Ok"
+) ELSE (
+  ECHO "QT_INSTALL_PATH: %QT_INSTALL_PATH%\ not found!"
+  exit 10;
+)
 
 
 mkdir rel

CI/ci-windows-deploy.bat

@@ -10,6 +10,38 @@
 ::load configuration and settings
 call %~dp0\ci-windows-config.bat
 
+ECHO "============================================================="
+ECHO "============================================================="
+ECHO "Building with :"
+whoami
+ECHO "ARCHITECTURE        : %ARCHITECTURE%"
+ECHO "BUILD_PLATFORM      : %BUILD_PLATFORM%"
+ECHO "GTESTVERSION        : %GTESTVERSION%"
+ECHO "GENERATOR           : %GENERATOR%"
+ECHO "VS_PATH             : %VS_PATH%"
+ECHO "LIBPATH             : %LIBPATH%"
+ECHO "QT_INSTALL_PATH     : %QT_INSTALL_PATH%"
+ECHO "CMAKE_CONFIGURATION : %CMAKE_CONFIGURATION%"
+ECHO "============================================================="
+ECHO "============================================================="
+ECHO ""
+ECHO "Running Build environment checks"
+
+IF EXIST %LIBPATH%\ (
+  ECHO "LIBPATH ... Ok"
+) ELSE (
+  ECHO "LIBPATH not found!"
+  exit 10;
+)
+
+
+IF EXIST %QT_INSTALL_PATH%\ (
+  ECHO "QT_INSTALL_PATH ... Ok"
+) ELSE (
+  ECHO "QT_INSTALL_PATH: %QT_INSTALL_PATH%\ not found!"
+  exit 10;
+)
+
 mkdir rel
 cd rel
 

CI/ci-windows-test.bat

@@ -11,6 +11,39 @@ git clone git@roosevelt.informatik.rwth-aachen.de:moebius/OpenFlipper-Test-Data.
 ::load configuration and settings
 call %~dp0\ci-windows-config.bat
 
+ECHO "============================================================="
+ECHO "============================================================="
+ECHO "Building with :"
+whoami
+ECHO "ARCHITECTURE        : %ARCHITECTURE%"
+ECHO "BUILD_PLATFORM      : %BUILD_PLATFORM%"
+ECHO "GTESTVERSION        : %GTESTVERSION%"
+ECHO "GENERATOR           : %GENERATOR%"
+ECHO "VS_PATH             : %VS_PATH%"
+ECHO "LIBPATH             : %LIBPATH%"
+ECHO "QT_INSTALL_PATH     : %QT_INSTALL_PATH%"
+ECHO "CMAKE_CONFIGURATION : %CMAKE_CONFIGURATION%"
+ECHO "============================================================="
+ECHO "============================================================="
+ECHO ""
+ECHO "Running Build environment checks"
+
+IF EXIST %LIBPATH%\ (
+  ECHO "LIBPATH ... Ok"
+) ELSE (
+  ECHO "LIBPATH not found!"
+  exit 10;
+)
+
+
+IF EXIST %QT_INSTALL_PATH%\ (
+  ECHO "QT_INSTALL_PATH ... Ok"
+) ELSE (
+  ECHO "QT_INSTALL_PATH: %QT_INSTALL_PATH%\ not found!"
+  exit 10;
+)
+
+
 echo %Time%: Entering rel directory ...
 ::enter build directory
 cd rel

OpenFlipper @ e3df6ae7

-Subproject commit b83d01777401fc5971f917e393494b4c3efece8d
+Subproject commit e3df6ae797609ef891b88950ace1cc8f289cb544