Skip to content

Commit 45cf663

Browse files
PropGitPropGit
committed
Major customizations added to installer. Includes license page (which may be removed).
1 parent 710a2d5 commit 45cf663

File tree

7 files changed

+146
-21
lines changed

7 files changed

+146
-21
lines changed

‎package/mac-resources/Distribution.xml‎

Lines changed: 48 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,55 @@
11
<?xml version="1.0" encoding="utf-8" standalone="no"?>
2+
3+
<!-- THIS FILE REQUIRED FOR PACKAGE-SIGNING — DO NOT REMOVE -->
4+
25
<installer-gui-script minSpecVersion="1">
3-
<title>Parallax BlocklyProp Launcher</title>
4-
<pkg-ref id="com.ParallaxInc.BlocklyPropLauncher"/>
5-
<options customize="never" require-scripts="false"/>
6+
7+
<!-- Define install parameters -->
8+
<title>BlocklyProp Launcher</title>
9+
<organization>com.ParallaxInc</organization>
10+
11+
<!-- Allow module installs, no scripts -->
12+
<options customize="allow" require-scripts="false" rootVolumeOnly="false" allow-external-scripts="no" />
13+
14+
<!-- Must quit the IDE, if it is running -->
15+
<pkg-ref id="com.ParallaxInc.BlocklyPropLauncher.app">
16+
<must-close>
17+
<app id="com.ParallaxInc.BlocklyPropLauncher"/>
18+
</must-close>
19+
</pkg-ref>
20+
21+
<!-- Define documents displayed at various steps -->
22+
<welcome file="welcome.html" mime-type="text/html" />
23+
<license file="license.html" mime-type="text/html" />
24+
<background file="splash620x418.png" mime-type="image/png" />
25+
<conclusion file="conclusion.html" mime-type="text/html" />
26+
627
<choices-outline>
728
<line choice="default">
8-
<line choice="com.ParallaxInc.BlocklyPropLauncher"/>
29+
<line choice="com.ParallaxInc.BlocklyPropLauncher.app"/>
930
</line>
1031
</choices-outline>
11-
<choice id="default"/>
12-
<choice id="com.ParallaxInc.BlocklyPropLauncher" visible="false">
13-
<pkg-ref id="com.ParallaxInc.BlocklyPropLauncher"/>
32+
33+
<!-- Default complete package install -->
34+
<choice
35+
id="default"
36+
visible="true"
37+
title="BlocklyProp Launcher"
38+
description="BlocklyProp Launcher installation">
1439
</choice>
15-
<pkg-ref id="com.ParallaxInc.BlocklyPropLauncher" version="0.11.0" onConclusion="none">BlocklyProp%20Launcher.pkg</pkg-ref>
16-
</installer-gui-script>
40+
41+
<!-- BPLauncher App pkg -->
42+
<choice
43+
id="com.ParallaxInc.BlocklyPropLauncher.app"
44+
visible="true"
45+
title="BlocklyProp Launcher Application"
46+
description="The BlocklyProp assistant application">
47+
<pkg-ref id="com.ParallaxInc.BlocklyPropLauncher.app"/>
48+
</choice>
49+
50+
<pkg-ref
51+
id="com.ParallaxInc.BlocklyPropLauncher.app"
52+
onConclusion="none">BlocklyPropLauncher.pkg
53+
</pkg-ref>
54+
55+
</installer-gui-script>

‎package/mac-resources/DistributionFTDI.xml‎

Lines changed: 60 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,70 @@
11
<?xml version="1.0" encoding="utf-8" standalone="no"?>
2+
3+
<!-- THIS FILE REQUIRED FOR PACKAGE-SIGNING — DO NOT REMOVE -->
4+
25
<installer-gui-script minSpecVersion="1">
3-
<title>Parallax BlocklyProp Launcher</title>
4-
<pkg-ref id="com.ParallaxInc.BlocklyPropLauncher"/>
5-
<pkg-ref id="com.FTDI.driver.FTDIUSBSerialDriver"/>
6-
<options customize="never" require-scripts="false"/>
6+
7+
<!-- Define install parameters -->
8+
<title>BlocklyProp Launcher</title>
9+
<organization>com.ParallaxInc</organization>
10+
11+
<!-- Allow module installs, no scripts -->
12+
<options customize="allow" require-scripts="false" rootVolumeOnly="false" allow-external-scripts="no" />
13+
14+
<!-- Must quit the IDE, if it is running -->
15+
<pkg-ref id="com.ParallaxInc.BlocklyPropLauncher.app">
16+
<must-close>
17+
<app id="com.ParallaxInc.BlocklyPropLauncher"/>
18+
</must-close>
19+
</pkg-ref>
20+
21+
<!-- Define documents displayed at various steps -->
22+
<welcome file="welcomeFTDI.html" mime-type="text/html" />
23+
<license file="license.html" mime-type="text/html" />
24+
<background file="splash620x418.png" mime-type="image/png" />
25+
<conclusion file="conclusion.html" mime-type="text/html" />
26+
727
<choices-outline>
828
<line choice="default">
9-
<line choice="com.ParallaxInc.BlocklyPropLauncher"/>
29+
<line choice="com.ParallaxInc.BlocklyPropLauncher.app"/>
1030
<line choice="com.FTDI.driver.FTDIUSBSerialDriver"/>
1131
</line>
1232
</choices-outline>
13-
<choice id="default"/>
14-
<choice id="com.ParallaxInc.BlocklyPropLauncher" visible="false">
15-
<pkg-ref id="com.ParallaxInc.BlocklyPropLauncher"/>
33+
34+
<!-- Default complete package install -->
35+
<choice
36+
id="default"
37+
visible="true"
38+
title="BlocklyProp Launcher with FTDI USB Serial Driver"
39+
description="BlocklyProp Launcher with FTDI USB Serial Driver installation">
1640
</choice>
17-
<pkg-ref id="com.ParallaxInc.BlocklyPropLauncher" version="0.11.0" onConclusion="none">BlocklyProp%20Launcher.pkg</pkg-ref>
18-
<choice id="com.FTDI.driver.FTDIUSBSerialDriver" visible="false">
41+
42+
<!-- BPLauncher App pkg -->
43+
<choice
44+
id="com.ParallaxInc.BlocklyPropLauncher.app"
45+
visible="true"
46+
title="BlocklyProp Launcher Application"
47+
description="The BlocklyProp assistant application">
48+
<pkg-ref id="com.ParallaxInc.BlocklyPropLauncher.app"/>
49+
</choice>
50+
51+
<pkg-ref
52+
id="com.ParallaxInc.BlocklyPropLauncher.app"
53+
onConclusion="none">BlocklyPropLauncher.pkg
54+
</pkg-ref>
55+
56+
<!-- FTDI USB Serial Driver pkg -->
57+
<choice
58+
id="com.FTDI.driver.FTDIUSBSerialDriver"
59+
visible="true"
60+
title="FTDI USB Serial Driver"
61+
description="Future Technology Devices International USB Serial Driver">
1962
<pkg-ref id="com.FTDI.driver.FTDIUSBSerialDriver"/>
2063
</choice>
21-
<pkg-ref id="com.FTDI.driver.FTDIUSBSerialDriver" version="0.11.0" onConclusion="none">FTDIUSBSerialDriver.pkg</pkg-ref>
22-
</installer-gui-script>
64+
65+
<pkg-ref
66+
id="com.FTDI.driver.FTDIUSBSerialDriver"
67+
onConclusion="none">FTDIUSBSerialDriver.pkg
68+
</pkg-ref>
69+
70+
</installer-gui-script>

‎package/mac-resources/conclusion.html‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<html>
2+
<body>
3+
<h2>The Parallax BlocklyProp Launcher was installed.</h2>
4+
</body>
5+
</html>

‎package/mac-resources/license.html‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<html>
2+
<body>
3+
4+
<p>BlocklyProp Launcher</p>
5+
<p>Copyright (c) 2019 Parallax Inc.</p>
6+
7+
<ul>
8+
<li>Main repository: https://github.com/parallaxinc/BlocklyProp</li>
9+
<li>Client repository: https://github.com/parallaxinc/BlocklyPropLauncher</li>
10+
</ul>
11+
12+
</body>
13+
</html>

‎package/mac-resources/splash620x418.png‎

38.1 KB
Loading

‎package/mac-resources/welcome.html‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<html>
2+
<body>
3+
<p><h2>Welcome to the BlocklyProp Launcher Installer from Parallax Inc.</h2></p>
4+
5+
<p>BlocklyProp Launcher is an assistant to the BlocklyProp development environment for the Parallax Propeller microcontroller. It provides one-button access to the BlocklyProp online site and handles communication with the Propeller.</p>
6+
7+
<p>This software installs the BlocklyProp Launcher into your Applications folder.</p>
8+
</body>
9+
</html>

‎package/mac-resources/welcomeFTDI.html‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<html>
2+
<body>
3+
<p><h2>Welcome to the BlocklyProp Launcher Installer from Parallax Inc.</h2></p>
4+
5+
<p>BlocklyProp Launcher is an assistant to the BlocklyProp development environment for the Parallax Propeller microcontroller. It provides one-button access to the BlocklyProp online site and handles communication with the Propeller.</p>
6+
7+
<p>This software installs the BlocklyProp Launcher into your Applications folder.</p>
8+
9+
<p>The required FTDI USB Serial Driver will also be installed. The system must be restarted after installation to use it.</p>
10+
</body>
11+
</html>

0 commit comments

Comments
 (0)