Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
ardublockly
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
ardublockly
Commits
26d19eca
Commit
26d19eca
authored
Sep 01, 2015
by
carlosperate
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Capitalise Mac OS X app package name.
This is the OS X convention.
parent
e1a22316
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
27 deletions
+5
-27
package/build_pyinstaller.py
package/build_pyinstaller.py
+1
-1
package/electron/resources/osx/Info EH.plist
package/electron/resources/osx/Info EH.plist
+0
-22
package/pack_ardublockly.py
package/pack_ardublockly.py
+4
-4
No files found.
package/build_pyinstaller.py
View file @
26d19eca
...
...
@@ -41,7 +41,7 @@ spec_coll_name = "server"
if
platform
.
system
()
==
"Darwin"
:
# On MacOS the Electron app contents are dumped into the project root
# directory and the entire folder is contained in a
# '
a
rdublockly.app/Contents' folder.
# '
A
rdublockly.app/Contents' folder.
exec_folder
=
""
else
:
# In Windows and Linux the Electron files are located in this folder
...
...
package/electron/resources/osx/Info EH.plist
deleted
100644 → 0
View file @
e1a22316
<?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>
CFBundleDisplayName
</key>
<string>
{{productName}} Helper EH
</string>
<key>
CFBundleExecutable
</key>
<string>
{{productName}} Helper EH
</string>
<key>
CFBundleIdentifier
</key>
<string>
{{identifier}}.helper.EH
</string>
<key>
CFBundleName
</key>
<string>
{{productName}} Helper EH
</string>
<key>
CFBundlePackageType
</key>
<string>
APPL
</string>
<key>
DTSDKName
</key>
<string>
macosx
</string>
<key>
LSUIElement
</key>
<true/>
<key>
NSSupportsAutomaticGraphicsSwitching
</key>
<true/>
</dict>
</plist>
package/pack_ardublockly.py
View file @
26d19eca
...
...
@@ -62,10 +62,10 @@ def set_tag(tag):
global
copy_dir_name
global
copied_project_dir
copy_dir_name
=
"ardublockly_%s"
%
tag
# On OSX everything goes inside a folder structure
a
rdublockly.app/Contents/
# On OSX everything goes inside a folder structure
A
rdublockly.app/Contents/
if
platform
.
system
()
==
"Darwin"
:
copy_dir_name
=
os
.
path
.
join
(
copy_dir_name
,
'
a
rdublockly.app'
,
'Contents'
)
copy_dir_name
,
'
A
rdublockly.app'
,
'Contents'
)
print
(
script_tab
+
'Packing for Mac OS X, final folder structure: %s'
%
copy_dir_name
)
copied_project_dir
=
os
.
path
.
join
(
os
.
path
.
dirname
(
project_root_dir
),
...
...
@@ -220,8 +220,8 @@ def zip_ardublockly_copy(name_append):
os
.
makedirs
(
zip_file_dir
)
app_folder
=
copied_project_dir
# In OS X
the copied_project_dir is ardublockly_tag/Contents/ and we need
# to zip the .app folder
# In OS X
copied_project_dir is ardublockly_tag/Ardublockly.app/Contents/
#
and we need
to zip the .app folder
if
platform
.
system
()
==
"Darwin"
:
app_folder
=
os
.
path
.
dirname
(
os
.
path
.
dirname
(
app_folder
))
...
...
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