Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Scientific Software
MDANSE
Commits
88564f0c
Commit
88564f0c
authored
May 10, 2016
by
Jamie Hall
Browse files
Removing curl from packaging scripts
parent
006086ea
Pipeline
#270
failed with stage
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
88564f0c
...
...
@@ -14,15 +14,31 @@ osx:
artifacts
:
paths
:
-
BuildServer/Darwin/Build/*.dmg
windows
:
stage
:
build
script
:
-
c:\cygwin64\bin\bash -c "dos2unix.exe ./BuildServer/Windows/package.sh"
-
c:\cygwin64\bin\bash .\BuildServer\Windows\package.sh setup
-
c:\cygwin64\bin\bash .\BuildServer\Windows\package.sh build
artifacts
:
paths
:
-
BuildServer/Windows/*.exe
only
:
-
tags
tags
:
-
windows
allow_failure
:
false
# linux:
# stage: build
# script:
# - ./BuildServer/Debian/build_deb.sh amd64 trusty
# artifacts:
# paths:
# - BuildServer/Windows/*.exe
# only:
# - tags
# tags:
# - ubuntu14.04
# allow_failure: false
BuildServer/Darwin/Scripts/package.sh
View file @
88564f0c
...
...
@@ -90,7 +90,7 @@ 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
rm
-rf
dist/MDANSE.app/Contents/Resources/mpl-data/sample_data
#Add MDANSE version file (should read the version from the bundle with pyobjc, but will figure that out later)
echo
"
${
CI_BUILD_TAG
"> dist/MDANSE.app/Contents/Resources/version
...
...
@@ -106,7 +106,4 @@ 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
curl -T
${
MDANSE_DMG
}
ftp://
$CI_FTP_USER_USERNAME
:
$CI_FTP_USER_PASSWORD
@ftp.ill.fr/mdanse/
exit
BuildServer/Debian/build_deb.sh
View file @
88564f0c
...
...
@@ -37,7 +37,7 @@ sed -i "/__revision__/c\__revision__ = '${REV_NUMBER}'/" MDANSE/__pkginfo__.py
# Now build last version
echo
"
$BLEU
""Building MDANSE"
"
$NORMAL
"
python setup.py build
python setup.py build
export
PYTHONPATH
=
${
PWD
}
/build/lib.linux-x86_64-2.7
...
...
@@ -56,7 +56,7 @@ echo "$BLEU""Build debian tree" "$NORMAL"
DEBIAN_ROOT_DIR
=
debian_
${
DISTRO
}
-
${
ARCH
}
# Copy all the debian files (e.g. control, copyright, md5sum ...) into DEBIAN directory
mkdir
${
DEBIAN_ROOT_DIR
}
mkdir
${
DEBIAN_ROOT_DIR
}
cp
-r
BuildServer/Debian/DEBIAN
${
DEBIAN_ROOT_DIR
}
/
chmod
-R
755
${
DEBIAN_ROOT_DIR
}
/DEBIAN
...
...
@@ -86,6 +86,3 @@ cp -r /usr/local/lib/python2.7/dist-packages/MMTK* ${DEBIAN_DIST_DIR}
export
TMPDIR
=
.
fakeroot dpkg-deb
-b
${
DEBIAN_ROOT_DIR
}
MDANSE-
${
CI_BUILD_TAG
}
-
${
DISTRO
}
-
${
ARCH
}
.deb
scp MDANSE-
${
CI_BUILD_TAG
}
-
${
DISTRO
}
-
${
ARCH
}
.deb gitlabci-nsxtool@mdanse.ill.fr:/mnt/data/software/mdanse/uploads
curl
-T
MDANSE-
${
CI_BUILD_TAG
}
-
${
DISTRO
}
-
${
ARCH
}
.deb ftp://
$CI_FTP_USER_USERNAME
:
$CI_FTP_USER_PASSWORD
@ftp.ill.fr/mdanse/
BuildServer/Windows/package.sh
View file @
88564f0c
...
...
@@ -68,10 +68,10 @@ if [ $TASK = "setup" ]; then
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
=
$?
...
...
@@ -95,10 +95,10 @@ if [ $TASK = "setup" ]; then
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
...
...
@@ -111,39 +111,39 @@ if [ $TASK = "setup" ]; then
extract Cython-0.19.2.
${
BUILD_TARGET
}
-py2
.7.exe SCRIPTS
# extract Pyro
extract Pyro-3.16.
${
BUILD_TARGET
}
.exe PURELIB
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 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 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-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
...
...
@@ -153,7 +153,7 @@ if [ $TASK = "setup" ]; then
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/
...
...
@@ -173,49 +173,49 @@ if [ $TASK = "setup" ]; then
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
# 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
"/__version__/c
\_
_version__ = '
${
CI_BUILD_TAG
}
'"
MDANSE/__pkginfo__.py
sed
-i
"/__revision__/c
\_
_revision__ = '
${
REV_NUMBER
}
'/"
MDANSE/__pkginfo__.py
sed
-i
"/__version__/c
\_
_version__ = '
${
CI_BUILD_TAG
}
'"
MDANSE/__pkginfo__.py
sed
-i
"/__revision__/c
\_
_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
...
...
@@ -234,19 +234,17 @@ elif [ $TASK = "build" ]; then
echo
"One or several unit tests failed"
exit
status
fi
cd
${
CI_PROJECT_DIR
}
# Other way to fetch the current version without python
# 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
=
${
CI_BUILD_TAG
}
/DARCH
=
${
BUILD_TARGET
}
/DPYTHON_INST
=
"
${
TARGET_DIR
}
"
MDANSE_installer.nsi
curl
-T
"MDANSE-
${
CI_BUILD_TAG
}
-
${
BUILD_TARGET
}
.exe"
ftp://
$CI_FTP_USER_USERNAME
:
$CI_FTP_USER_PASSWORD
@ftp.ill.fr/mdanse/
fi
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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