Commit 724ff09c authored by eric pellegrini's avatar eric pellegrini
Browse files

Merge branch 'master' of

parents 9a51e0a7 fc9a6399
......@@ -33,8 +33,8 @@ if sys.platform.startswith('darwin'):
'matplotlib_backends': '-',
'optimize': '1',
'plist': PLIST,
'bdist_base': 'scripts/darwin/build',
'dist_dir': 'scripts/darwin/dist',
'bdist_base': 'build_darwin/build',
'dist_dir': 'build_darwin/dist',
'graph': False,
'xref': False
......@@ -39,7 +39,7 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
echo -e "$BLEU""Getting last MDANSE revision" "$NORMAL"
# Get revision number from git (without trailing newline)
REV_NUMBER=$(git rev-list --count HEAD)
export REV_NUMBER=$(git rev-list --count HEAD)
echo "$BLEU""Revision number is -->${REV_NUMBER}<--" "$NORMAL"
# Add current revision number to python source code (will appear in "About..." dialog)
......@@ -49,18 +49,18 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
# Now build last version and install it in our homebrewed python
echo -e "$BLEU""Building MDANSE" "$NORMAL"
/usr/local/bin/python build
/usr/local/bin/python install
#/usr/local/bin/python install
echo -e "$BLEU""Packaging MDANSE" "$NORMAL"
rm -rf scripts/darwin/build
rm -rf scripts/darwin/dist
rm -rf build_darwin/build
rm -rf build_darwin/dist
# debug option for py2app, if needed
/usr/local/bin/python py2app
/usr/local/bin/python ./BuildServer/Darwin/ py2app
if [[ $rc != 0 ]]; then
echo -e "$ROUGE""Cannot build app." "$NORMAL"
......@@ -69,14 +69,14 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
# Do some manual cleanup, e.g.
# matplotlib/tests ==> 45.2 Mb
rm -rf scripts/darwin/dist/
rm -rf scripts/darwin/dist/
rm -rf build_darwin/dist/
rm -rf build_darwin/dist/
#Add MDANSE version file (should read the version from the bundle with pyobjc, but will figure that out later)
echo "$BUILD_NAME b$REV_NUMBER"> scripts/darwin/dist/
echo "$BUILD_NAME b$REV_NUMBER"> build_darwin/dist/
cd scripts/darwin
cd build_darwin
# Archive app
echo -e "$BLEU" "Archiving ${TARGET_DIR}.tar.gz ..." "$NORMAL"
......@@ -84,10 +84,6 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
gnutar cfp - | gzip --best -c > ../../../${TARGET_DIR}.tar.gz
cd ..
# Reminder on pre-configured DmgTemplate
#>hdiutil convert DmgTemplateCompressed.dmg -format UDRW -o DmgTemplateCompressedRW.dmg
#>hdiutil convert DmgTemplateCompressedRW.dmg -format UDZO -o DmgTemplateCompressed.dmg
TODAY=$(date +"%m-%d-%y-%Hh%Mm%S")
# Create sparse image for distribution
echo -e "$BLEU" "Creating new MDANSE.dmg.sparseimage ..." "$NORMAL"
......@@ -96,7 +92,7 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
mv -f MDANSE.dmg.sparseimage MDANSE.dmg.sparseimage.${TODAY}.old
hdiutil convert DmgTemplateCompressed.dmg -format UDSP -o MDANSE.dmg.sparseimage
hdiutil resize -size 1024m MDANSE.dmg.sparseimage
hdiutil attach nMolDyn.dmg.sparseimage
hdiutil attach MDANSE.dmg.sparseimage
echo -e "$BLEU" "Copying on dmg ..." "$NORMAL"
cp -a dist/ /Volumes/MDANSE/MDANSE/
echo -e "$BLEU" "Copying UserData/ on dmg ..." "$NORMAL"
Supports Markdown
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