fix up some license manager stuff and bump version

3 files changed, 17 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3f922db4c527..ec5e9b0c8eec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Jan 17 13:44:51 UTC 2016
+# Tue May 24 11:31:43 UTC 2016
 pkgbase = microchip-mplabxc16-bin
 	pkgdesc = Microchip's MPLAB XC16 C compiler toolchain for their dsPIC and PIC24 microcontroller families
-	pkgver = 1.25
+	pkgver = 1.26
 	pkgrel = 1
 	url = http://www.microchip.com/xc16
 	install = microchip-mplabxc16-bin.install
@@ -17,9 +17,9 @@ pkgbase = microchip-mplabxc16-bin
 	options = !zipman
 	options = staticlibs
 	options = !upx
-	source = installerBlobFromMicrochip::http://ww1.microchip.com/downloads/en/DeviceDoc/xc16-v1.25-full-install-linux-installer.run
+	source = http://ww1.microchip.com/downloads/en/DeviceDoc/xc16-v1.26-full-install-linux-installer.run
 	source = bitrock-unpacker.tcl
-	md5sums = faa73e584f70d0ff4498d06fe5da4e0f
+	md5sums = e0d60610834ac3c07de6936a38d37f0f
 	md5sums = 70dedba4c417f8c0bb07c32d19e9d197
 	makedepends_i686 = tclkit
 	depends_x86_64 = lib32-gcc-libs
diff --git a/.gitignore b/.gitignore
index f3c9ec7feae5..aa0987d3584e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 *.tar.xz
 src/
 pkg/
-installerBlobFromMicrochip
+*.pkg.tar
+*installer.run
diff --git a/PKGBUILD b/PKGBUILD
index 082c13053a94..d5954ebd16a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _number_of_bits=16
 pkgname=microchip-mplabxc${_number_of_bits}-bin
-pkgver=1.25
+pkgver=1.26
 pkgrel=1
 pkgdesc="Microchip's MPLAB XC${_number_of_bits} C compiler toolchain for their dsPIC and PIC24 microcontroller families"
 arch=(i686 x86_64)
@@ -16,24 +16,29 @@ makedepends_x86_64=(lib32-tclkit)
 makedepends_i686=(tclkit)
 
 options=(!strip docs libtool emptydirs !zipman staticlibs !upx)
-source=("installerBlobFromMicrochip::http://ww1.microchip.com/downloads/en/DeviceDoc/xc${_number_of_bits}-v$pkgver-full-install-linux-installer.run"
-        "bitrock-unpacker.tcl")
+source=("http://ww1.microchip.com/downloads/en/DeviceDoc/xc${_number_of_bits}-v$pkgver-full-install-linux-installer.run" "bitrock-unpacker.tcl")
 
-md5sums=('faa73e584f70d0ff4498d06fe5da4e0f'
+md5sums=('e0d60610834ac3c07de6936a38d37f0f'
          '70dedba4c417f8c0bb07c32d19e9d197')
 install=$pkgname.install
 
 instdir="/opt/microchip/xc${_number_of_bits}/v${pkgver}"
 
+PKGEXT='.pkg.tar'
+
 build() {
   msg2 "Unpacking files from installer"
-  ./bitrock-unpacker.tcl ./installerBlobFromMicrochip ./unpacked.vfs
+  ./bitrock-unpacker.tcl ./xc${_number_of_bits}-v$pkgver-full-install-linux-installer.run ./unpacked.vfs
 }
 
 package() {
   mkdir -p "${pkgdir}${instdir}"
   mv unpacked.vfs/compiler/programfiles*/* "${pkgdir}${instdir}"
-  mv unpacked.vfs/licensecomponent "${pkgdir}${instdir}"
+  mv unpacked.vfs/licensecomponent/xclmallBin/bin/{roam.lic,xclm} "${pkgdir}${instdir}/bin"
+  sed -i "s/<xclm>/<xclm>\n\t<xclm:LicenseDirectory xclm:path=\"\/opt\/microchip\/xclm\/license\/\" \/>/" unpacked.vfs/licensecomponent/xclmallBin/etc/xclm.conf
+  mv unpacked.vfs/licensecomponent/xclmallBin/etc/xclm.conf "${pkgdir}${instdir}/etc"
+  mv unpacked.vfs/licensecomponent/xclmallDocs/doc/* "${pkgdir}${instdir}/docs"
+
   mv "${pkgdir}${instdir}"/*License.txt "${pkgdir}${instdir}/docs" 2>/dev/null || true
 
   mkdir -p "$pkgdir/etc/profile.d"