Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
MDANSE
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
6
Issues
6
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Scientific Software
MDANSE
Commits
e38598d7
Commit
e38598d7
authored
Apr 14, 2016
by
Jamie Hall
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Final changes to build process for mac
parent
f972d0a1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
18 deletions
+34
-18
.gitignore
.gitignore
+1
-0
BuildServer/Darwin/Scripts/build.py
BuildServer/Darwin/Scripts/build.py
+5
-14
BuildServer/Darwin/Scripts/package.sh
BuildServer/Darwin/Scripts/package.sh
+24
-2
BuildServer/Darwin/Tools/create-dmg/create-dmg
BuildServer/Darwin/Tools/create-dmg/create-dmg
+2
-0
MDANSE/GUI/MainFrame.py
MDANSE/GUI/MainFrame.py
+2
-2
No files found.
.gitignore
View file @
e38598d7
...
...
@@ -6,3 +6,4 @@
.eggs
dist/
.DS_Store
Tests/FunctionalTests/Jobs
BuildServer/Darwin/Scripts/build.py
View file @
e38598d7
...
...
@@ -5,27 +5,18 @@ import os
if
sys
.
platform
.
startswith
(
'darwin'
):
from
setuptools
import
setup
#build_name = os.environ['BUILD_NAME']
#rev_number = os.environ['REV_NUMBER']
#version = build_name + " v" + rev_number
version
=
1
build_name
=
"MDANSE"
build_name
=
os
.
environ
[
'BUILD_NAME'
]
rev_number
=
os
.
environ
[
'REV_NUMBER'
]
version
=
build_name
+
" v"
+
rev_number
APP
=
[
'../../../Scripts/mdanse_gui'
]
PLIST
=
{
u'CFBundleName'
:
u'MDANSE'
,
u'CFBundleShortVersionString'
:
build_name
,
u'CFBundleVersion'
:
version
,
u'CFBundleIdentifier'
:
u'eu.ill.MDANSE-'
+
build_name
,
u'LSMinimumSystemVersion'
:
u'10.6'
,
u'LSApplicationCategoryType'
:
u'public.app-category.science'
,
u'CFBundleDocumentTypes'
:
[
{
u'CFBundleTypeRole'
:
u'Viewer'
,
u'LSItemContentTypes'
:
[
u'eu.ill.MDANSE'
],
u'LSHandlerRank'
:
u'Owner'
,
}
]
u'LSApplicationCategoryType'
:
u'public.app-category.science'
}
OPTIONS
=
{
'argv_emulation'
:
True
,
...
...
BuildServer/Darwin/Scripts/package.sh
View file @
e38598d7
...
...
@@ -47,14 +47,34 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
# 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
/usr/local/bin/python setup.py
install
# 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
../../..
TARGET_DIR
=
MDANSE-
${
BUILD_NAME
}
-b
${
REV_NUMBER
}
-MacOS
echo
-e
"
$BLEU
""Packaging MDANSE"
"
$NORMAL
"
rm
-rf
BuildServer/Darwin/Build
/dist
rm
-rf
BuildServer/Darwin/Build/b
uild
rm
-rf
BuildServer/Darwin/Build
mkdir
BuildServer/Darwin/B
uild
# debug option for py2app, if needed
export
DISTUTILS_DEBUG
=
0
...
...
@@ -84,6 +104,8 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
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
fi
...
...
BuildServer/Darwin/Tools/create-dmg/create-dmg
View file @
e38598d7
...
...
@@ -161,6 +161,8 @@ echo "Mount directory: $MOUNT_DIR"
DEV_NAME
=
$(
hdiutil attach
-readwrite
-noverify
-noautoopen
"
${
DMG_TEMP_NAME
}
"
| egrep
'^/dev/'
|
sed
1q |
awk
'{print $1}'
)
echo
"Device name:
$DEV_NAME
"
sleep
5
if
!
test
-z
"
$BACKGROUND_FILE
"
;
then
echo
"Copying background file..."
test
-d
"
$MOUNT_DIR
/.background"
||
mkdir
"
$MOUNT_DIR
/.background"
...
...
MDANSE/GUI/MainFrame.py
View file @
e38598d7
...
...
@@ -310,9 +310,9 @@ or directly to the MDANSE mailing list:
def
on_open_api
(
self
,
event
):
mainHTML
=
os
.
path
.
join
(
PLATFORM
.
api_path
(),
'MDANSE.html'
)
if
os
.
path
.
exists
(
mainHTML
):
webbrowser
.
open
(
mainHTML
)
webbrowser
.
open
(
"file://
%
s"
%
mainHTML
)
else
:
LOGGER
(
"Can not open MDANSE API. Maybe the documentation was not properly installed."
,
"error"
,[
'dialog'
])
...
...
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