Skip to content

Fix osx application build script #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ales-erjavec wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix osx application build script #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
708010d
Update build-osx-app script
ales-erjavec Jun 17, 2016
9a876e6
Update osx app's Info.plist
ales-erjavec Jun 17, 2016
440e21e
Update osx font substitutions
ales-erjavec Jun 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Orange/OrangeCanvas/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,18 @@ def running_in_ipython():


def fix_osx_private_font():
"""Temporary fixes for QTBUG-32789 an QTBUG-40833"""
from PyQt4.QtCore import QSysInfo, QT_VERSION
# Fix fonts on Os X (QTBUG 47206, 40833, 32789)
if sys.platform == "darwin":
import platform
try:
if QSysInfo.MacintoshVersion > 11 and \
QT_VERSION < 0x40807:
# Fix for Yosemite
version = platform.mac_ver()[0]
version = float(version[:version.rfind(".")])
if version >= 10.11: # El Capitan
QFont.insertSubstitution(".SF NS Text", "Helvetica Neue")
elif version >= 10.10: # Yosemite
QFont.insertSubstitution(".Helvetica Neue DeskInterface",
"Helvetica Neue")
if QSysInfo.MacintoshVersion > QSysInfo.MV_10_8 and \
QT_VERSION < 0x40806:
# Fix for Mavericks
elif version >= 10.9:
QFont.insertSubstitution(".Lucida Grande UI", "Lucida Grande")
except AttributeError:
pass
Expand Down
60 changes: 57 additions & 3 deletions install-scripts/mac/build-osx-app.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,19 +159,73 @@ EOF
chmod +x "$TEMPLATE"/Contents/MacOS/Orange


VERSION=$(python setup.py --version)
cat <<EOF > "$TEMPLATE"/Contents/Info.plist
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>NSHighResolutionCapable</key>
<true/>
<key>CFBundleExecutable</key>
<string>Orange</string>
<key>CFBundleIconFile</key>
<string>orange.icns</string>
<key>CFBundleIdentifier</key>
<string>si.biolab.Orange</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Orange</string>
<key>CFBundleGetInfoString</key>
<string>Orange, component-based data mining software</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>Orng</string>
<key>CFBundleShortVersionString</key>
<string>${VERSION}</string>
<key>CFBundleVersion</key>
<string>${VERSION}</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>ows</string>
</array>
<key>CFBundleTypeName</key>
<string>Orange Canvas Schema</string>
<key>CFBundleTypeOSTypes</key>
<array>
<string>OWSf</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>schema.icns</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>LSIsAppleDefaultForType</key>
<true/>
</dict>
</array>
</dict>
</plist>
EOF
echo "Installing add ons"
echo "=================="

# Install as eggs. The application's Add-ons dialog has problem with
# upgrading flat installs.
"$PIP" install --egg hg+https://bitbucket.org/biolab/orange-bioinformatics
"$PIP" install --egg orange-bioinformatics
"$PIP" install --egg orange-network
"$PIP" install --egg hg+https://bitbucket.org/biolab/orange-text
"$PIP" install --egg Orange-Network


echo "Installing optional dependencies"
echo "================================"
"$PIP" install slumber
"$PIP" install --allow-external PIL --allow-unverified PIL PIL


if [[ ! $INPLACE ]]; then
Expand Down
6 changes: 5 additions & 1 deletion install-scripts/mac/bundle-lite/Orange.app/Contents/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>NSHighResolutionCapable</key>
<true/>
<key>CFBundleExecutable</key>
<string>Orange</string>
<key>CFBundleIconFile</key>
<string>orange.icns</string>
<key>CFBundleIdentifier</key>
<string>si.ailab.Orange</string>
<string>si.biolab.Orange</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand Down