Skip to content

Commit b02a905

Browse files
mastrolinuxmastrolinux
committed
Merge pull request #6 from arduino/external_installer
Use external installer
2 parents 15f3fcb + 974ab34 commit b02a905

11 files changed

+484
-62
lines changed

‎ArduinoCreateAgent.xml

Lines changed: 310 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,310 @@
1+
<project>
2+
<shortName>ArduinoCreateAgent</shortName>
3+
<fullName>arduino-create-agent</fullName>
4+
<version>1.0</version>
5+
<licenseFile>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/LICENSE.md</licenseFile>
6+
<leftImage>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/installer_icons/Installer.png</leftImage>
7+
<logoImage>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/installer_icons/InstallerIcon.png</logoImage>
8+
<splashImage>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/installer_icons/InstallerSplash.png</splashImage>
9+
<defaultLanguage>auto</defaultLanguage>
10+
<componentList>
11+
<component>
12+
<name>default</name>
13+
<description>Default Component</description>
14+
<canBeEdited>1</canBeEdited>
15+
<selected>1</selected>
16+
<show>1</show>
17+
<desktopShortcutList>
18+
<shortcut>
19+
<comment></comment>
20+
<exec>${installdir}/Arduino_Create_Bridge</exec>
21+
<icon>${installdir}/InstallerIcon.png</icon>
22+
<name>Arduino Create Agent</name>
23+
<path></path>
24+
<platforms>linux-x64</platforms>
25+
<runAsAdmin>0</runAsAdmin>
26+
<runInTerminal>0</runInTerminal>
27+
<windowsExec></windowsExec>
28+
<windowsExecArgs></windowsExecArgs>
29+
<windowsIcon></windowsIcon>
30+
<windowsPath></windowsPath>
31+
</shortcut>
32+
</desktopShortcutList>
33+
<folderList>
34+
<folder>
35+
<description>Program Files</description>
36+
<destination>${installdir}</destination>
37+
<name>programfiles</name>
38+
<platforms>all</platforms>
39+
<distributionFileList>
40+
<distributionFile>
41+
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/fakecerts/cert.pem</origin>
42+
</distributionFile>
43+
<distributionFile>
44+
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/fakecerts/key.pem</origin>
45+
</distributionFile>
46+
<distributionFile>
47+
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/config.ini</origin>
48+
</distributionFile>
49+
</distributionFileList>
50+
<shortcutList>
51+
<shortcut>
52+
<comment>Uninstall</comment>
53+
<exec>${installdir}/${uninstallerName}</exec>
54+
<icon></icon>
55+
<name>Uninstall ${product_fullname}</name>
56+
<path>${installdir}</path>
57+
<platforms>all</platforms>
58+
<runAsAdmin>0</runAsAdmin>
59+
<runInTerminal>0</runInTerminal>
60+
<windowsExec>${installdir}/${uninstallerName}.exe</windowsExec>
61+
<windowsExecArgs></windowsExecArgs>
62+
<windowsIcon></windowsIcon>
63+
<windowsPath>${installdir}</windowsPath>
64+
</shortcut>
65+
</shortcutList>
66+
</folder>
67+
<folder>
68+
<description>Program Files</description>
69+
<destination>${installdir}</destination>
70+
<name>programfileslinux</name>
71+
<platforms>linux-x64</platforms>
72+
<distributionFileList>
73+
<distributionFile>
74+
<allowWildcards>1</allowWildcards>
75+
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/snapshot/linux_amd64/Arduino_Create_Bridge</origin>
76+
</distributionFile>
77+
<distributionDirectory>
78+
<origin>/tmp/linux/arduino/arduino</origin>
79+
</distributionDirectory>
80+
<distributionFile>
81+
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/installer_icons/InstallerIcon.png</origin>
82+
</distributionFile>
83+
</distributionFileList>
84+
</folder>
85+
<folder>
86+
<description>Program Files</description>
87+
<destination>${installdir}</destination>
88+
<name>programfileswindows</name>
89+
<platforms>windows</platforms>
90+
<distributionFileList>
91+
<distributionFile>
92+
<allowWildcards>1</allowWildcards>
93+
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/snapshot/windows_386/Arduino_Create_Bridge.exe</origin>
94+
</distributionFile>
95+
<distributionDirectory>
96+
<origin>/tmp/windows/arduino/arduino</origin>
97+
</distributionDirectory>
98+
<distributionFile>
99+
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/installer_icons/tray_iconWin.ico</origin>
100+
</distributionFile>
101+
</distributionFileList>
102+
</folder>
103+
<folder>
104+
<description>Program Files</description>
105+
<destination>${installdir}</destination>
106+
<name>programfilesosx</name>
107+
<platforms>osx</platforms>
108+
<distributionFileList>
109+
<distributionFile>
110+
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/snapshot/darwin_amd64/Arduino_Create_Bridge</origin>
111+
</distributionFile>
112+
<distributionDirectory>
113+
<origin>/tmp/macosx/arduino/arduino</origin>
114+
</distributionDirectory>
115+
</distributionFileList>
116+
</folder>
117+
<folder>
118+
<description>Autostart</description>
119+
<destination>/etc/xdg/autostart</destination>
120+
<name>xdgautostart</name>
121+
<platforms>linux-x64</platforms>
122+
<shortcutList>
123+
<shortcut>
124+
<comment></comment>
125+
<exec>${installdir}/Arduino_Create_Bridge &amp;</exec>
126+
<icon>${installdir}/InstallerIcon.png</icon>
127+
<name>arduino-create-agent</name>
128+
<path></path>
129+
<platforms>linux-x64</platforms>
130+
<runAsAdmin>0</runAsAdmin>
131+
<runInTerminal>0</runInTerminal>
132+
<windowsExec></windowsExec>
133+
<windowsExecArgs></windowsExecArgs>
134+
<windowsIcon></windowsIcon>
135+
<windowsPath></windowsPath>
136+
</shortcut>
137+
</shortcutList>
138+
</folder>
139+
<folder>
140+
<description>Autostart</description>
141+
<destination>${windows_folder_common_startup}</destination>
142+
<name>winautostart</name>
143+
<platforms>windows</platforms>
144+
<shortcutList>
145+
<shortcut>
146+
<comment></comment>
147+
<exec></exec>
148+
<icon></icon>
149+
<name>Arduino Create Agent</name>
150+
<path></path>
151+
<platforms>windows</platforms>
152+
<runAsAdmin>0</runAsAdmin>
153+
<runInTerminal>0</runInTerminal>
154+
<windowsExec>${installdir}/Arduino_Create_Bridge.exe</windowsExec>
155+
<windowsExecArgs></windowsExecArgs>
156+
<windowsIcon></windowsIcon>
157+
<windowsPath></windowsPath>
158+
</shortcut>
159+
</shortcutList>
160+
</folder>
161+
</folderList>
162+
<startMenuShortcutList>
163+
<startMenuShortcut>
164+
<comment>Uninstall ${product_fullname}</comment>
165+
<name>Uninstall ${product_fullname}</name>
166+
<runAsAdmin>0</runAsAdmin>
167+
<runInTerminal>0</runInTerminal>
168+
<windowsExec>${installdir}/${uninstallerName}.exe</windowsExec>
169+
<windowsExecArgs></windowsExecArgs>
170+
<windowsIcon></windowsIcon>
171+
<windowsPath>${installdir}/</windowsPath>
172+
</startMenuShortcut>
173+
<startMenuShortcut>
174+
<comment></comment>
175+
<name>Arduino Create Agent</name>
176+
<runAsAdmin>0</runAsAdmin>
177+
<runInTerminal>0</runInTerminal>
178+
<windowsExec>${installdir}/Arduino_Create_Bridge</windowsExec>
179+
<windowsExecArgs></windowsExecArgs>
180+
<windowsIcon>${installdir}/tray_IconWin.ico</windowsIcon>
181+
<windowsPath></windowsPath>
182+
</startMenuShortcut>
183+
</startMenuShortcutList>
184+
</component>
185+
</componentList>
186+
<preBuildActionList>
187+
<createDirectory>
188+
<path>/tmp/linux/arduino</path>
189+
</createDirectory>
190+
<createDirectory>
191+
<path>/tmp/macosx/arduino</path>
192+
</createDirectory>
193+
<createDirectory>
194+
<path>/tmp/windows/arduino</path>
195+
</createDirectory>
196+
<copyFile>
197+
<destination>/tmp/linux/Arduino_Create_Bridge</destination>
198+
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/snapshot/linux_amd64/Arduino_Create_Bridge</origin>
199+
</copyFile>
200+
<copyFile>
201+
<destination>/tmp/macosx/Arduino_Create_Bridge</destination>
202+
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/snapshot/darwin_amd64/Arduino_Create_Bridge</origin>
203+
</copyFile>
204+
<copyFile>
205+
<destination>/tmp/windows/Arduino_Create_Bridge.exe</destination>
206+
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/snapshot/windows_386/Arduino_Create_Bridge.exe</origin>
207+
</copyFile>
208+
<unzip>
209+
<destinationDirectory>/tmp/linux/arduino/</destinationDirectory>
210+
<zipFile>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/snapshot/linux_amd64/arduino.zip</zipFile>
211+
</unzip>
212+
<unzip>
213+
<destinationDirectory>/tmp/macosx/arduino/</destinationDirectory>
214+
<zipFile>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/snapshot/darwin_amd64/arduino.zip</zipFile>
215+
</unzip>
216+
<unzip>
217+
<destinationDirectory>/tmp/windows/arduino/</destinationDirectory>
218+
<zipFile>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/snapshot/windows_386/arduino.zip</zipFile>
219+
</unzip>
220+
</preBuildActionList>
221+
<postInstallationActionList>
222+
<createOSXService>
223+
<groupname></groupname>
224+
<keepAlive>0</keepAlive>
225+
<program>${installdir}/Arduino_Create_Bridge</program>
226+
<programArguments></programArguments>
227+
<serviceName>${product_shortname}</serviceName>
228+
<username></username>
229+
</createOSXService>
230+
<runProgram>
231+
<program>${installdir}/Arduino_Create_Bridge</program>
232+
<programArguments>&amp;</programArguments>
233+
<ruleList>
234+
<platformTest>
235+
<negate>1</negate>
236+
<type>windows</type>
237+
</platformTest>
238+
</ruleList>
239+
</runProgram>
240+
<runProgram>
241+
<program>schtasks</program>
242+
<programArguments>/create /sc onlogon /tn ArduinoCreateAgent /rl highest /tr "${installdir}/Arduino_Create_Bridge.exe"</programArguments>
243+
<progressText>Creating startup task</progressText>
244+
<ruleList>
245+
<platformTest>
246+
<type>windows-2000</type>
247+
</platformTest>
248+
</ruleList>
249+
</runProgram>
250+
<runProgram>
251+
<program>${installdir}/Arduino_Create_Bridge.exe</program>
252+
<programArguments>&amp;</programArguments>
253+
<progressText>Launching Agent</progressText>
254+
<useMSDOSPath>0</useMSDOSPath>
255+
<workingDirectory>${installdir}</workingDirectory>
256+
<ruleList>
257+
<platformTest>
258+
<type>windows</type>
259+
</platformTest>
260+
</ruleList>
261+
</runProgram>
262+
<registrySet>
263+
<key>HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Run</key>
264+
<name>ArduinoCreateAgent</name>
265+
<type>REG_SZ</type>
266+
<value>"${installdir}/Arduino_Create_Bridge.exe"</value>
267+
<ruleList>
268+
<platformTest>
269+
<type>windows</type>
270+
</platformTest>
271+
</ruleList>
272+
</registrySet>
273+
</postInstallationActionList>
274+
<preUninstallationActionList>
275+
<deleteOSXService>
276+
<serviceName>${product_shortname}</serviceName>
277+
</deleteOSXService>
278+
<runProgram>
279+
<program>schtasks</program>
280+
<programArguments>/delete /tn ArduinoCreateAgent /f</programArguments>
281+
<ruleList>
282+
<platformTest>
283+
<type>windows-2000</type>
284+
</platformTest>
285+
</ruleList>
286+
</runProgram>
287+
</preUninstallationActionList>
288+
<createOsxBundleDmg>1</createOsxBundleDmg>
289+
<enableRollback>1</enableRollback>
290+
<enableTimestamp>1</enableTimestamp>
291+
<requireInstallationByRootUser>1</requireInstallationByRootUser>
292+
<vendor>Arduino LLC</vendor>
293+
<windowsExecutableIcon>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/src/github.com/facchinm/systray/example/icon/iconwin.ico</windowsExecutableIcon>
294+
<parameterList>
295+
<directoryParameter>
296+
<name>installdir</name>
297+
<description>Installer.Parameter.installdir.description</description>
298+
<explanation>Installer.Parameter.installdir.explanation</explanation>
299+
<value></value>
300+
<default>${platform_install_prefix}/${product_shortname}-${product_version}</default>
301+
<allowEmptyValue>0</allowEmptyValue>
302+
<ask>yes</ask>
303+
<cliOptionName>prefix</cliOptionName>
304+
<mustBeWritable>yes</mustBeWritable>
305+
<mustExist>0</mustExist>
306+
<width>30</width>
307+
</directoryParameter>
308+
</parameterList>
309+
</project>
310+

