Skip to content

Use external installer #6

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 23 commits into from
Jul 27, 2015
Merged

Use external installer #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e5f770c
Revert "Disable systray"
facchinm Jul 23, 2015
5a549b5
Revert "Added deamon capabilities"
facchinm Jul 23, 2015
3efe297
enable clean operations using external installer
facchinm Jul 23, 2015
390029d
add agent version in tray icon
facchinm Jul 24, 2015
7514f4a
add installer icons
facchinm Jul 24, 2015
09db5df
add windows ico
facchinm Jul 24, 2015
811e56f
restore service without install
facchinm Jul 24, 2015
9ad0c8d
Fix duplication issues
matteosuppo Jul 15, 2015
c5d5060
Remove fallback completely
matteosuppo Jul 21, 2015
f87f90f
Use a faster implementation to avoid crashes when reading a lot of data
matteosuppo Jul 23, 2015
6e67a18
Update README.md
facchinm Jul 24, 2015
7b1f84c
Update README.md
facchinm Jul 24, 2015
e7a5c38
Got related ports working for windows
johnlauer Jun 2, 2015
e3e2f6a
Better metadata for Windows
johnlauer Jun 2, 2015
7980510
add board filtering on windows
facchinm Jul 24, 2015
c4a2829
Merge remote-tracking branch 'origin/external_installer' into externa…
facchinm Jul 24, 2015
e338c25
modify installer splash
facchinm Jul 24, 2015
1964f65
add installBuilder xml project
facchinm Jul 24, 2015
31a9069
compile windows executable without console
facchinm Jul 24, 2015
fb23663
remove daemon installation also on Linux
facchinm Jul 27, 2015
711f97c
move url to create-staging.arduino.cc
facchinm Jul 27, 2015
b3c046e
fix linker script for windows console-less
facchinm Jul 27, 2015
974ab34
update installer xml
facchinm Jul 27, 2015
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
310 changes: 310 additions & 0 deletions ArduinoCreateAgent.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,310 @@
<project>
<shortName>ArduinoCreateAgent</shortName>
<fullName>arduino-create-agent</fullName>
<version>1.0</version>
<licenseFile>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/LICENSE.md</licenseFile>
<leftImage>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/installer_icons/Installer.png</leftImage>
<logoImage>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/installer_icons/InstallerIcon.png</logoImage>
<splashImage>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/installer_icons/InstallerSplash.png</splashImage>
<defaultLanguage>auto</defaultLanguage>
<componentList>
<component>
<name>default</name>
<description>Default Component</description>
<canBeEdited>1</canBeEdited>
<selected>1</selected>
<show>1</show>
<desktopShortcutList>
<shortcut>
<comment></comment>
<exec>${installdir}/Arduino_Create_Bridge</exec>
<icon>${installdir}/InstallerIcon.png</icon>
<name>Arduino Create Agent</name>
<path></path>
<platforms>linux-x64</platforms>
<runAsAdmin>0</runAsAdmin>
<runInTerminal>0</runInTerminal>
<windowsExec></windowsExec>
<windowsExecArgs></windowsExecArgs>
<windowsIcon></windowsIcon>
<windowsPath></windowsPath>
</shortcut>
</desktopShortcutList>
<folderList>
<folder>
<description>Program Files</description>
<destination>${installdir}</destination>
<name>programfiles</name>
<platforms>all</platforms>
<distributionFileList>
<distributionFile>
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/fakecerts/cert.pem</origin>
</distributionFile>
<distributionFile>
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/fakecerts/key.pem</origin>
</distributionFile>
<distributionFile>
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/config.ini</origin>
</distributionFile>
</distributionFileList>
<shortcutList>
<shortcut>
<comment>Uninstall</comment>
<exec>${installdir}/${uninstallerName}</exec>
<icon></icon>
<name>Uninstall ${product_fullname}</name>
<path>${installdir}</path>
<platforms>all</platforms>
<runAsAdmin>0</runAsAdmin>
<runInTerminal>0</runInTerminal>
<windowsExec>${installdir}/${uninstallerName}.exe</windowsExec>
<windowsExecArgs></windowsExecArgs>
<windowsIcon></windowsIcon>
<windowsPath>${installdir}</windowsPath>
</shortcut>
</shortcutList>
</folder>
<folder>
<description>Program Files</description>
<destination>${installdir}</destination>
<name>programfileslinux</name>
<platforms>linux-x64</platforms>
<distributionFileList>
<distributionFile>
<allowWildcards>1</allowWildcards>
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/snapshot/linux_amd64/Arduino_Create_Bridge</origin>
</distributionFile>
<distributionDirectory>
<origin>/tmp/linux/arduino/arduino</origin>
</distributionDirectory>
<distributionFile>
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/installer_icons/InstallerIcon.png</origin>
</distributionFile>
</distributionFileList>
</folder>
<folder>
<description>Program Files</description>
<destination>${installdir}</destination>
<name>programfileswindows</name>
<platforms>windows</platforms>
<distributionFileList>
<distributionFile>
<allowWildcards>1</allowWildcards>
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/snapshot/windows_386/Arduino_Create_Bridge.exe</origin>
</distributionFile>
<distributionDirectory>
<origin>/tmp/windows/arduino/arduino</origin>
</distributionDirectory>
<distributionFile>
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/installer_icons/tray_iconWin.ico</origin>
</distributionFile>
</distributionFileList>
</folder>
<folder>
<description>Program Files</description>
<destination>${installdir}</destination>
<name>programfilesosx</name>
<platforms>osx</platforms>
<distributionFileList>
<distributionFile>
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/snapshot/darwin_amd64/Arduino_Create_Bridge</origin>
</distributionFile>
<distributionDirectory>
<origin>/tmp/macosx/arduino/arduino</origin>
</distributionDirectory>
</distributionFileList>
</folder>
<folder>
<description>Autostart</description>
<destination>/etc/xdg/autostart</destination>
<name>xdgautostart</name>
<platforms>linux-x64</platforms>
<shortcutList>
<shortcut>
<comment></comment>
<exec>${installdir}/Arduino_Create_Bridge &amp;</exec>
<icon>${installdir}/InstallerIcon.png</icon>
<name>arduino-create-agent</name>
<path></path>
<platforms>linux-x64</platforms>
<runAsAdmin>0</runAsAdmin>
<runInTerminal>0</runInTerminal>
<windowsExec></windowsExec>
<windowsExecArgs></windowsExecArgs>
<windowsIcon></windowsIcon>
<windowsPath></windowsPath>
</shortcut>
</shortcutList>
</folder>
<folder>
<description>Autostart</description>
<destination>${windows_folder_common_startup}</destination>
<name>winautostart</name>
<platforms>windows</platforms>
<shortcutList>
<shortcut>
<comment></comment>
<exec></exec>
<icon></icon>
<name>Arduino Create Agent</name>
<path></path>
<platforms>windows</platforms>
<runAsAdmin>0</runAsAdmin>
<runInTerminal>0</runInTerminal>
<windowsExec>${installdir}/Arduino_Create_Bridge.exe</windowsExec>
<windowsExecArgs></windowsExecArgs>
<windowsIcon></windowsIcon>
<windowsPath></windowsPath>
</shortcut>
</shortcutList>
</folder>
</folderList>
<startMenuShortcutList>
<startMenuShortcut>
<comment>Uninstall ${product_fullname}</comment>
<name>Uninstall ${product_fullname}</name>
<runAsAdmin>0</runAsAdmin>
<runInTerminal>0</runInTerminal>
<windowsExec>${installdir}/${uninstallerName}.exe</windowsExec>
<windowsExecArgs></windowsExecArgs>
<windowsIcon></windowsIcon>
<windowsPath>${installdir}/</windowsPath>
</startMenuShortcut>
<startMenuShortcut>
<comment></comment>
<name>Arduino Create Agent</name>
<runAsAdmin>0</runAsAdmin>
<runInTerminal>0</runInTerminal>
<windowsExec>${installdir}/Arduino_Create_Bridge</windowsExec>
<windowsExecArgs></windowsExecArgs>
<windowsIcon>${installdir}/tray_IconWin.ico</windowsIcon>
<windowsPath></windowsPath>
</startMenuShortcut>
</startMenuShortcutList>
</component>
</componentList>
<preBuildActionList>
<createDirectory>
<path>/tmp/linux/arduino</path>
</createDirectory>
<createDirectory>
<path>/tmp/macosx/arduino</path>
</createDirectory>
<createDirectory>
<path>/tmp/windows/arduino</path>
</createDirectory>
<copyFile>
<destination>/tmp/linux/Arduino_Create_Bridge</destination>
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/snapshot/linux_amd64/Arduino_Create_Bridge</origin>
</copyFile>
<copyFile>
<destination>/tmp/macosx/Arduino_Create_Bridge</destination>
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/snapshot/darwin_amd64/Arduino_Create_Bridge</origin>
</copyFile>
<copyFile>
<destination>/tmp/windows/Arduino_Create_Bridge.exe</destination>
<origin>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/snapshot/windows_386/Arduino_Create_Bridge.exe</origin>
</copyFile>
<unzip>
<destinationDirectory>/tmp/linux/arduino/</destinationDirectory>
<zipFile>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/snapshot/linux_amd64/arduino.zip</zipFile>
</unzip>
<unzip>
<destinationDirectory>/tmp/macosx/arduino/</destinationDirectory>
<zipFile>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/snapshot/darwin_amd64/arduino.zip</zipFile>
</unzip>
<unzip>
<destinationDirectory>/tmp/windows/arduino/</destinationDirectory>
<zipFile>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/snapshot/windows_386/arduino.zip</zipFile>
</unzip>
</preBuildActionList>
<postInstallationActionList>
<createOSXService>
<groupname></groupname>
<keepAlive>0</keepAlive>
<program>${installdir}/Arduino_Create_Bridge</program>
<programArguments></programArguments>
<serviceName>${product_shortname}</serviceName>
<username></username>
</createOSXService>
<runProgram>
<program>${installdir}/Arduino_Create_Bridge</program>
<programArguments>&amp;</programArguments>
<ruleList>
<platformTest>
<negate>1</negate>
<type>windows</type>
</platformTest>
</ruleList>
</runProgram>
<runProgram>
<program>schtasks</program>
<programArguments>/create /sc onlogon /tn ArduinoCreateAgent /rl highest /tr "${installdir}/Arduino_Create_Bridge.exe"</programArguments>
<progressText>Creating startup task</progressText>
<ruleList>
<platformTest>
<type>windows-2000</type>
</platformTest>
</ruleList>
</runProgram>
<runProgram>
<program>${installdir}/Arduino_Create_Bridge.exe</program>
<programArguments>&amp;</programArguments>
<progressText>Launching Agent</progressText>
<useMSDOSPath>0</useMSDOSPath>
<workingDirectory>${installdir}</workingDirectory>
<ruleList>
<platformTest>
<type>windows</type>
</platformTest>
</ruleList>
</runProgram>
<registrySet>
<key>HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Run</key>
<name>ArduinoCreateAgent</name>
<type>REG_SZ</type>
<value>"${installdir}/Arduino_Create_Bridge.exe"</value>
<ruleList>
<platformTest>
<type>windows</type>
</platformTest>
</ruleList>
</registrySet>
</postInstallationActionList>
<preUninstallationActionList>
<deleteOSXService>
<serviceName>${product_shortname}</serviceName>
</deleteOSXService>
<runProgram>
<program>schtasks</program>
<programArguments>/delete /tn ArduinoCreateAgent /f</programArguments>
<ruleList>
<platformTest>
<type>windows-2000</type>
</platformTest>
</ruleList>
</runProgram>
</preUninstallationActionList>
<createOsxBundleDmg>1</createOsxBundleDmg>
<enableRollback>1</enableRollback>
<enableTimestamp>1</enableTimestamp>
<requireInstallationByRootUser>1</requireInstallationByRootUser>
<vendor>Arduino LLC</vendor>
<windowsExecutableIcon>/home/jenkins/jenkins/jobs/Create_Bridge_test/workspace/src/github.com/facchinm/systray/example/icon/iconwin.ico</windowsExecutableIcon>
<parameterList>
<directoryParameter>
<name>installdir</name>
<description>Installer.Parameter.installdir.description</description>
<explanation>Installer.Parameter.installdir.explanation</explanation>
<value></value>
<default>${platform_install_prefix}/${product_shortname}-${product_version}</default>
<allowEmptyValue>0</allowEmptyValue>
<ask>yes</ask>
<cliOptionName>prefix</cliOptionName>
<mustBeWritable>yes</mustBeWritable>
<mustExist>0</mustExist>
<width>30</width>
</directoryParameter>
</parameterList>
</project>

