Skip to content

Mac release 5 #131

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

Merged
merged 2 commits into from
Nov 4, 2022
Merged

Mac release 5 #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5a8f73
Bumped to v1.0.7 for wrapping with macOS nw.js v0.69.1; includes Chro…
GitHub-Obex-Bot Nov 3, 2022
2378653
Increased app height to prevent bottom text from being cut off. Also…
GitHub-Obex-Bot Nov 4, 2022
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
2 changes: 1 addition & 1 deletion background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ chrome.app.runtime.onLaunched.addListener(function() {
id: "BlocklyProp-Launcher",
innerBounds: {
width: 500,
height: 414
height: 433
}, state: "normal",
resizable: false
}, function(win) {
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "BlocklyProp Launcher",
"description": "A Chrome application that connects your Propeller-Powered Hardware to the BlocklyProp website.",
"version": "1.0.4",
"version": "1.0.7",
"manifest_version": 2,
"minimum_chrome_version": "45",

Expand Down
2 changes: 1 addition & 1 deletion package/mac-resources/welcome.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ <h3>Introduction</h3>

<p>This software installs the BlocklyProp Launcher into your Applications folder.</p>

<p>Copyright (c) 2021 Parallax Inc.</p>
<p>Copyright (c) 2022 Parallax Inc.</p>
</body>
</html>
2 changes: 1 addition & 1 deletion package/mac-resources/welcomeFTDI.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ <h3>Introduction</h3>

<p>The required FTDI USB Serial Driver will also be installed. The system must be restarted after installation to use it.</p>

<p>Copyright (c) 2021 Parallax Inc.</p>
<p>Copyright (c) 2022 Parallax Inc.</p>
</body>
</html>
13 changes: 3 additions & 10 deletions package/mac_app_sign_and_package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,17 +300,9 @@ if [ "$?" != "0" ]; then
exit 1
fi
#
# libswiftshader_libEGL.dylib
# libvk_swiftshader.dylib
#
codesign -s "$APP_IDENTITY" --deep -f -v --options runtime --timestamp --entitlements "${ENTITLEMENTS}" "${DISTRIBUTION}${APP_BUNDLE}${NWJS_FW_LIBRARIES}libswiftshader_libEGL.dylib"
if [ "$?" != "0" ]; then
echo "[Error] Code signing nwjs library failed!" 1>&2
exit 1
fi
#
# libswiftshader_libGLESv2.dylib
#
codesign -s "$APP_IDENTITY" --deep -f -v --options runtime --timestamp --entitlements "${ENTITLEMENTS}" "${DISTRIBUTION}${APP_BUNDLE}${NWJS_FW_LIBRARIES}libswiftshader_libGLESv2.dylib"
codesign -s "$APP_IDENTITY" --deep -f -v --options runtime --timestamp --entitlements "${ENTITLEMENTS}" "${DISTRIBUTION}${APP_BUNDLE}${NWJS_FW_LIBRARIES}libvk_swiftshader.dylib"
if [ "$?" != "0" ]; then
echo "[Error] Code signing nwjs library failed!" 1>&2
exit 1
Expand Down Expand Up @@ -479,6 +471,7 @@ if [[ -e ${RESOURCES}${DIST_DST} ]]
then
echo "Cleaning up temporary files..."
rm ${RESOURCES}${DIST_DST}
rm ${DISTRIBUTION}${APP_NAME}.pkg
fi

echo
Expand Down
Loading