‎README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
serial-port-json-server
22
=======================
33

4-
Get the latest version of the Bridge for all supported platforms: http://downloads.arduino.cc/CreateBridge/CreateBridge.zip
4+
Get the latest version of the Bridge for all supported platforms:
5+
6+
[Linux x64](http://downloads.arduino.cc/CreateBridge/ArduinoCreateAgent-1.0-linux-x64-installer.run)
7+
8+
[MacOSX](http://downloads.arduino.cc/CreateBridge/ArduinoCreateAgent-1.0-osx-installer.dmg)
9+
10+
[Windows](http://downloads.arduino.cc/CreateBridge/ArduinoCreateAgent-1.0-windows-installer.exe)
511

612
Version 1.82
713

‎compile_webidebridge.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ createZipEmbeddableFileArduino()
3434
cd arduino
3535
zip -r arduino.zip arduino/* config.ini *.pem > /dev/null
3636
cd ..
37-
cat arduino/arduino.zip >> $3
38-
zip --adjust-sfx $3
37+
#cat arduino/arduino.zip >> $3
38+
#zip --adjust-sfx $3
3939
mkdir -p snapshot/$GOOS\_$GOARCH
4040
cp $3 snapshot/$GOOS\_$GOARCH/$3
41+
cp arduino/arduino.zip snapshot/$GOOS\_$GOARCH
4142
ls -la snapshot/$GOOS\_$GOARCH/$3
4243
}
4344

@@ -53,7 +54,6 @@ bootstrapPlatforms()
5354
env CC_FOR_TARGET=i686-w64-mingw32-gcc CGO_ENABLED=1 GOOS=windows GOARCH=386 ./make.bash --no-clean
5455
}
5556

56-
set -x
5757
compilePlatform()
5858
{
5959
echo 'In compilePlatform'
@@ -65,16 +65,17 @@ compilePlatform()
6565
if [ $GOOS == "windows" ]
6666
then
6767
NAME=$NAME".exe"
68+
EXTRAFLAGS="-ldflags -H=windowsgui"
6869
fi
69-
env GOOS=$GOOS GOARCH=$GOARCH CC=$CC CXX=$CC CGO_ENABLED=$CGO_ENABLED go build -o=$NAME
70+
env GOOS=$GOOS GOARCH=$GOARCH CC=$CC CXX=$CC CGO_ENABLED=$CGO_ENABLED go build -o=$NAME $EXTRAFLAGS
7071
if [ $? != 0 ]
7172
then
7273
echo -e "${red}Target $GOOS, $GOARCH failed${NC}"
7374
exit 1
7475
fi
7576
echo createZipEmbeddableFileArduino $GOOS $GOARCH $NAME
7677
createZipEmbeddableFileArduino $GOOS $GOARCH $NAME
77-
GOOS=$GOOS GOARCH=$GOARCH go-selfupdate $NAME $VERSION
78+
#GOOS=$GOOS GOARCH=$GOARCH go-selfupdate $NAME $VERSION
7879
rm -rf $NAME*
7980
}
8081

‎installer_icons/Installer.png

4.76 KB
Loading

‎installer_icons/InstallerIcon.png

1.23 KB
Loading

‎installer_icons/InstallerSplash.png

4.54 KB
Loading

‎installer_icons/tray_iconWin.ico

14.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)