Skip to content

Commit 5a43c81

Browse files
Tom BrouwsTom Brouws
Tom Brouws
authored and
Tom Brouws
committed
Merge pull request #101 from ProgrammingLife3/icon
Much icon. Wow.
2 parents 08d2204 + ba30e3d commit 5a43c81

File tree

15 files changed

+378
-0
lines changed

15 files changed

+378
-0
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ hs_err_pid*
5959
!/data/testdata/
6060
!/data/testdata/*.graph
6161
!/data/testdata/*/*.nwk
62+
!resources/pictures/
6263
!resources/pictures/*
6364

6465
#Helix^2 files

‎macframe/Helix2.app/Contents/Info.plist

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>BuildMachineOSBuild</key>
6+
<string>14D131</string>
7+
<key>CFBundleDevelopmentRegion</key>
8+
<string>English</string>
9+
<key>CFBundleExecutable</key>
10+
<string>JavaApplicationStub</string>
11+
<key>CFBundleIconFile</key>
12+
<string>Helix.icns</string>
13+
<key>CFBundleIdentifier</key>
14+
<string>tudelft.ti2806.pl3</string>
15+
<key>CFBundleInfoDictionaryVersion</key>
16+
<string>6.0</string>
17+
<key>CFBundleName</key>
18+
<string>Helix 2</string>
19+
<key>CFBundlePackageType</key>
20+
<string>APPL</string>
21+
<key>CFBundleShortVersionString</key>
22+
<string>1.0</string>
23+
<key>CFBundleSignature</key>
24+
<string>warZ</string>
25+
<key>CFBundleVersion</key>
26+
<string>1.0</string>
27+
<!-- <key>DTCompiler</key>
28+
<string></string>
29+
<key>DTPlatformBuild</key>
30+
<string>4B110</string>
31+
<key>DTPlatformVersion</key>
32+
<string>GM</string>
33+
<key>DTSDKBuild</key>
34+
<string>11A511</string>
35+
<key>DTSDKName</key>
36+
<string></string>
37+
<key>DTXcode</key>
38+
<string>0410</string>
39+
<key>DTXcodeBuild</key>
40+
<string>4B110</string> -->
41+
<key>Java</key>
42+
<dict>
43+
<key>ClassPath</key>
44+
<array>
45+
<string>$JAVAROOT/Helix2-0.7-jar-with-dependencies.jar</string>
46+
</array>
47+
<key>JVMVersion</key>
48+
<string>1.5+</string>
49+
<key>MainClass</key>
50+
<string>tudelft.ti2806.pl3.Main</string>
51+
<key>Properties</key>
52+
<dict>
53+
<key>apple.laf.useScreenMenuBar</key>
54+
<string>true</string>
55+
</dict>
56+
<key>WorkingDirectory</key>
57+
<string>$APP_PACKAGE/Contents/Resources/Java</string>
58+
</dict>
59+
<key>LSHasLocalizedDisplayName</key>
60+
<true/>
61+
<!-- <key>NSHumanReadableCopyright</key>
62+
<string>Copyright ©1996-2010 Apple Inc., All Rights Reserved.</string> -->
63+
</dict>
64+
</plist>

‎macframe/Helix2.app/Contents/MacOS/JavaApplicationStub

Lines changed: 308 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,308 @@
1+
#!/bin/sh
2+
##################################################################################
3+
# #
4+
# universalJavaApplicationStub #
5+
# #
6+
# #
7+
# A shellscript JavaApplicationStub for Java Apps on Mac OS X #
8+
# that works with both Apple's and Oracle's plist format. #
9+
# #
10+
# Inspired by Ian Roberts stackoverflow answer #
11+
# at http://stackoverflow.com/a/17546508/1128689 #
12+
# #
13+
# #
14+
# @author Tobias Fischer #
15+
# @url https://github.com/tofi86/universalJavaApplicationStub #
16+
# @date 2015-05-15 #
17+
# @version 0.9.0 #
18+
# #
19+
# #
20+
##################################################################################
21+
# #
22+
# #
23+
# The MIT License (MIT) #
24+
# #
25+
# Copyright (c) 2015 Tobias Fischer #
26+
# #
27+
# Permission is hereby granted, free of charge, to any person obtaining a copy #
28+
# of this software and associated documentation files (the "Software"), to deal #
29+
# in the Software without restriction, including without limitation the rights #
30+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell #
31+
# copies of the Software, and to permit persons to whom the Software is #
32+
# furnished to do so, subject to the following conditions: #
33+
# #
34+
# The above copyright notice and this permission notice shall be included in all #
35+
# copies or substantial portions of the Software. #
36+
# #
37+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
38+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
39+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE #
40+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
41+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, #
42+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #
43+
# SOFTWARE. #
44+
# #
45+
##################################################################################
46+
47+
48+
49+
50+
#
51+
# resolve symlinks
52+
#####################
53+
54+
PRG=$0
55+
56+
while [ -h "$PRG" ]; do
57+
ls=`ls -ld "$PRG"`
58+
link=`expr "$ls" : '^.*-> \(.*\)$' 2>/dev/null`
59+
if expr "$link" : '^/' 2> /dev/null >/dev/null; then
60+
PRG="$link"
61+
else
62+
PRG="`dirname "$PRG"`/$link"
63+
fi
64+
done
65+
66+
# set the directory abspath of the current shell script
67+
PROGDIR=`dirname "$PRG"`
68+
69+
70+
71+
72+
#
73+
# set files and folders
74+
############################################
75+
76+
# the absolute path of the app package
77+
cd "$PROGDIR"/../../
78+
AppPackageFolder=`pwd`
79+
80+
# the base path of the app package
81+
cd ..
82+
AppPackageRoot=`pwd`
83+
84+
# set Apple's Java folder
85+
AppleJavaFolder="${AppPackageFolder}"/Contents/Resources/Java
86+
87+
# set Apple's Resources folder
88+
AppleResourcesFolder="${AppPackageFolder}"/Contents/Resources
89+
90+
# set Oracle's Java folder
91+
OracleJavaFolder="${AppPackageFolder}"/Contents/Java
92+
93+
# set Oracle's Resources folder
94+
OracleResourcesFolder="${AppPackageFolder}"/Contents/Resources
95+
96+
# set path to Info.plist in bundle
97+
InfoPlistFile="${AppPackageFolder}"/Contents/Info.plist
98+
99+
# set the default JVM Version to a null string
100+
JVMVersion=""
101+
102+
103+
104+
#
105+
# read Info.plist and extract JVM options
106+
############################################
107+
108+
109+
# read the program name from CFBundleName
110+
CFBundleName=`/usr/libexec/PlistBuddy -c "print :CFBundleName" "${InfoPlistFile}"`
111+
112+
# read the icon file name
113+
CFBundleIconFile=`/usr/libexec/PlistBuddy -c "print :CFBundleIconFile" "${InfoPlistFile}"`
114+
115+
116+
# check Info.plist for Apple style Java keys -> if key :Java is present, parse in apple mode
117+
/usr/libexec/PlistBuddy -c "print :Java" "${InfoPlistFile}" > /dev/null 2>&1
118+
exitcode=$?
119+
JavaKey=":Java"
120+
121+
# if no :Java key is present, check Info.plist for universalJavaApplication style JavaX keys -> if key :JavaX is present, parse in apple mode
122+
if [ $exitcode -ne 0 ]; then
123+
/usr/libexec/PlistBuddy -c "print :JavaX" "${InfoPlistFile}" > /dev/null 2>&1
124+
exitcode=$?
125+
JavaKey=":JavaX"
126+
fi
127+
128+
129+
# read Info.plist in Apple style if exit code returns 0 (true, :Java key is present)
130+
if [ $exitcode -eq 0 ]; then
131+
132+
# set Java and Resources folder
133+
JavaFolder="${AppleJavaFolder}"
134+
ResourcesFolder="${AppleResourcesFolder}"
135+
136+
APP_PACKAGE="${AppPackageFolder}"
137+
JAVAROOT="${AppleJavaFolder}"
138+
USER_HOME="$HOME"
139+
140+
141+
# read the Java WorkingDirectory
142+
JVMWorkDir=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:WorkingDirectory" "${InfoPlistFile}" 2> /dev/null | xargs`
143+
144+
# set Working Directory based upon Plist info
145+
if [[ ! -z ${JVMWorkDir} ]]; then
146+
WorkingDirectory="${JVMWorkDir}"
147+
else
148+
# AppPackageRoot is the standard WorkingDirectory when the script is started
149+
WorkingDirectory="${AppPackageRoot}"
150+
fi
151+
152+
# expand variables $APP_PACKAGE, $JAVAROOT, $USER_HOME
153+
WorkingDirectory=`eval "echo ${WorkingDirectory}"`
154+
155+
156+
# read the MainClass name
157+
JVMMainClass=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:MainClass" "${InfoPlistFile}" 2> /dev/null`
158+
159+
# read the JVM Options
160+
JVMOptions=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:Properties" "${InfoPlistFile}" 2> /dev/null | grep " =" | sed 's/^ */-D/g' | tr '\n' ' ' | sed 's/ */ /g' | sed 's/ = /=/g' | xargs`
161+
162+
# read StartOnMainThread
163+
JVMStartOnMainThread=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:StartOnMainThread" "${InfoPlistFile}" 2> /dev/null`
164+
if [ "${JVMStartOnMainThread}" == "true" ]; then
165+
echo ${JVMStartOnMainThread} > ~/Desktop/test.txt
166+
JVMOptions+=" -XstartOnFirstThread"
167+
fi
168+
169+
# read the ClassPath in either Array or String style
170+
JVMClassPath_RAW=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:ClassPath" "${InfoPlistFile}" 2> /dev/null`
171+
if [[ $JVMClassPath_RAW == *Array* ]] ; then
172+
JVMClassPath=.`/usr/libexec/PlistBuddy -c "print ${JavaKey}:ClassPath" "${InfoPlistFile}" 2> /dev/null | grep " " | sed 's/^ */:/g' | tr -d '\n' | xargs`
173+
else
174+
JVMClassPath=${JVMClassPath_RAW}
175+
fi
176+
# expand variables $APP_PACKAGE, $JAVAROOT, $USER_HOME
177+
JVMClassPath=`eval "echo ${JVMClassPath}"`
178+
179+
# read the JVM Default Options
180+
JVMDefaultOptions=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:VMOptions" "${InfoPlistFile}" 2> /dev/null | xargs`
181+
182+
# read the JVM Arguments
183+
JVMArguments=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:Arguments" "${InfoPlistFile}" 2> /dev/null | xargs`
184+
185+
# read the Java version we want to find
186+
JVMVersion=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:JVMVersion" "${InfoPlistFile}" 2> /dev/null | xargs`
187+
188+
# read Info.plist in Oracle style
189+
else
190+
191+
# set Working Directory and Java and Resources folder
192+
JavaFolder="${OracleJavaFolder}"
193+
ResourcesFolder="${OracleResourcesFolder}"
194+
WorkingDirectory="${OracleJavaFolder}"
195+
196+
APP_ROOT="${AppPackageFolder}"
197+
198+
# read the MainClass name
199+
JVMMainClass=`/usr/libexec/PlistBuddy -c "print :JVMMainClassName" "${InfoPlistFile}" 2> /dev/null`
200+
201+
# read the JVM Options
202+
JVMOptions=`/usr/libexec/PlistBuddy -c "print :JVMOptions" "${InfoPlistFile}" 2> /dev/null | grep " -" | tr -d '\n' | sed 's/ */ /g' | xargs`
203+
# replace occurances of $APP_ROOT with it's content
204+
JVMOptions=`eval "echo ${JVMOptions}"`
205+
206+
JVMClassPath="${JavaFolder}/*"
207+
208+
# read the JVM Default Options
209+
JVMDefaultOptions=`/usr/libexec/PlistBuddy -c "print :JVMDefaultOptions" "${InfoPlistFile}" 2> /dev/null | grep -o "\-.*" | tr -d '\n' | xargs`
210+
211+
# read the JVM Arguments
212+
JVMArguments=`/usr/libexec/PlistBuddy -c "print :JVMArguments" "${InfoPlistFile}" 2> /dev/null | tr -d '\n' | sed -E 's/Array \{ *(.*) *\}/\1/g' | sed 's/ */ /g' | xargs`
213+
# replace occurances of $APP_ROOT with it's content
214+
JVMArguments=`eval "echo ${JVMArguments}"`
215+
fi
216+
217+
218+
219+
220+
#
221+
# find installed Java versions
222+
#################################
223+
224+
# first check system variable "$JAVA_HOME"
225+
if [ -n "$JAVA_HOME" ] ; then
226+
JAVACMD="$JAVA_HOME/bin/java"
227+
228+
# check for specified JVMversion in "/usr/libexec/java_home" symlinks
229+
elif [ ! -z ${JVMVersion} ] && [ -x /usr/libexec/java_home ] && /usr/libexec/java_home -F; then
230+
231+
if /usr/libexec/java_home -F -v ${JVMVersion}; then
232+
JAVACMD="`/usr/libexec/java_home -F -v ${JVMVersion} 2> /dev/null`/bin/java"
233+
else
234+
# display error message with applescript
235+
osascript -e "tell application \"System Events\" to display dialog \"ERROR launching '${CFBundleName}'\n\nNo suitable Java version found on your system!\nThis program requires Java ${JVMVersion}\nMake sure you install the required Java version.\" with title \"${CFBundleName}\" buttons {\" OK \"} default button 1 with icon path to resource \"${CFBundleIconFile}\" in bundle (path to me)"
236+
# exit with error
237+
exit 3
238+
fi
239+
240+
# otherwise check "/usr/libexec/java_home" symlinks
241+
elif [ -x /usr/libexec/java_home ] && /usr/libexec/java_home -F; then
242+
JAVACMD="`/usr/libexec/java_home 2> /dev/null`/bin/java"
243+
244+
# otherwise check Java standard symlink (old Apple Java)
245+
elif [ -h /Library/Java/Home ]; then
246+
JAVACMD="/Library/Java/Home/bin/java"
247+
248+
# fallback: public JRE plugin (Oracle Java)
249+
else
250+
JAVACMD="/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java"
251+
fi
252+
253+
# fallback fallback: /usr/bin/java
254+
# but this would prompt to install deprecated Apple Java 6
255+
256+
257+
258+
259+
#
260+
# execute JAVA commandline and do some pre-checks
261+
####################################################
262+
263+
# display error message if MainClassName is empty
264+
if [ -z ${JVMMainClass} ]; then
265+
# display error message with applescript
266+
osascript -e "tell application \"System Events\" to display dialog \"ERROR launching '${CFBundleName}'!\n\n'MainClass' isn't specified!\nJava application cannot be started!\" with title \"${CFBundleName}\" buttons {\" OK \"} default button 1 with icon path to resource \"${CFBundleIconFile}\" in bundle (path to me)"
267+
# exit with error
268+
exit 2
269+
270+
271+
# check whether $JAVACMD is a file and executable
272+
elif [ -f "$JAVACMD" ] && [ -x "$JAVACMD" ] ; then
273+
274+
# enable drag&drop to the dock icon
275+
export CFProcessPath="$0"
276+
277+
# change to Working Directory based upon Apple/Oracle Plist info
278+
cd "${WorkingDirectory}"
279+
280+
# execute Java and set
281+
# - classpath
282+
# - dock icon
283+
# - application name
284+
# - JVM options
285+
# - JVM default options
286+
# - main class
287+
# - JVM arguments
288+
exec "$JAVACMD" \
289+
-cp "${JVMClassPath}" \
290+
-Xdock:icon="${ResourcesFolder}/${CFBundleIconFile}" \
291+
-Xdock:name="${CFBundleName}" \
292+
${JVMOptions:+$JVMOptions }\
293+
${JVMDefaultOptions:+$JVMDefaultOptions }\
294+
${JVMMainClass}\
295+
${JVMArguments:+ $JVMArguments}
296+
297+
298+
else
299+
300+
# display error message with applescript
301+
osascript -e "tell application \"System Events\" to display dialog \"ERROR launching '${CFBundleName}'!\n\nYou need to have JAVA installed on your Mac!\nVisit http://java.com for more information...\" with title \"${CFBundleName}\" buttons {\" OK \"} default button 1 with icon path to resource \"${CFBundleIconFile}\" in bundle (path to me)"
302+
303+
# and open java.com
304+
open http://java.com
305+
306+
# exit with error
307+
exit 1
308+
fi

‎macframe/Helix2.app/Contents/PkgInfo

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
APPL????

‎macframe/Helix2.app/Contents/Resources/Helix.icns

93 KB
Binary file not shown.

‎resources/pictures/helix128.png

5.5 KB
Loading

‎resources/pictures/helix16.png

578 Bytes
Loading

‎resources/pictures/helix20.png

759 Bytes
Loading

‎resources/pictures/helix24.png

977 Bytes
Loading

‎resources/pictures/helix256.png

10.6 KB
Loading

‎resources/pictures/helix32.png

1.39 KB
Loading

‎resources/pictures/helix48.png

2.07 KB
Loading

‎resources/pictures/helix512.png

22 KB
Loading

‎resources/pictures/helix64.png

2.82 KB
Loading

0 commit comments

Comments
 (0)