The code.ill.fr has been recreated and upgraded with the latest version this weekend, If you encounter any problem please inform the Helpdesk.

Commit c11d6936 authored by Remi Perenon's avatar Remi Perenon
Browse files

Merge branch 'build-macos_bundle_does_not_use_embedded_python' into 'develop'

Build macos bundle does not use embedded python

See merge request !62
parents d2ebf31d f48f2617
Pipeline #8004 passed with stages
in 23 minutes and 21 seconds
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleDisplayName</key>
<string>MDANSE</string>
<key>CFBundleExecutable</key>
<string>MDANSE</string>
<key>CFBundleIconFile</key>
<string>mdanse.icns</string>
<key>CFBundleIdentifier</key>
<string>eu.ill.MDANSE-<MDANSE_VERSION></string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>MDANSE</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string><MDANSE_VERSION></string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string><MDANSE_VERSION></string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.science</string>
<key>LSHasLocalizedDisplayName</key>
<false/>
<key>NSAppleScriptEnabled</key>
<false/>
<key>NSHumanReadableCopyright</key>
<string>Copyright not specified</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>PyMainFileNames</key>
<array>
<string>__boot__</string>
</array>
<key>PyOptions</key>
<dict>
<key>alias</key>
<false/>
<key>argv_emulation</key>
<false/>
<key>emulate_shell_environment</key>
<false/>
<key>no_chdir</key>
<false/>
<key>optimize</key>
<integer>1</integer>
<key>prefer_ppc</key>
<false/>
<key>site_packages</key>
<false/>
<key>use_faulthandler</key>
<false/>
<key>use_pythonpath</key>
<false/>
<key>verbose</key>
<false/>
</dict>
<key>PyResourcePackages</key>
<array>
</array>
<key>PyRuntimeLocations</key>
<array>
<string>@executable_path/../Resources/bin/python</string>
</array>
<key>PythonInfoDict</key>
<dict>
<key>PythonExecutable</key>
<string>/usr/bin/python</string>
<key>PythonLongVersion</key>
<string>2.7.10 (default, Oct 6 2017, 22:29:07)
[GCC 4.2.1 Compatible Apple LLVM 9.0.0 (clang-900.0.31)]</string>
<key>PythonShortVersion</key>
<string>2.7</string>
<key>py2app</key>
<dict>
<key>alias</key>
<false/>
<key>template</key>
<string>app</string>
<key>version</key>
<string>0.14</string>
</dict>
</dict>
</dict>
</plist>
......@@ -42,8 +42,9 @@ echo "${VERSION_NAME}" > ${MDANSE_APP_DIR}/Contents/Resources/version
# Copy MDANSE GUI
cp ${CI_PROJECT_DIR}/Scripts/mdanse_gui ${MDANSE_APP_DIR}/Contents/Resources/
# Modify Info.plist
sed -i "" "s/<MDANSE_VERSION>/${VERSION_NAME}/" ${MDANSE_APP_DIR}/Contents/Info.plist
# Modify Info.plist and copy it
sed -i "" "s/<MDANSE_VERSION>/${VERSION_NAME}/" ${CI_PROJECT_DIR}/BuildServer/Unix/MacOS/Resources/Info.plist
cp ${CI_PROJECT_DIR}/BuildServer/Unix/MacOS/Resources/Info.plist ${MDANSE_APP_DIR}/Contents/
# Relink netcdf
install_name_tool -change /usr/local/opt/netcdf/lib/libnetcdf.18.dylib @executable_path/../Frameworks/libnetcdf.18.dylib ${MDANSE_APP_DIR}/Contents/Resources/lib/python2.7/Scientific/_netcdf.so
......
version 1.5.0
--------------
* FIXED issue #57 On macOS, MDANSE did not use the embedded python
version 1.4.0
--------------
* FIXED issue #56 Layout on Windows differed from macOS and Linux (we keep Windows Layout: "Data" on top, "Plugins" below)
......
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