Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Scientific Software
MDANSE
Commits
60a019ed
Commit
60a019ed
authored
Mar 10, 2017
by
eric pellegrini
Browse files
Merge branch 'release-1.0.9'
parents
89b3549e
bf01d166
Pipeline
#1522
passed with stages
in 20 minutes and 44 seconds
Changes
12
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
BuildServer/Darwin/Scripts/package.sh
deleted
100755 → 0
View file @
89b3549e
#!/bin/bash
# This script is to package the nMolDyn package for Mac OS X
#############################
# CONFIGURATION
#############################
## Add some colors
VERT
=
"
\\
033[1;32m"
NORMAL
=
"
\\
033[0;39m"
ROUGE
=
"
\\
033[1;31m"
ROSE
=
"
\\
033[1;35m"
BLEU
=
"
\\
033[1;34m"
BLANC
=
"
\\
033[0;02m"
BLANCLAIR
=
"
\\
033[1;08m"
JAUNE
=
"
\\
033[1;33m"
CYAN
=
"
\\
033[1;36m"
if
[
-n
"
${
RUN_NIGHTLY_BUILD
}
"
]
then
VERSION_NAME
=
"devel"
else
if
[[
${
CI_BUILD_TAG
}
=
~ ^v
([
0-9]+
\.
[
0-9]+
\.
[
0-9]+
)
$
]]
then
VERSION_NAME
=
${
BASH_REMATCH
[1]
}
else
echo
-e
"
$ROUGE
""Invalid version number
${
CI_BUILD_TAG
}
"
"
$NORMAL
"
exit
fi
fi
export
VERSION_NAME
##Select the build target
BUILD_TARGET
=
darwin
cd
../../../
# old way to get MDANSE version
#declare -x MDANSE_VERSION=$(perl -pe '($_)=/([0-9]+([.][0-9]+)+)/' MDANSE/__pkginfo__.py)
# Which version name are we appending to the final archive
TARGET_DIR
=
MDANSE-
${
VERSION_NAME
}
-
${
BUILD_TARGET
}
# take the latest version of nmoldyn available on the forge
echo
-e
"
$BLEU
""Getting last MDANSE revision"
"
$NORMAL
"
# Get revision number from git (without trailing newline)
REV_NUMBER
=
$(
git rev-list
--count
HEAD
)
echo
-e
"
$BLEU
""Revision number =
${
REV_NUMBER
}
"
"
$NORMAL
"
# Add current revision number to python source code (will appear in "About..." dialog)
# see http://stackoverflow.com/questions/7648328/getting-sed-error
sed
-i
''
's/.*__version__.*/__version__ = \"${VERSION_NAME}\"/'
MDANSE/__pkginfo__.py
sed
-i
''
's/.*__revision__.*/__revision__ = \"${REV_NUMBER}\"/'
MDANSE/__pkginfo__.py
# Now build last version and install it in our homebrewed python
echo
-e
"
$BLEU
""Building MDANSE"
"
$NORMAL
"
# Clean up temporary build directories
rm
-rf
build
rm
-rf
dist
# Remove previous install of MDANSE
rm
/usr/local/bin/mdanse
*
rm
/usr/local/lib/python2.7/site-packages/MDANSE
*
.egg-info
rm
-rf
/usr/local/lib/python2.7/site-packages/MDANSE
# Build and install MDANSE to the homebrewed python
/usr/local/bin/python setup.py build
>>
BuildServer/Darwin/Scripts/build_log.txt 2>&1
/usr/local/bin/python setup.py
install
>>
BuildServer/Darwin/Scripts/build_log.txt 2>&1
# Performs the unit tests
cd
Tests/UnitTests
nosetests
--verbosity
=
3
-P
.
cd
../..
cd
Tests/FunctionalTests/Jobs
python BuildJobTests.py
nosetests
--verbosity
=
3
--exe
-P
.
cd
../../..
echo
-e
"
$BLEU
""Packaging MDANSE"
"
$NORMAL
"
rm
-rf
BuildServer/Darwin/Build
mkdir
BuildServer/Darwin/Build
# debug option for py2app, if needed
export
DISTUTILS_DEBUG
=
0
cd
BuildServer/Darwin/Scripts
/usr/local/bin/python build.py py2app
>>
build_log.txt 2>&1
rc
=
$?
if
[[
$rc
!=
0
]]
;
then
echo
-e
"
$ROUGE
""Cannot build app."
"
$NORMAL
"
exit
1
fi
cd
../Build
# Do some manual cleanup, e.g.
# matplotlib/tests ==> 45.2 Mb
rm
-rf
dist/MDANSE.app/Contents/Resources/lib/python2.7/matplotlib/tests
rm
-rf
dist/MDANSE.app/Contents/Resources/mpl-data/sample_data
MDANSE_DMG
=
MDANSE-
${
VERSION_NAME
}
-
${
BUILD_TARGET
}
.dmg
#Add MDANSE version file (should read the version from the bundle with pyobjc, but will figure that out later)
echo
"
${
VERSION_NAME
}
"
>
dist/MDANSE.app/Contents/Resources/version
rm
-f
./
${
MDANSE_DMG
}
rm
-f
./rw.
${
MDANSE_DMG
}
hdiutil unmount /Volumes/MDANSE
-force
-quiet
sleep
5
../Tools/create-dmg/create-dmg
--background
"../Resources/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
}
"
./dist
exit
BuildServer/Darwin/Scripts/run_build.sh
View file @
60a019ed
...
...
@@ -17,7 +17,7 @@ BUILD_TARGET=darwin
echo
-e
"
$BLEU
""Getting last MDANSE revision"
"
$NORMAL
"
# Update the __pkginfo__ file with the current commit. The sed -i "" is compulsory other crashes on macos
COMMIT_ID
=
$(
git rev-parse HEAD
)
COMMIT_ID
=
$(
git rev-parse
--short
HEAD
)
sed
-i
""
"s/.*__commit__.*/__commit__ =
\"
${
COMMIT_ID
}
\"
/"
MDANSE/__pkginfo__.py
# Get revision number from git (without trailing newline)
...
...
BuildServer/Darwin/Scripts/run_deploy.sh
View file @
60a019ed
...
...
@@ -10,7 +10,7 @@
ROUGE
=
"
\\
033[1;31m"
BLEU
=
"
\\
033[1;34m"
COMMIT_ID
=
$(
git rev-parse HEAD
)
COMMIT_ID
=
$(
git rev-parse
--short
HEAD
)
VERSION_NAME
=
`
sed
-n
's/__version__.*=.*\"\(.*\)\"/\1/p'
MDANSE/__pkginfo__.py
`
if
[[
${
CI_BUILD_REF_NAME
}
=
~ develop
]]
...
...
BuildServer/Debian/DEBIAN/copyright
View file @
60a019ed
...
...
@@ -3,10 +3,28 @@ Upstream-Name: mdanse
Upstream-Contact: Eric Pellegrini <pellegrini@ill.fr>
Source: https://mdanse.org/
Files: *
Copyright: Copyright 2016, Eric Pellegrini <pellegrini@ill.fr>
License: GPL-3.0
Files: debian/*
Copyright:
©
2016, Eric Pellegrini <pellegrini@ill.fr>
License: GPL-3
+
Copyright:
Copyright
2016, Eric Pellegrini <pellegrini@ill.fr>
License: GPL-3
.0
On Debian systems, you can find the full text of the GNU General Public
License v3 in `/usr/share/common-licenses/GPL-3'.
License: GPL-3.0
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
On Debian systems, you can find the full text of the GNU General Public
License v3 in `/usr/share/common-licenses/GPL-3'.
BuildServer/Debian/build_deb.sh
deleted
100755 → 0
View file @
89b3549e
#!/bin/bash
export
ARCH
=
$1
export
DISTRO
=
$2
#############################
# CONFIGURATION
#############################
## Add some colors
VERT
=
"
\\
033[1;32m"
NORMAL
=
"
\\
033[0;39m"
ROUGE
=
"
\\
033[1;31m"
ROSE
=
"
\\
033[1;35m"
BLEU
=
"
\\
033[1;34m"
BLANC
=
"
\\
033[0;02m"
BLANCLAIR
=
"
\\
033[1;08m"
JAUNE
=
"
\\
033[1;33m"
CYAN
=
"
\\
033[1;36m"
if
[
-n
"
${
RUN_NIGHTLY_BUILD
}
"
]
then
VERSION_NAME
=
"devel"
else
if
[[
$CI_BUILD_TAG
=
~ ^v
([
0-9]+
\.
[
0-9]+
\.
[
0-9]+
)
$
]]
;
then
VERSION_NAME
=
${
BASH_REMATCH
[1]
}
else
echo
-e
"
$ROUGE
""Invalid version number
${
CI_BUILD_TAG
}
"
"
$NORMAL
"
exit
fi
fi
##Select the build target
BUILD_TARGET
=
debian
cd
cd
$CI_PROJECT_DIR
# Get revision number from git (without trailing newline)
REV_NUMBER
=
$(
git rev-list
--count
HEAD
)
echo
-e
"
$BLEU
""Revision number =
${
REV_NUMBER
}
<--"
"
$NORMAL
"
# Add current revision number to python source code (will appear in "About..." dialog)
# see http://stackoverflow.com/questions/7648328/getting-sed-error
sed
-i
"s/.*__version__.*/__version__ =
\"
${
VERSION_NAME
}
\"
/"
MDANSE/__pkginfo__.py
sed
-i
"s/.*__revision__.*/__revision__ =
\"
${
REV_NUMBER
}
\"
/"
MDANSE/__pkginfo__.py
sed
-i
"s/.*__date__.*/__date__ =
\"
`
date
+
"%d-%m-%Y"
`
\"
/"
MDANSE/__pkginfo__.py
#MDANSE_VERSION=$(grep -Po '(?<=__version__ = \")\d.\d.\d' MDANSE/__pkginfo__.py)
# Now build last version
echo
"
$BLEU
""Building MDANSE"
"
$NORMAL
"
python setup.py build
export
PYTHONPATH
=
${
PWD
}
/build/lib.linux-x86_64-2.7
# Performs the unit tests
cd
Tests/UnitTests
nosetests
--verbosity
=
3
-P
.
cd
../..
cd
Tests/FunctionalTests/Jobs
python BuildJobTests.py
nosetests
--verbosity
=
3
--exe
-P
.
cd
../../..
echo
"
$BLEU
""Build debian tree"
"
$NORMAL
"
# Set automatically the good version number for the Debian control file
sed
-i
"s/Version:.*/Version:
${
VERSION_NAME
}
/g"
BuildServer/Debian/DEBIAN/control
DEBIAN_ROOT_DIR
=
BuildServer/Debian/Build
# Copy all the debian files (e.g. control, copyright, md5sum ...) into DEBIAN directory
mkdir
${
DEBIAN_ROOT_DIR
}
cp
-r
BuildServer/Debian/DEBIAN
${
DEBIAN_ROOT_DIR
}
/
chmod
-R
755
${
DEBIAN_ROOT_DIR
}
/DEBIAN
# Build the /usr/share/applications directory inside the debian root directory and copy the mdanse desktop file inside
DEBIAN_APP_DIR
=
${
DEBIAN_ROOT_DIR
}
/usr/share/applications
mkdir
-p
${
DEBIAN_APP_DIR
}
cp
BuildServer/Debian/MDANSE.desktop
${
DEBIAN_APP_DIR
}
/
# 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
mkdir
-p
${
DEBIAN_PIXMAPS_DIR
}
cp
MDANSE/GUI/Icons/mdanse.png
${
DEBIAN_PIXMAPS_DIR
}
/
# 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
mkdir
-p
${
DEBIAN_BIN_DIR
}
cp
build/scripts-2.7/
*
${
DEBIAN_BIN_DIR
}
/
dos2unix
${
DEBIAN_BIN_DIR
}
/mdanse_
*
# Build the usr/local/lib/python2.7/dist-packages directory inside the debian root directory and copy the MDANSE package inside
DEBIAN_DIST_DIR
=
${
DEBIAN_ROOT_DIR
}
/usr/local/lib/python2.7/dist-packages
mkdir
-p
${
DEBIAN_DIST_DIR
}
cp
-r
build/lib.linux-x86_64-2.7/MDANSE
${
DEBIAN_DIST_DIR
}
# also copy the localy installed ScientificPython and MMTK
cp
-r
/usr/local/lib/python2.7/dist-packages/Scientific
*
${
DEBIAN_DIST_DIR
}
cp
-r
/usr/local/lib/python2.7/dist-packages/MMTK
*
${
DEBIAN_DIST_DIR
}
# Compute the Installed-Size field for the debian package
instSize
=
$(
du
${
DEBIAN_ROOT_DIR
}
-b
-s
|
cut
-f1
)
sed
-i
"s/Installed-Size:.*/Installed-Size:
$((
1
+(
instSize/1024
))
)/g"
${
DEBIAN_ROOT_DIR
}
/DEBIAN/control
export
TMPDIR
=
.
fakeroot dpkg-deb
-b
${
DEBIAN_ROOT_DIR
}
${
DEBIAN_ROOT_DIR
}
/MDANSE-
${
VERSION_NAME
}
-
${
DISTRO
}
-
${
ARCH
}
.deb
BuildServer/Debian/run_build.sh
View file @
60a019ed
...
...
@@ -14,7 +14,7 @@ cd
cd
$CI_PROJECT_DIR
# Update the __pkginfo__ file with the current commit
COMMIT_ID
=
$(
git rev-parse HEAD
)
COMMIT_ID
=
$(
git rev-parse
--short
HEAD
)
sed
-i
"s/.*__commit__.*/__commit__ =
\"
${
COMMIT_ID
}
\"
/"
MDANSE/__pkginfo__.py
# Get revision number from git (without trailing newline)
...
...
BuildServer/Debian/run_deploy.sh
View file @
60a019ed
...
...
@@ -11,7 +11,7 @@ export DISTRO=$2
ROUGE
=
"
\\
033[1;31m"
BLEU
=
"
\\
033[1;34m"
COMMIT_ID
=
$(
git rev-parse HEAD
)
COMMIT_ID
=
$(
git rev-parse
--short
HEAD
)
VERSION_NAME
=
`
sed
-n
's/__version__.*=.*\"\(.*\)\"/\1/p'
MDANSE/__pkginfo__.py
`
if
[[
${
CI_BUILD_REF_NAME
}
=
~ develop
]]
...
...
BuildServer/Windows/package.sh
deleted
100755 → 0
View file @
89b3549e
#!/bin/bash
# RUN FROM c:\cygwin64\bin\bash c:\Users\Administrateur\Desktop\BUILD\package.sh
#############################
# CONFIGURATION
#############################
TASK
=
$1
if
[
"
$TASK
"
!=
"setup"
]
&&
[
"
$TASK
"
!=
"build"
]
&&
[
"
$TASK
"
!=
"test"
]
;
then
echo
"Unrecognized task ! [ setup | build | test ]"
exit
1
fi
if
[
!
$2
]
;
then
BUILD_TARGET
=
"win-amd64"
else
BUILD_TARGET
=
$2
fi
if
[
-n
"
${
RUN_NIGHTLY_BUILD
}
"
]
then
VERSION_NAME
=
"devel"
else
if
[[
${
CI_BUILD_TAG
}
=
~ ^v
([
0-9]+
\.
[
0-9]+
\.
[
0-9]+
)
$
]]
then
VERSION_NAME
=
${
BASH_REMATCH
[1]
}
else
echo
"Invalid version number
${
CI_BUILD_TAG
}
"
exit
fi
fi
if
[
"
$BUILD_TARGET
"
=
"win32"
]
;
then
PYTHON_SUFFIX
=
""
MSVC_BUILD_TARGET
=
"/x86"
elif
[
"
$BUILD_TARGET
"
=
"win-amd64"
]
;
then
PYTHON_SUFFIX
=
".amd64"
MSVC_BUILD_TARGET
=
"/x64"
else
echo
"Unrecognized build target ! [ win32 | win-amd64]"
exit
1
# signal error
fi
##Which versions of external programs to use
PYTHON_VERSION
=
2.7.6
CI_PROJECT_DIR_WIN
=
$(
cygpath
-a
-w
${
CI_PROJECT_DIR
}
)
# Change working directory to the directory the script is in
# http://stackoverflow.com/a/246128
#SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
SCRIPT_DIR
=
"
${
CI_PROJECT_DIR
}
/BuildServer/Windows"
# This is the directory that will contain the temporary installation
TARGET_DIR
=
"
${
CI_PROJECT_DIR_WIN
}
\\
BuildServer
\\
Windows
\\
Build"
TARGET_DIR_CYGWIN
=
$(
cygpath
-u
$TARGET_DIR
)
function
extract
{
echo
"Extracting
$*
"
echo
"7z x -y
$*
"
>>
log.txt
7z x
-y
$*
>>
log.txt
}
#############################
# Build the packages
#############################
cd
"
${
SCRIPT_DIR
}
"
if
[
$TASK
=
"setup"
]
;
then
if
[
-e
"
$TARGET_DIR_CYGWIN
"
]
;
then
echo
"Removing previous target dir :
$TARGET_DIR_CYGWIN
"
rm
-rf
${
TARGET_DIR_CYGWIN
}
fi
DEPENDENCIES_DIR
=
${
CI_WINDOWS_DEPENDENCIES_PATH_UNIX
}
/
${
BUILD_TARGET
}
PYTHON_MSI
=
python-
${
PYTHON_VERSION
}${
PYTHON_SUFFIX
}
.msi
PYTHON_MSI_WIN
=
${
CI_WINDOWS_DEPENDENCIES_PATH
}
\\
${
BUILD_TARGET
}
\\
${
PYTHON_MSI
}
echo
"Extracting python
${
PYTHON_MSI_WIN
}
in
${
TARGET_DIR
}
"
cmd /c
"msiexec /L* pythonlog.txt /qn /a
${
PYTHON_MSI_WIN
}
TARGETDIR=
${
TARGET_DIR
}
"
# Exit now if something goes wrong
if
[
$?
-ne
0
]
;
then
status
=
$?
echo
"Failed to extract python"
exit
status
fi
#Clean up python a bit, to keep the package size down
echo
"Cleaning up Python"
rm
-rf
${
TARGET_DIR_CYGWIN
}
/Doc
rm
-rf
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages
rm
-rf
${
TARGET_DIR_CYGWIN
}
/Lib/test
rm
-rf
${
TARGET_DIR_CYGWIN
}
/Tools/Scripts
rm
-rf
${
TARGET_DIR_CYGWIN
}
/tcl
rm
-f
${
TARGET_DIR_CYGWIN
}
/NEWS.txt
rm
-f
${
TARGET_DIR_CYGWIN
}
/
${
PYTHON_MSI
}
mkdir
-p
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages
mkdir
-p
${
TARGET_DIR_CYGWIN
}
/Scripts
cd
${
DEPENDENCIES_DIR
}
echo
"Extracting dependencies"
# extract numpy
extract numpy-MKL-1.8.0.
${
BUILD_TARGET
}
-py2
.7.exe PLATLIB
# extract matplotlib and its dependencies
extract pyparsing-2.0.1.
${
BUILD_TARGET
}
-py2
.7.exe PURELIB
extract python-dateutil-2.2.
${
BUILD_TARGET
}
-py2
.7.exe PURELIB
extract pytz-2013.9.
${
BUILD_TARGET
}
-py2
.7.exe PURELIB
extract six-1.5.2.
${
BUILD_TARGET
}
-py2
.7.exe PURELIB
extract matplotlib-1.3.1.
${
BUILD_TARGET
}
-py2
.7.exe PLATLIB
#extract Cython
extract Cython-0.19.2.
${
BUILD_TARGET
}
-py2
.7.exe PLATLIB
extract Cython-0.19.2.
${
BUILD_TARGET
}
-py2
.7.exe SCRIPTS
# extract Pyro
extract Pyro-3.16.
${
BUILD_TARGET
}
.exe PURELIB
# extract Sphinx and its dependencies
extract alabaster-0.7.5.
${
BUILD_TARGET
}
.exe PURELIB
extract Pygments-2.0.2.
${
BUILD_TARGET
}
.exe PURELIB
extract Pygments-2.0.2.
${
BUILD_TARGET
}
.exe SCRIPTS
extract Babel-1.3.
${
BUILD_TARGET
}
.exe PURELIB
extract Babel-1.3.
${
BUILD_TARGET
}
.exe SCRIPTS
extract MarkupSafe-0.23.
${
BUILD_TARGET
}
-py2
.7.exe PLATLIB
extract Jinja2-2.7.3.
${
BUILD_TARGET
}
.exe PURELIB
extract docutils-0.12.
${
BUILD_TARGET
}
.exe PURELIB
extract docutils-0.12.
${
BUILD_TARGET
}
.exe SCRIPTS
extract Sphinx-1.3.1.
${
BUILD_TARGET
}
.exe PURELIB
extract sphinx_rtd_theme-0.1.8.
${
BUILD_TARGET
}
.exe PURELIB
extract nose-1.3.7.
${
BUILD_TARGET
}
.exe PURELIB
extract nose-1.3.7.
${
BUILD_TARGET
}
.exe SCRIPTS
# extract VTK
extract VTK-5.10.1.
${
BUILD_TARGET
}
-py2
.7.exe PURELIB
# extract wxPython and its dependencies
extract wxPython-common-2.8.12.1.
${
BUILD_TARGET
}
-py2
.7.exe PURELIB
extract wxPython-2.8.12.1.
${
BUILD_TARGET
}
-py2
.7.exe PLATLIB
# extract ScientificPython
extract ScientificPython-2.9.2.
${
BUILD_TARGET
}
-py2
.7.exe DATA
extract ScientificPython-2.9.2.
${
BUILD_TARGET
}
-py2
.7.exe PLATLIB
extract ScientificPython-2.9.2.
${
BUILD_TARGET
}
-py2
.7.exe SCRIPTS
# extract MMTK
extract MMTK-2.7.6.
${
BUILD_TARGET
}
-py2
.7.exe PLATLIB
# move the packages to the target directory
echo
"Moving dependencies to
${
BUILD_TARGET
}
"
mv
PLATLIB/numpy
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/numpy
mv
PURELIB/dateutil
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/dateutil
mv
PURELIB/pyparsing.py
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/pyparsing.py
mv
PURELIB/pytz
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/pytz
mv
PURELIB/six.py
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/six.py
mv
PLATLIB/matplotlib
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/matplotlib
mv
PLATLIB/Cython
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/Cython
mv
SCRIPTS/cython.py
${
TARGET_DIR_CYGWIN
}
/Scripts/cython.py
cp
${
TARGET_DIR
}
/Scripts/cython.py
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/
mv
PURELIB/Pyro
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/Pyro
mv
PURELIB/alabaster
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/alabaster
mv
PURELIB/pygments
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/pygments
mv
SCRIPTS/pygment
*
${
TARGET_DIR_CYGWIN
}
/Scripts/
mv
PURELIB/babel
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/babel
mv
SCRIPTS/pybabel
*
${
TARGET_DIR_CYGWIN
}
/Scripts/
mv
PLATLIB/markupsafe
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/markupsafe
mv
PURELIB/jinja2
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/jinja2
mv
PURELIB/docutils
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/docutils
mv
SCRIPTS/rst
*
${
TARGET_DIR_CYGWIN
}
/Scripts/
mv
PURELIB/sphinx
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/sphinx
mv
PURELIB/sphinx_rtd_theme
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/sphinx_rtd_theme
mv
PURELIB/nose
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/nose
mv
SCRIPTS/nosetests
${
TARGET_DIR_CYGWIN
}
/Scripts/
mv
PURELIB/vtk
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/vtk
mv
PURELIB/wx.pth
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/
mv
PURELIB/wxversion.py
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/
mv
PLATLIB/wx-2.8-msw-unicode
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/wx-2.8-msw-unicode
echo
"package='NumPy'"
>>
PLATLIB/Scientific/N.py
mv
PLATLIB/Scientific
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/Scientific
# this is a hack due to a bug introduced by Konrad in version 2.9.2 of Scientific: the N.package is not defined anymore
# which triggers erros for modules that used N.package (e.g. MMTK.Random)
mv
DATA/Lib/site-packages/Scientific/netcdf3.dll
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/Scientific
mv
SCRIPTS/task_manager
${
TARGET_DIR_CYGWIN
}
/Scripts/task_manager
mv
PLATLIB/MMTK
${
TARGET_DIR_CYGWIN
}
/Lib/site-packages/MMTK
rm
-rf
DATA
rm
-rf
PLATLIB
rm
-rf
PURELIB
rm
-rf
SCRIPTS
cd
${
SCRIPT_DIR
}
rm
pythonlog.txt
elif
[
$TASK
=
"build"
]
;
then
cd
${
CI_PROJECT_DIR
}
# Get revision number from GIT
REV_NUMBER
=
$(
git rev-list
--count
HEAD
)
echo
"Revision number is
$REV_NUMBER
"
# Add current revision number to python source code (will appear in "About..." dialog)
sed
-i
''
's/.*__version__.*/__version__ = \"${VERSION_NAME}\"/'
MDANSE/__pkginfo__.py
sed
-i
''
's/.*__revision__.*/__revision__ = \"${REV_NUMBER}\"/'
MDANSE/__pkginfo__.py
# setup the environment for a visual studio build of MDANSE using microsoft SDK 7.0 and build MDANSE
echo
"MDANSE setup and build"
# go back to the installation base directory
cd
${
SCRIPT_DIR
}
cmd /V:ON /E:ON /C
"setup_and_build.bat"
"
${
CI_PROJECT_DIR_WIN
}
"
"
${
TARGET_DIR
}
"
${
MSVC_BUILD_TARGET
}
# Exit now if unable to build
if
[
$?
-ne
0
]
;
then
status
=
$?
echo
"Failed to build MDANSE"
exit
status
fi
echo
"Running tests"
cmd /V:ON /E:ON /C
"run_tests.bat"
"
${
TARGET_DIR
}
"
"
${
CI_PROJECT_DIR_WIN
}
"
# Exit now if unable to build
if
[
$?
-ne
0
]
;
then
status
=
$?
echo
"One or several unit tests failed"
exit
status
fi
cd
${
CI_PROJECT_DIR
}
# Other way to fetch the current version without python
#MDANSE_VERSION=$(grep -Po '(?<=__version__ = \")\d.\d.\d' MDANSE/__pkginfo__.py)
cd
${
SCRIPT_DIR
}
echo
"Packaging"
# create the MDANSE installer
echo
"Creating nsis installer for target
${
BUILD_TARGET
}
..."
makensis /V4 /ONSISlog.txt /DVERSION
=
${
VERSION_NAME
}
/DARCH
=
${
BUILD_TARGET
}
/DTARGET_DIR
=
"
${
TARGET_DIR
}
"
MDANSE_installer.nsi
fi
BuildServer/Windows/run_build.sh
View file @
60a019ed
...
...
@@ -195,7 +195,7 @@ rm pythonlog.txt
cd
${
CI_PROJECT_DIR
}
# Update the __pkginfo__ file with the current commit
COMMIT_ID
=
$(
git rev-parse HEAD
)
COMMIT_ID
=
$(
git rev-parse
--short
HEAD
)
sed
-i
"s/.*__commit__.*/__commit__ =
\"
${
COMMIT_ID
}
\"
/"
MDANSE/__pkginfo__.py
# Get revision number from GIT
...
...
BuildServer/Windows/run_deploy.sh
View file @
60a019ed
...
...
@@ -12,7 +12,7 @@ else
BUILD_TARGET
=
$1
fi
COMMIT_ID
=
$(
git rev-parse HEAD
)
COMMIT_ID
=
$(
git rev-parse
--short
HEAD
)
VERSION_NAME
=
`
sed
-n
's/__version__.*=.*\"\(.*\)\"/\1/p'
MDANSE/__pkginfo__.py
`
if
[[
${
CI_BUILD_REF_NAME
}
=
~ develop
]]
...
...
CHANGELOG
View file @
60a019ed
version 1.0.9
-------------
* use the short git commit id instead of long
version 1.0.8
-------------
* bug fix when getting git commit id in long format
...
...
MDANSE/__pkginfo__.py
View file @
60a019ed
__version__
=
"1.0.
8
"
__version__
=
"1.0.
9
"
__date__
=
"0
9
-03-2017"
__date__
=
"
1
0-03-2017"
__author__
=
"Eric Pellegrini"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment