Cleaning scripts

BuildServer/Unix/Debian/definitions.sh

@@ -6,3 +6,7 @@ export PYTHONEXE=/usr/bin/python
 
 export SED_I_COMMAND=(sed -i)
 
+# Define colors
+export RED="\\033[1;31m"
+export BLUE="\\033[1;34m"
+export NORMAL="\\033[0m"

BuildServer/Unix/Debian/deploy.sh

@@ -9,7 +9,6 @@ export DISTUTILS_DEBUG=0
 #############################
 # PREPARATION
 #############################
-
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 DEBIAN_ROOT_DIR=${CI_TEMP_DIR}/dist
@@ -75,4 +74,3 @@ if [ $status -ne 0 ]; then
 	echo -e "${RED}" "Cannot build app.""${NORMAL}"
 	exit $status
 fi
-

BuildServer/Unix/MacOS/change_dylib_path.sh

@@ -12,4 +12,3 @@ do
         install_name_tool -change /usr/local/lib/libwx_$l-3.0.dylib @executable_path/../Frameworks/libwx_$l-3.0.dylib $f
     done
 done
-

BuildServer/Unix/MacOS/definitions.sh

@@ -7,3 +7,7 @@ export PYTHONEXE=/usr/bin/python
 # The sed -i"" is compulsory other crashes on macos
 export SED_I_COMMAND=(sed -i "")
 
+# Define colors
+export RED="\\033[1;31m"
+export BLUE="\\033[1;34m"
+export NORMAL="\\033[0m"

BuildServer/Unix/build.sh

@@ -52,7 +52,6 @@ ${PYTHONEXE} setup.py install --prefix=${CI_TEMP_INSTALL_DIR}
 
 status=$?
 if [ $status -ne 0 ]; then
-	echo -e "${RED}" "Failed to build MDANSE""${NORMAL}"
+	echo -e "${RED}" "Failed to build/install MDANSE""${NORMAL}"
 	exit $status
 fi
-

BuildServer/Unix/setup_ci.sh

@@ -32,10 +32,6 @@ if [ -z ${CI_COMMIT_REF_NAME} ]; then
     export CI_COMMIT_REF_NAME
 fi
 
-export RED="\\033[1;31m"
-export BLUE="\\033[1;34m"
-export NORMAL="\\033[0m"
-
 echo -e "${BLUE}""Commit id = ${CI_COMMIT_ID}""${NORMAL}"
 echo -e "${BLUE}""Branch name = ${CI_COMMIT_REF_NAME}""${NORMAL}"
 
@@ -64,5 +60,3 @@ else
 	fi
 fi
 export VERSION_NAME
-
-

BuildServer/Unix/tests.sh

@@ -3,7 +3,6 @@
 #############################
 # PREPARATION
 #############################
-
 export PYTHONPATH=${CI_TEMP_INSTALL_DIR}/lib/python2.7/site-packages:${PYTHONPATH}
 
 #############################
@@ -43,4 +42,3 @@ if [ $status -ne 0 ]; then
 	echo -e "${RED}" "One or several functional tests failed"
 	exit $status
 fi
-

BuildServer/Windows/build.bat

 @echo off
-rem VERSION_NAME
-rem MDANSE_SOURCE_DIR
-rem BUILD_TARGET
-rem MDANSE_DEPENDENCIES_DIR
-rem MDANSE_TEMPORARY_INSTALLATION_DIR
 
 rem Set the location of the MDANSE CI scripts
 set BUILD_SCRIPT_DIR=%MDANSE_SOURCE_DIR%\\BuildServer\\Windows

BuildServer/Windows/definitions.bat

@@ -24,4 +24,4 @@ set cmd="git rev-parse --short HEAD"
 for /F %%i in (' %cmd% ') do set MDANSE_GIT_CURRENT_COMMIT=%%i
 
 rem Get commit branch from Gitlab
-set MDANSE_GIT_BRANCH_NAME=%CI_COMMIT_REF_NAME%
\ No newline at end of file
+set MDANSE_GIT_BRANCH_NAME=%CI_COMMIT_REF_NAME%

BuildServer/Windows/deploy.bat

 @echo off
-rem VERSION_NAME
-rem MDANSE_SOURCE_DIR
-rem BUILD_TARGET
-rem MDANSE_DEPENDENCIES_DIR
-rem MDANSE_TEMPORARY_INSTALLATION_DIR
 
 cd %MDANSE_SOURCE_DIR%
 

BuildServer/Windows/setup_ci.bat

@@ -26,4 +26,4 @@ if "%MDANSE_GIT_BRANCH_NAME%" == "master" (
         set VERSION_NAME=%MDANSE_VERSION%-beta-%MDANSE_GIT_CURRENT_COMMIT%
         sed -i "s/.*__beta__.*/__beta__ = \"beta\"/" MDANSE/__pkginfo__.py
     )
-)
\ No newline at end of file
+)

BuildServer/Windows/tests.bat

 @echo off
-rem VERSION_NAME
-rem MDANSE_SOURCE_DIR
-rem BUILD_TARGET
-rem MDANSE_DEPENDENCIES_DIR
-rem MDANSE_TEMPORARY_INSTALLATION_DIR
 
 :: %1 --> the build target