Skip to content

Commit

Permalink
Updated for macOS release of nwjs-wrapped version.
Browse files Browse the repository at this point in the history
  • Loading branch information
GitHub-Obex-Bot committed Feb 10, 2023
1 parent 2e5f133 commit 6391703
Show file tree
Hide file tree
Showing 16 changed files with 69 additions and 65 deletions.
8 changes: 3 additions & 5 deletions MakeRelease
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
echo
echo ---Making Chrome App release in ./release folder ONLY---
echo ...Making Chrome App release in ./release folder...
echo
echo STEP 1 of 2: Clearing ./release folder
echo STEP 1: Clearing ./release folder
echo
# Clear release folder
rm -R release/*

echo
echo STEP 2 of 2: Copying static resources to ./release folder
echo STEP 2: Copying static resources to ./release folder
echo
# Copy static resources
cp -R assets release/assets
Expand All @@ -20,6 +20,4 @@ cp bundle.js release/
cp index.html release/
cp manifest.json release/

echo Done!


21 changes: 21 additions & 0 deletions MakeReleaseMac
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
echo
echo ---Making Chrome App release in ./release and ./dist/.../app.nw folders---
echo
# Clear release folder and copy static resources to it
./MakeRelease

echo
echo STEP 3: Clearing ./dist/.../app.nw mac application folder
echo
# Clear app.nw folder
rm -R dist/ParallaxIDE.app/Contents/Resources/app.nw/*

echo
echo STEP 4: Copying release files to ./dist/.../app.nw windows application folder
echo
# Copy static resources
cp -R release/* dist/ParallaxIDE.app/Contents/Resources/app.nw

echo Done!
echo

25 changes: 5 additions & 20 deletions MakeReleaseWin
Original file line number Diff line number Diff line change
@@ -1,37 +1,22 @@
echo
echo ---Making Chrome App release in ./release and ./package/.../package.nw folders---
echo
echo STEP 1 of 4: Clearing ./release folder
echo
# Clear release folder
rm -R release/*

echo
echo STEP 2 of 4: Copying static resources to ./release folder
echo
# Copy static resources
cp -R assets release/assets
cp -R examples release/examples
cp -R fonts release/fonts
cp -R icons release/icons
cp -R _locales release/_locales
cp background.js release/
cp bundle.js release/
cp index.html release/
cp manifest.json release/
# Clear release folder and copy static resources to it
./MakeRelease

echo
echo STEP 3 of 4: Clearing ./package/.../package.nw windows application folder
echo STEP 3: Clearing ./package/.../package.nw windows application folder
echo
# Clear package.nw folder
rm -R package/win-resources/nwjs/dependencies/package.nw/*

echo
echo STEP 4 of 4: Copying release files to ./package/.../package.nw windows application folder
echo STEP 4: Copying release files to ./package/.../package.nw windows application folder
echo
# Copy static resources
cp -R release/* package/win-resources/nwjs/dependencies/package.nw

echo Done!
echo


3 changes: 0 additions & 3 deletions package/mac-resources/BlocklyProp.icns

This file was deleted.

26 changes: 13 additions & 13 deletions package/mac-resources/Distribution.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
<installer-gui-script minSpecVersion="1">

<!-- Define install parameters -->
<title>BlocklyProp Launcher</title>
<title>Parallax IDE Launcher</title>
<organization>com.ParallaxInc</organization>

<!-- Allow module installs, no scripts -->
<options customize="allow" require-scripts="false" rootVolumeOnly="false" allow-external-scripts="no" />

<!-- Must quit the IDE, if it is running -->
<pkg-ref id="com.ParallaxInc.BlocklyPropLauncher.app">
<pkg-ref id="com.ParallaxInc.ParallaxIDE.app">
<must-close>
<app id="com.ParallaxInc.BlocklyPropLauncher"/>
<app id="com.ParallaxInc.ParallaxIDE"/>
</must-close>
</pkg-ref>

Expand All @@ -25,30 +25,30 @@

<choices-outline>
<line choice="default">
<line choice="com.ParallaxInc.BlocklyPropLauncher.app"/>
<line choice="com.ParallaxInc.ParallaxIDE.app"/>
</line>
</choices-outline>

<!-- Default complete package install -->
<choice
id="default"
visible="true"
title="BlocklyProp Launcher"
description="BlocklyProp Launcher installation">
title="Parallax IDE"
description="Parallax IDE installation">
</choice>

<!-- BPLauncher App pkg -->
<!-- ParallaxIDE App pkg -->
<choice
id="com.ParallaxInc.BlocklyPropLauncher.app"
id="com.ParallaxInc.ParallaxIDE.app"
visible="true"
title="BlocklyProp Launcher Application"
description="The BlocklyProp assistant application">
<pkg-ref id="com.ParallaxInc.BlocklyPropLauncher.app"/>
title="Parallax IDE Application"
description="The Parallax BASIC Stamp Editor">
<pkg-ref id="com.ParallaxInc.ParallaxIDE.app"/>
</choice>

<pkg-ref
id="com.ParallaxInc.BlocklyPropLauncher.app"
onConclusion="none">BlocklyPropLauncher.pkg
id="com.ParallaxInc.ParallaxIDE.app"
onConclusion="none">ParallaxIDE.pkg
</pkg-ref>

</installer-gui-script>
26 changes: 13 additions & 13 deletions package/mac-resources/DistributionFTDI.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
<installer-gui-script minSpecVersion="1">

<!-- Define install parameters -->
<title>BlocklyProp Launcher</title>
<title>Parallax IDE</title>
<organization>com.ParallaxInc</organization>

<!-- Allow module installs, no scripts -->
<options customize="allow" require-scripts="false" rootVolumeOnly="false" allow-external-scripts="no" />

<!-- Must quit the IDE, if it is running -->
<pkg-ref id="com.ParallaxInc.BlocklyPropLauncher.app">
<pkg-ref id="com.ParallaxInc.ParallaxIDE.app">
<must-close>
<app id="com.ParallaxInc.BlocklyPropLauncher"/>
<app id="com.ParallaxInc.ParallaxIDE"/>
</must-close>
</pkg-ref>

Expand All @@ -25,7 +25,7 @@

<choices-outline>
<line choice="default">
<line choice="com.ParallaxInc.BlocklyPropLauncher.app"/>
<line choice="com.ParallaxInc.ParallaxIDE.app"/>
<line choice="com.FTDI.driver.FTDIUSBSerialDriver"/>
</line>
</choices-outline>
Expand All @@ -34,22 +34,22 @@
<choice
id="default"
visible="true"
title="BlocklyProp Launcher with FTDI USB Serial Driver"
description="BlocklyProp Launcher with FTDI USB Serial Driver installation">
title="Parallax IDE with FTDI USB Serial Driver"
description="Parallax IDE with FTDI USB Serial Driver installation">
</choice>

<!-- BPLauncher App pkg -->
<!-- ParallaxIDE App pkg -->
<choice
id="com.ParallaxInc.BlocklyPropLauncher.app"
id="com.ParallaxInc.ParallaxIDE.app"
visible="true"
title="BlocklyProp Launcher Application"
description="The BlocklyProp assistant application">
<pkg-ref id="com.ParallaxInc.BlocklyPropLauncher.app"/>
title="ParallaxIDE Application"
description="The Parallax BASIC Stamp Editor">
<pkg-ref id="com.ParallaxInc.ParallaxIDE.app"/>
</choice>

<pkg-ref
id="com.ParallaxInc.BlocklyPropLauncher.app"
onConclusion="none">BlocklyPropLauncher.pkg
id="com.ParallaxInc.ParallaxIDE.app"
onConclusion="none">ParallaxIDE.pkg
</pkg-ref>

<!-- FTDI USB Serial Driver pkg -->
Expand Down
3 changes: 3 additions & 0 deletions package/mac-resources/ParallaxIDE.icns
Git LFS file not shown
2 changes: 1 addition & 1 deletion package/mac-resources/conclusion.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<html>
<body>
<h2>The Parallax BlocklyProp Launcher was installed.</h2>
<h2>The Parallax IDE was installed.</h2>
</body>
</html>
10 changes: 5 additions & 5 deletions package/mac-resources/welcome.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<html>
<body>
<h2>Welcome to the BlocklyProp Launcher Installer from Parallax Inc.</h2>
<h2>Welcome to the Parallax IDE Installer from Parallax Inc.</h2>
<h3>Introduction</h3>

<p>BlocklyProp Launcher is a companion to the web-based BlocklyProp system - https://solo.parallax.com.</p>
<p>It provides one-button access to the Solo (BlocklyProp) online site and handles communication with the Propeller microcontroller.</p>
<p>Parallax IDE is a BASIC Stamp editor.</p>
<p>It allows development for the BASIC Stamp microncontroller.</p>

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

<p>Copyright (c) 2022 Parallax Inc.</p>
<p>Copyright (c) 2023 Parallax Inc.</p>
</body>
</html>
10 changes: 5 additions & 5 deletions package/mac-resources/welcomeFTDI.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<html>
<body>
<h2>Welcome to the BlocklyProp Launcher Installer from Parallax Inc.</h2>
<h2>Welcome to the Parallax IDE Installer from Parallax Inc.</h2>
<h3>Introduction</h3>

<p>BlocklyProp Launcher is a companion to the web-based BlocklyProp system - https://solo.parallax.com.</p>
<p>It provides one-button access to the Solo (BlocklyProp) online site and handles communication with the Propeller microcontroller.</p>
<p>Parallax IDE is a BASIC Stamp editor.</p>
<p>It allows development for the BASIC Stamp microcontroller.</p>

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

<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) 2022 Parallax Inc.</p>
<p>Copyright (c) 2023 Parallax Inc.</p>
</body>
</html>
Empty file modified package/mac_app_notarize.sh
100644 → 100755
Empty file.
Empty file modified package/mac_app_sign_and_package.sh
100644 → 100755
Empty file.
Empty file modified package/mac_app_sign_and_package_10.13-.sh
100644 → 100755
Empty file.
Empty file modified package/mac_app_sign_and_package_12.1-.sh
100644 → 100755
Empty file.
Empty file modified package/mac_app_staple.sh
100644 → 100755
Empty file.
Empty file modified package/mac_app_verify_signatures.sh
100644 → 100755
Empty file.

0 comments on commit 6391703

Please sign in to comment.