sw4stm32: 2.7

3 files changed, 80 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f51e925e185..3280dfd0d35c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,29 @@
 pkgbase = sw4stm32
 	pkgdesc = SystemWorkbench for STM32
-	pkgver = 2.6
+	pkgver = 2.7
 	pkgrel = 1
 	url = http://www.openstm32.org/System+Workbench+for+STM32
 	arch = x86_64
 	license = CUSTOM
-	depends = java-environment=8
-	noextract = install_sw4stm32_linux_64bits-v2.6.run
+	depends = java-environment<=8
+	optdepends = arm-none-eabi-gcc: ARM compiler
+	optdepends = arm-none-eabi-gdb: ARM GDB
+	optdepends = arm-none-eabi-newlib: ARM bare metal files
+	optdepends = arm-none-eabi-binutils: ARM binutils
+	optdepends = openocd: firmware flashing tool
+	noextract = install_sw4stm32_linux_64bits-v2.7.run
 	options = !emptydirs
 	options = !strip
-	source = http://www.ac6-tools.com/downloads/SW4STM32/install_sw4stm32_linux_64bits-v2.6.run
+	source = http://www.ac6-tools.com/downloads/SW4STM32/install_sw4stm32_linux_64bits-v2.7.run
 	source = sw4stm32
 	source = sw4stm32.png
 	source = sw4stm32.desktop
-	md5sums = abcb78c7f3334d83fadbf5a1021b4f9e
+	source = auto-install.xml
+	md5sums = f391a314d958442a94a28ea3dbf4b1e3
 	md5sums = d1dfe6479d10bbfd07b17a289aa1ae32
 	md5sums = 1abad981624008108a0651b9847e183e
 	md5sums = ff9b48b50dc8a1845d002bc1f1ddb50a
+	md5sums = bbec97848b7d66d227a40b0321e55f31
 
 pkgname = sw4stm32
 
diff --git a/PKGBUILD b/PKGBUILD
index 55e5751e1af4..60cf2965dc28 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,60 +3,64 @@
 # Contributor: Romain Porte <microjoe@microjoe.org>
 
 pkgname=sw4stm32
-pkgver=2.6
+pkgver=2.7
 pkgrel=1
 pkgdesc="SystemWorkbench for STM32"
 arch=('x86_64')
 url="http://www.openstm32.org/System+Workbench+for+STM32"
 license=('CUSTOM')
-depends=("java-environment=8")
+depends=("java-environment<=8")
 options=(!emptydirs !strip)
 source=("http://www.ac6-tools.com/downloads/SW4STM32/install_sw4stm32_linux_64bits-v$pkgver.run"
-	$pkgname
-	$pkgname.png
-$pkgname.desktop)
+    $pkgname
+    $pkgname.png
+    $pkgname.desktop
+auto-install.xml)
 noextract=(install_sw4stm32_linux_64bits-v$pkgver.run)
+optdepends=('arm-none-eabi-gcc: ARM compiler'
+    'arm-none-eabi-gdb: ARM GDB'
+    'arm-none-eabi-newlib: ARM bare metal files'
+    'arm-none-eabi-binutils: ARM binutils'
+'openocd: firmware flashing tool')
 
 package() {
-	unset LD_PRELOAD
-	HOME="usr/lib/sw4stm32"
-	mkdir -p $pkgdir/$HOME/dropins
-	touch $pkgdir/$HOME/dropins/.keep
-	chmod +x install_sw4stm32_linux_64bits-v$pkgver.run
-
-	# See https://izpack.atlassian.net/wiki/display/IZPACK/Unattended+Installations+Using+Properties
-	# for command-line instructions
-	yes | java -DINSTALL_PATH=$pkgdir/$HOME -d64 \
-		-jar install_sw4stm32_linux_64bits-v$pkgver.run -options-system
-
-	# Copy icon and desktop
-	install -Dm644 "sw4stm32.png" "${pkgdir}/usr/share/pixmaps/sw4stm32.png"
-	install -Dm644 "sw4stm32.desktop" "${pkgdir}/usr/share/applications/sw4stm32.desktop"
-
-	# Copy bash executable to path
-	install -Dm755 sw4stm32 "$pkgdir/usr/bin/sw4stm32"
-
-	# Copy udev rule manually
-	#for i in $(seq 1 3); do
-	#	install -Dm644 "$pkgdir/$HOME/.installation/49-stlinkv$i.rules" \
-	#		"$pkgdir/etc/udev/rules.d/49-stlinkv$i.rules"
-	#done
-
-	# Extracting arm cross-compiler
-	CROSSPATH="$pkgdir/$HOME/plugins/fr.ac6.mcu.externaltools.arm-none.linux64_1.16.0.201807130628/tools/st-gnu-arm-gcc-7-2017-q4-major_gdb-5_4-2016q3-linux.tar.bz2"
-	CROSSDEST=$(dirname $CROSSPATH)
-	tar -xf $CROSSPATH -C $(dirname $CROSSPATH)
-	rm $CROSSPATH
-	chmod 755 -R $CROSSDEST
-
-	# Clean the fakeroot
-	rm -rf $pkgdir/$HOME/{.installation,stlinkserver/st-stlink*,.desktop_shortcut.sh,uninstall.jar}
-
-	# Change configuration folder
-	echo "-Dosgi.configuration.area=@user.home/.sw4stm32" >> $pkgdir/$HOME/eclipse.bin.ini
+    HOME="$pkgdir/usr/lib/sw4stm32"
+    sed "s|home|$HOME|g" auto-install.xml > unattended.xml
+
+    cd $srcdir
+    chmod +x install_sw4stm32_linux_64bits-v$pkgver.run
+
+    java -jar install_sw4stm32_linux_64bits-v$pkgver.run unattended.xml
+
+    # Copy icon and desktop
+    install -Dm644 "sw4stm32.png" "${pkgdir}/usr/share/pixmaps/sw4stm32.png"
+    install -Dm644 "sw4stm32.desktop" "${pkgdir}/usr/share/applications/sw4stm32.desktop"
+
+    # Copy bash executable to path
+    install -Dm755 sw4stm32 "$pkgdir/usr/bin/sw4stm32"
+
+    # Copy udev rule manually
+    #for i in $(seq 1 3); do
+    #	install -Dm644 "$HOME/.installation/49-stlinkv$i.rules" \
+        #		"$pkgdir/etc/udev/rules.d/49-stlinkv$i.rules"
+    #done
+
+    # Extracting arm cross-compiler
+    CROSSPATH="$HOME/plugins/fr.ac6.mcu.externaltools.arm-none.linux64_1.16.0.201807130628/tools/st-gnu-arm-gcc-7-2017-q4-major_gdb-5_4-2016q3-linux.tar.bz2"
+    CROSSDEST=$(dirname $CROSSPATH)
+    tar -xf $CROSSPATH -C $(dirname $CROSSPATH)
+    rm $CROSSPATH
+    chmod 755 -R $CROSSDEST
+
+    # Clean the fakeroot
+    rm -rf $HOME/{.installation,stlinkserver/st-stlink*,.desktop_shortcut.sh,uninstall.jar}
+
+    # Change configuration folder
+    echo "-Dosgi.configuration.area=@user.home/.sw4stm32" >> $HOME/eclipse.bin.ini
 }
 
-md5sums=('abcb78c7f3334d83fadbf5a1021b4f9e'
-	'd1dfe6479d10bbfd07b17a289aa1ae32'
-	'1abad981624008108a0651b9847e183e'
-'ff9b48b50dc8a1845d002bc1f1ddb50a')
+md5sums=('f391a314d958442a94a28ea3dbf4b1e3'
+    'd1dfe6479d10bbfd07b17a289aa1ae32'
+    '1abad981624008108a0651b9847e183e'
+    'ff9b48b50dc8a1845d002bc1f1ddb50a'
+'bbec97848b7d66d227a40b0321e55f31')
diff --git a/auto-install.xml b/auto-install.xml
new file mode 100644
index 000000000000..0a3fce49a351
--- /dev/null
+++ b/auto-install.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<AutomatedInstallation langpack="eng">
+    <com.izforge.izpack.panels.userinput.UserInputPanel id="warningPanel"/>
+    <com.izforge.izpack.panels.info.InfoPanel id="InfoPanel_1"/>
+    <com.izforge.izpack.panels.licence.LicencePanel id="SWLicence"/>
+    <com.izforge.izpack.panels.licence.LicencePanel id="JRELicence"/>
+    <com.izforge.izpack.panels.target.TargetPanel id="TargetPanel_4">
+        <installpath>home</installpath>
+    </com.izforge.izpack.panels.target.TargetPanel>
+    <com.izforge.izpack.panels.packs.PacksPanel id="PacksPanel_5">
+        <pack index="0" name="System Workbench for STM32" selected="true"/>
+        <pack index="1" name="ST-Link/V2 driver" selected="false"/>
+        <pack index="2" name="STLinkServer" selected="true"/>
+    </com.izforge.izpack.panels.packs.PacksPanel>
+    <com.izforge.izpack.panels.summary.SummaryPanel id="SummaryPanel_6"/>
+    <com.izforge.izpack.panels.install.InstallPanel id="InstallPanel_7"/>
+    <com.izforge.izpack.panels.process.ProcessPanel id="ProcessPanel_8"/>
+    <com.izforge.izpack.panels.finish.FinishPanel id="FinishPanel_9"/>
+</AutomatedInstallation>