8 changes: 7 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
serial-port-json-server
=======================

Get the latest version of the Bridge for all supported platforms: http://downloads.arduino.cc/CreateBridge/CreateBridge.zip
Get the latest version of the Bridge for all supported platforms:

[Linux x64](http://downloads.arduino.cc/CreateBridge/ArduinoCreateAgent-1.0-linux-x64-installer.run)

[MacOSX](http://downloads.arduino.cc/CreateBridge/ArduinoCreateAgent-1.0-osx-installer.dmg)

[Windows](http://downloads.arduino.cc/CreateBridge/ArduinoCreateAgent-1.0-windows-installer.exe)

Version 1.82

Expand Down
11 changes: 6 additions & 5 deletions compile_webidebridge.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@ createZipEmbeddableFileArduino()
cd arduino
zip -r arduino.zip arduino/* config.ini *.pem > /dev/null
cd ..
cat arduino/arduino.zip >> $3
zip --adjust-sfx $3
#cat arduino/arduino.zip >> $3
#zip --adjust-sfx $3
mkdir -p snapshot/$GOOS\_$GOARCH
cp $3 snapshot/$GOOS\_$GOARCH/$3
cp arduino/arduino.zip snapshot/$GOOS\_$GOARCH
ls -la snapshot/$GOOS\_$GOARCH/$3
}

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

set -x
compilePlatform()
{
echo 'In compilePlatform'
Expand All @@ -65,16 +65,17 @@ compilePlatform()
if [ $GOOS == "windows" ]
then
NAME=$NAME".exe"
EXTRAFLAGS="-ldflags -H=windowsgui"
fi
env GOOS=$GOOS GOARCH=$GOARCH CC=$CC CXX=$CC CGO_ENABLED=$CGO_ENABLED go build -o=$NAME
env GOOS=$GOOS GOARCH=$GOARCH CC=$CC CXX=$CC CGO_ENABLED=$CGO_ENABLED go build -o=$NAME $EXTRAFLAGS
if [ $? != 0 ]
then
echo -e "${red}Target $GOOS, $GOARCH failed${NC}"
exit 1
fi
echo createZipEmbeddableFileArduino $GOOS $GOARCH $NAME
createZipEmbeddableFileArduino $GOOS $GOARCH $NAME
GOOS=$GOOS GOARCH=$GOARCH go-selfupdate $NAME $VERSION
#GOOS=$GOOS GOARCH=$GOARCH go-selfupdate $NAME $VERSION
rm -rf $NAME*
}

Expand Down
Binary file added installer_icons/Installer.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added installer_icons/InstallerIcon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added installer_icons/InstallerSplash.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added installer_icons/tray_iconWin.ico
View file
Open in desktop
Binary file not shown.
Loading