Commit 8edc4ce5 authored by eric pellegrini's avatar eric pellegrini Committed by Remi Perenon

Updated files with MDANSE to Src renaming

parent a2b9347e
...@@ -35,7 +35,7 @@ cp ${SCRIPT_DIR}/Resources/MDANSE.desktop ${DEBIAN_APP_DIR}/ ...@@ -35,7 +35,7 @@ cp ${SCRIPT_DIR}/Resources/MDANSE.desktop ${DEBIAN_APP_DIR}/
# Build the /usr/share/pixmaps directory inside the debian root directory and copy the mdanse icon file inside # Build the /usr/share/pixmaps directory inside the debian root directory and copy the mdanse icon file inside
DEBIAN_PIXMAPS_DIR=${DEBIAN_ROOT_DIR}/usr/share/pixmaps DEBIAN_PIXMAPS_DIR=${DEBIAN_ROOT_DIR}/usr/share/pixmaps
mkdir -p ${DEBIAN_PIXMAPS_DIR} mkdir -p ${DEBIAN_PIXMAPS_DIR}
cp ${CI_PROJECT_DIR}/MDANSE/GUI/Icons/mdanse.png ${DEBIAN_PIXMAPS_DIR}/ cp ${CI_PROJECT_DIR}/Src/GUI/Icons/mdanse.png ${DEBIAN_PIXMAPS_DIR}/
# Build the /usr/local/bin directory inside the debian root directory and copy the mdanse scripts inside # Build the /usr/local/bin directory inside the debian root directory and copy the mdanse scripts inside
DEBIAN_BIN_DIR=${DEBIAN_ROOT_DIR}/usr/local/bin DEBIAN_BIN_DIR=${DEBIAN_ROOT_DIR}/usr/local/bin
......
...@@ -20,7 +20,7 @@ if sys.platform.startswith('darwin'): ...@@ -20,7 +20,7 @@ if sys.platform.startswith('darwin'):
} }
OPTIONS = { OPTIONS = {
'argv_emulation': False,# has to be False otherwise triggers problems with wxPython which lose some events that are captured by OS 'argv_emulation': False,# has to be False otherwise triggers problems with wxPython which lose some events that are captured by OS
'iconfile': os.path.join(project_dir,'MDANSE','GUI','Icons','mdanse.icns'), 'iconfile': os.path.join(project_dir,'Src','GUI','Icons','mdanse.icns'),
'excludes': 'PyQt4', 'excludes': 'PyQt4',
'matplotlib_backends': '-', 'matplotlib_backends': '-',
'optimize': '1', 'optimize': '1',
......
...@@ -35,7 +35,7 @@ fi ...@@ -35,7 +35,7 @@ fi
echo -e "${BLUE}""Commit id = ${CI_COMMIT_ID}""${NORMAL}" echo -e "${BLUE}""Commit id = ${CI_COMMIT_ID}""${NORMAL}"
echo -e "${BLUE}""Branch name = ${CI_COMMIT_REF_NAME}""${NORMAL}" echo -e "${BLUE}""Branch name = ${CI_COMMIT_REF_NAME}""${NORMAL}"
PKG_INFO=${CI_PROJECT_DIR}/MDANSE/__pkginfo__.py PKG_INFO=${CI_PROJECT_DIR}/Src/__pkginfo__.py
# Update the __pkginfo__ file with the current commit # Update the __pkginfo__ file with the current commit
"${SED_I_COMMAND[@]}" "s/.*__commit__.*/__commit__ = \"${CI_COMMIT_ID}\"/" ${PKG_INFO} "${SED_I_COMMAND[@]}" "s/.*__commit__.*/__commit__ = \"${CI_COMMIT_ID}\"/" ${PKG_INFO}
......
...@@ -7,23 +7,23 @@ rem To understand this syntax "set cmd=...... for /F %%ii ......", see https://s ...@@ -7,23 +7,23 @@ rem To understand this syntax "set cmd=...... for /F %%ii ......", see https://s
rem Update the __pkginfo__ file with the current commit rem Update the __pkginfo__ file with the current commit
echo "Commit id %MDANSE_GIT_CURRENT_COMMIT%" echo "Commit id %MDANSE_GIT_CURRENT_COMMIT%"
echo "Branch name %MDANSE_GIT_BRANCH_NAME%" echo "Branch name %MDANSE_GIT_BRANCH_NAME%"
sed -i "s/.*__commit__.*/__commit__ = \"%MDANSE_GIT_CURRENT_COMMIT%\"/" MDANSE/__pkginfo__.py sed -i "s/.*__commit__.*/__commit__ = \"%MDANSE_GIT_CURRENT_COMMIT%\"/" Src/__pkginfo__.py
rem Get MDANSE version rem Get MDANSE version
set cmd="sed -n "s/__version__.*=.*\"\(.*\)\"/\1/p" MDANSE/__pkginfo__.py" set cmd="sed -n "s/__version__.*=.*\"\(.*\)\"/\1/p" Src/__pkginfo__.py"
for /F %%i in (' %cmd% ') do set MDANSE_VERSION=%%i for /F %%i in (' %cmd% ') do set MDANSE_VERSION=%%i
rem Check if branch is master, tag as draft otherwise rem Check if branch is master, tag as draft otherwise
if "%MDANSE_GIT_BRANCH_NAME%" == "master" ( if "%MDANSE_GIT_BRANCH_NAME%" == "master" (
set VERSION_NAME=%MDANSE_VERSION% set VERSION_NAME=%MDANSE_VERSION%
sed -i "s/.*__beta__.*/__beta__ = None/" MDANSE/__pkginfo__.py sed -i "s/.*__beta__.*/__beta__ = None/" Src/__pkginfo__.py
) else ( ) else (
rem Check if branch is release* rem Check if branch is release*
if "%MDANSE_GIT_BRANCH_NAME:~0,7%" == "release" ( if "%MDANSE_GIT_BRANCH_NAME:~0,7%" == "release" (
set VERSION_NAME=%MDANSE_VERSION%-rc-%MDANSE_GIT_CURRENT_COMMIT% set VERSION_NAME=%MDANSE_VERSION%-rc-%MDANSE_GIT_CURRENT_COMMIT%
sed -i "s/.*__beta__.*/__beta__ = \"rc\"/" MDANSE/__pkginfo__.py sed -i "s/.*__beta__.*/__beta__ = \"rc\"/" Src/__pkginfo__.py
) else ( ) else (
set VERSION_NAME=%MDANSE_VERSION%-beta-%MDANSE_GIT_CURRENT_COMMIT% set VERSION_NAME=%MDANSE_VERSION%-beta-%MDANSE_GIT_CURRENT_COMMIT%
sed -i "s/.*__beta__.*/__beta__ = \"beta\"/" MDANSE/__pkginfo__.py sed -i "s/.*__beta__.*/__beta__ = \"beta\"/" Src/__pkginfo__.py
) )
) )
#!/bin/sh #!/bin/sh
cd ../Tests/ cd ../Tests/
coverage run --source=../MDANSE/ ../Tests/AllTests.py coverage run --source=../Src/ ../Tests/AllTests.py
coverage html --omit=../MDANSE/Externals/*,../MDANSE/GUI/*,../MDANSE/Framework/Plugins/*,../MDANSE/Framework/ConfiguratorWidgets/* coverage html --omit=../Src/Externals/*,../Src/GUI/*,../Src/Framework/Plugins/*,../Src/Framework/ConfiguratorWidgets/*
...@@ -3,11 +3,11 @@ include LICENCE ...@@ -3,11 +3,11 @@ include LICENCE
recursive-include Extensions/qhull_lib *.h *c *.pxd recursive-include Extensions/qhull_lib *.h *c *.pxd
recursive-include MDANSE/GUI/Resources/Icons *.png recursive-include Src/GUI/Resources/Icons *.png
include MDANSE/Data/elements_database.csv include Src/Data/elements_database.csv
include MDANSE/Data/Atoms/* include Src/Data/Atoms/*
recursive-include Data * recursive-include Data *
......
...@@ -4,8 +4,8 @@ VERSION=$1 ...@@ -4,8 +4,8 @@ VERSION=$1
# Update version number to python source code (will appear in "About..." dialog) # Update version number to python source code (will appear in "About..." dialog)
# see http://stackoverflow.com/questions/7648328/getting-sed-error # see http://stackoverflow.com/questions/7648328/getting-sed-error
sed -i "s/.*__version__.*/__version__ = \"${VERSION}\"/" MDANSE/__pkginfo__.py sed -i "s/.*__version__.*/__version__ = \"${VERSION}\"/" Src/__pkginfo__.py
# Update the date of the version # Update the date of the version
sed -i "s/.*__date__.*/__date__ = \"`date +"%d-%m-%Y"`\"/" MDANSE/__pkginfo__.py sed -i "s/.*__date__.*/__date__ = \"`date +"%d-%m-%Y"`\"/" Src/__pkginfo__.py
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment