Debug

.gitlab-ci.yml

@@ -23,7 +23,7 @@ ci:osx:
     - /^bugfix-.*$/
   artifacts:
     paths:
-    - ./BuildServer/Unix/Build
+    - ./BuildServer/Unix/Build_macOS
     expire_in: 1 day
   tags:
     - macos10.13

BuildServer/Unix/MacOS_resources/build.py

@@ -23,8 +23,8 @@ if sys.platform.startswith('darwin'):
 		'matplotlib_backends': '-',
         'optimize': '1',
         'plist': PLIST,
-        'bdist_base': './Build/build',
-        'dist_dir': './Build/dist',
+        'bdist_base': './Build_macOS/build',
+        'dist_dir': './Build_macOS/dist',
         'graph': False,
         'xref': False,
         'packages' : ["MDANSE","MMTK","Scientific"]

BuildServer/Unix/clean.sh

@@ -12,4 +12,6 @@ echo -e "${BLUE}""Cleaning repository""${NORMAL}"
 rm -rf MDANSE_TEMPORARY_INSTALLATION_DIR
 rm -rf build
 rm -rf BuildServer/Build_Debian
-rm -rf BuildServer/Build_macOS
\ No newline at end of file
+rm -rf BuildServer/Build_macOS
+rm -rf BuildServer/Unix/Build_Debian
+rm -rf BuildServer/Unix/Build_macOS
\ No newline at end of file

BuildServer/Unix/definitions_debian.sh

@@ -4,7 +4,7 @@ export PYTHONEXE=/usr/bin/python
 # The sed -i"" is compulsory other crashes on macos
 export SED_I_COMMAND='sed -i'
 export MDANSE_SOURCE_DIR=`pwd`
-export MDANSE_TEMPORARY_INSTALLATION_DIR=${MDANSE_SOURCE_DIR}/BuildServer/Unix/Build
+export MDANSE_TEMPORARY_INSTALLATION_DIR=${MDANSE_SOURCE_DIR}/BuildServer/Unix/Build_Debian
 export PYTHONPATH=${MDANSE_TEMPORARY_INSTALLATION_DIR}/lib/python2.7/site-packages/:${PYTHONPATH}
 export RED="\\033[1;31m"
 export BLUE="\\033[1;34m"

BuildServer/Unix/definitions_macos.sh

@@ -4,7 +4,7 @@ export PYTHONEXE=/Library/Frameworks/Python.framework/Versions/2.7/bin/python
 # The sed -i"" is compulsory other crashes on macos
 export SED_I_COMMAND='sed -i ""'
 export MDANSE_SOURCE_DIR=`pwd`
-export MDANSE_TEMPORARY_INSTALLATION_DIR=${MDANSE_SOURCE_DIR}/BuildServer/Unix/Build
+export MDANSE_TEMPORARY_INSTALLATION_DIR=${MDANSE_SOURCE_DIR}/BuildServer/Unix/Build_macOS
 export PYTHONPATH=${MDANSE_TEMPORARY_INSTALLATION_DIR}/lib/python2.7/site-packages/:${PYTHONPATH}
 export RED="\\033[1;31m"
 export BLUE="\\033[1;34m"

BuildServer/Unix/deploy_macos.sh

@@ -65,6 +65,6 @@ chmod 777 ${MDANSE_SOURCE_DIR}/BuildServer/Unix/MacOS_resources//change_dylib_pa
 ${MDANSE_SOURCE_DIR}/BuildServer/Unix/MacOS_resources//change_dylib_path.sh
 
 ${MDANSE_SOURCE_DIR}/BuildServer/Unix/MacOS_resources/dmg/create-dmg --background "${MDANSE_SOURCE_DIR}/BuildServer/Unix/MacOS_resources/dmg/dmg_background.jpg" --volname "MDANSE" --window-pos 200 120 --window-size 800 400 --icon MDANSE.app 200 190 --hide-extension MDANSE.app --app-drop-link 600 185 "${MDANSE_DMG}" ${MDANSE_TEMPORARY_INSTALLATION_DIR}/dist
-move ${MDANSE_SOURCE_DIR}/BuildServer/Unix/${MDANSE_DMG} ${MDANSE_SOURCE_DIR}/BuildServer
+mv ${MDANSE_SOURCE_DIR}/BuildServer/Unix/${MDANSE_DMG} ${MDANSE_SOURCE_DIR}/BuildServer
 
 rm -rf ${MDANSE_TEMPORARY_INSTALLATION_DIR}
\ No newline at end of file