[updpkg]: openmv-ide-bin 4.0.0

5 files changed, 22 insertions, 119 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0550b9362a2f..f761fc9386e3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,20 @@
 pkgbase = openmv-ide-bin
 	pkgdesc = QtCreator based OpenMV IDE.
-	pkgver = 2.9.0
+	pkgver = 4.0.0
 	pkgrel = 1
 	url = https://github.com/openmv/openmv-ide
-	install = openmv-ide-bin.install
 	arch = x86_64
-	arch = i686
 	license = MIT
 	depends = libpng
 	depends = libusb
 	provides = openmv-ide
 	conflicts = openmv-ide
 	options = !strip
-	source = https://raw.githubusercontent.com/openmv/openmv-ide/master/LICENSE
-	source = openmv-ide.qs
 	source = openmv-ide.desktop
 	source = openmv-ide.png
-	sha256sums = 46f06683b87cff5215e8dd427142983f84474b6a383c96d51e9d0592c5f1b0ed
-	sha256sums = f88d7948cd07a7a7c8e9cc7030eff7eccd348880d68c6846454e7473d4bafd11
-	sha256sums = c3b6bc073a98169ce988424663d14ca802d38726db7aea14b3c18e31216e23a5
+	sha256sums = 7de4addf4e0144495fdad9d515ad8a19fc3e077a08cff57ef1a961f15bea3e81
 	sha256sums = 11b3fe3f7de494aa7e45050327c3a5300596e5f03717fd3f469f6b8b8e1e7f55
-	source_x86_64 = openmv-ide-2.9.0-x86_64.run::https://github.com/openmv/openmv-ide/releases/download/v2.9.0/openmv-ide-linux-x86_64-2.9.0.run
-	sha256sums_x86_64 = 9a1a285872afa5508721038043d36537b082d07faa828ef24101233ea7cc11e5
-	source_i686 = openmv-ide-2.9.0-i686.run::https://github.com/openmv/openmv-ide/releases/download/v2.9.0/openmv-ide-linux-x86-2.9.0.run
-	sha256sums_i686 = 3b1f909f7c8b66685216befb87f82fa99f64a01b102223cc991ec3b2830d5418
+	source_x86_64 = openmv-ide-4.0.0-x86_64.run::https://github.com/openmv/openmv-ide/releases/download/development/openmv-ide-linux-x86_64-4.0.0.run
+	sha256sums_x86_64 = 828aad7fc7f6e22c73afd385f3be7c53124a28b8897244993137c3dbcc4acb32
 
 pkgname = openmv-ide-bin
diff --git a/PKGBUILD b/PKGBUILD
index 9d6ff7c341dc..03be750c7196 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,41 +2,32 @@
 
 pkgname=openmv-ide-bin
 _pkgname=${pkgname%-bin}
-pkgver=2.9.0
+pkgver=4.0.0
 pkgrel=1
 pkgdesc="QtCreator based OpenMV IDE."
-arch=('x86_64' 'i686')
+arch=('x86_64')
 url="https://github.com/openmv/openmv-ide"
 license=('MIT')
 depends=('libpng' 'libusb')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
 options=('!strip')
-install='openmv-ide-bin.install'
-source=('https://raw.githubusercontent.com/openmv/openmv-ide/master/LICENSE'
-        "${_pkgname}.qs"
-        "${_pkgname}.desktop"
+# install='openmv-ide-bin.install'
+source=("${_pkgname}.desktop"
         "${_pkgname}.png")
-source_x86_64=("${_pkgname}-${pkgver}-x86_64.run::https://github.com/openmv/openmv-ide/releases/download/v${pkgver}/${_pkgname}-linux-x86_64-${pkgver}.run")
-source_i686=("${_pkgname}-${pkgver}-i686.run::https://github.com/openmv/openmv-ide/releases/download/v${pkgver}/${_pkgname}-linux-x86-${pkgver}.run")
-sha256sums=('46f06683b87cff5215e8dd427142983f84474b6a383c96d51e9d0592c5f1b0ed'
-            'f88d7948cd07a7a7c8e9cc7030eff7eccd348880d68c6846454e7473d4bafd11'
-            'c3b6bc073a98169ce988424663d14ca802d38726db7aea14b3c18e31216e23a5'
+source_x86_64=("${_pkgname}-${pkgver}-x86_64.run::https://github.com/openmv/openmv-ide/releases/download/development/${_pkgname}-linux-x86_64-${pkgver}.run")
+sha256sums=('7de4addf4e0144495fdad9d515ad8a19fc3e077a08cff57ef1a961f15bea3e81'
             '11b3fe3f7de494aa7e45050327c3a5300596e5f03717fd3f469f6b8b8e1e7f55')
-sha256sums_x86_64=('9a1a285872afa5508721038043d36537b082d07faa828ef24101233ea7cc11e5')
-sha256sums_i686=('3b1f909f7c8b66685216befb87f82fa99f64a01b102223cc991ec3b2830d5418')
+sha256sums_x86_64=('828aad7fc7f6e22c73afd385f3be7c53124a28b8897244993137c3dbcc4acb32')
 
 _install() {
   find ${@: 2} -type f -exec install -Dm$1 {} ${pkgdir}/opt/${_pkgname}/{} \;
 }
 
 prepare() {
-  rm -rf ${srcdir}/${_pkgname}
-
-  sed -i "s|/tmp/QT|$srcdir/$_pkgname|g" ${_pkgname}.qs
   chmod u+x ${_pkgname}-${pkgver}-$CARCH.run
 
-  ./${_pkgname}-${pkgver}-$CARCH.run -platform minimal --script ${_pkgname}.qs > /dev/null 2>&1
+  ./${_pkgname}-${pkgver}-$CARCH.run --al -c --am in --root=$srcdir/$_pkgname
 }
 
 package() {
@@ -53,10 +44,13 @@ package() {
   _install 644 -L lib/Qt
 
   # doc
-  install -Dm644 README.txt -t ${pkgdir}/usr/share/doc/${_pkgname}/
+  #install -Dm644 README.txt -t ${pkgdir}/usr/share/doc/${_pkgname}/
 
   # share
   _install 644 share/qtcreator
+  
+  # metainfo
+  _install 644 share/metainfo/
 
   # desktop
   install -Dm644 ${srcdir}/${_pkgname}.desktop ${pkgdir}/usr/share/applications/${_pkgname}.desktop
@@ -65,14 +59,14 @@ package() {
   install -Dm644 ${srcdir}/${_pkgname}.png ${pkgdir}/usr/share/pixmaps/${_pkgname}.png
 
   # license
-  install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 Licenses/LICENSE.GPL3-EXCEPT -t ${pkgdir}/usr/share/licenses/${pkgname}/
 
   # soft link
   install -dm755 ${pkgdir}/usr/bin
   ln -s /opt/${_pkgname}/bin/${_pkgname/-} ${pkgdir}/usr/bin/${_pkgname/-}
 
   # udev rule
-  install -Dm644 ${pkgdir}/opt/${_pkgname}/share/qtcreator/pydfu/50-openmv.rules -t ${pkgdir}/usr/lib/udev/rules.d/
+  install -Dm644 ${pkgdir}/opt/${_pkgname}/share/qtcreator/pydfu/{99-openmv,99-openmv-arduino,99-openmv-nxp}.rules -t ${pkgdir}/usr/lib/udev/rules.d/
 }
 
 # vim: set sw=2 ts=2 et:
diff --git a/openmv-ide-bin.install b/openmv-ide-bin.install
deleted file mode 100644
index c5a90c3ce26e..000000000000
--- a/openmv-ide-bin.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_upgrade() {
-    # set correct correct permission after upgrading.
-    find /opt/openmv-ide/ -type d -exec chmod 755 {} \;
-}
diff --git a/openmv-ide.desktop b/openmv-ide.desktop
index 31c4cb991747..a81ec99dca56 100755
--- a/openmv-ide.desktop
+++ b/openmv-ide.desktop
@@ -1,11 +1,13 @@
 [Desktop Entry]
 Type=Application
-Exec=openmvide
+Exec=openmvide %F
 Path=/opt/openmv-ide
 Icon=openmv-ide
 Name=OpenMV IDE
 GenericName=The IDE of choice for OpenMV Cam Development.
 GenericName[de]=Die IDE der Wahl zur OpenMV Cam Entwicklung
+X-KDE-StartupNotify=true
+StartupWMClass=openmvide
 Terminal=false
-Categories=Development;IDE;
+Categories=Development;IDE;OpenMV;
 MimeType=text/x-python;
diff --git a/openmv-ide.qs b/openmv-ide.qs
deleted file mode 100644
index 9af4bd48fc2f..000000000000
--- a/openmv-ide.qs
+++ /dev/null
@@ -1,81 +0,0 @@
-function Controller() {
-    installer.autoRejectMessageBoxes();
-    installer.setMessageBoxAutomaticAnswer("installationError", QMessageBox.Retry);
-    installer.setMessageBoxAutomaticAnswer("installationErrorWithRetry", QMessageBox.Retry);
-    installer.setMessageBoxAutomaticAnswer("DownloadError", QMessageBox.Retry);
-    installer.setMessageBoxAutomaticAnswer("archiveDownloadError", QMessageBox.Retry);
-    installer.installationFinished.connect(function() {
-        gui.clickButton(buttons.NextButton);
-    })
-}
-
-Controller.prototype.WelcomePageCallback = function() {
-    // click delay here because the next button is initially disabled for ~1 second
-    gui.clickButton(buttons.NextButton, 3000);
-}
-
-Controller.prototype.CredentialsPageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.IntroductionPageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.TargetDirectoryPageCallback = function()
-{
-    //dev is the user in our docker image
-    gui.currentPageWidget().TargetDirectoryLineEdit.setText("/tmp/QT");
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.PerformInstallationPageCallback = function() {
-    gui.clickButton(buttons.CommitButton);
-}
-
-Controller.prototype.ComponentSelectionPageCallback = function() {
-    function list_packages() {
-      var components = installer.components();
-      console.log("Available components: " + components.length);
-      var packages = ["Packages: "];
-      for (var i = 0 ; i < components.length ;i++) {
-          packages.push(components[i].name);
-      }
-      console.log(packages.join(" "));
-    }
-
-    list_packages();
-
-    var widget = gui.currentPageWidget();
-
-    console.log(widget);
-
-    widget.deselectAll();
-    widget.selectComponent("qt.qt5.5130");
-    widget.selectComponent("qt.qt5.5130.gcc_64");
-    // widget.deselectComponent("");
-
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.LicenseAgreementPageCallback = function() {
-    gui.currentPageWidget().AcceptLicenseRadioButton.setChecked(true);
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.StartMenuDirectoryPageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.ReadyForInstallationPageCallback = function()
-{
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.FinishedPageCallback = function() {
-    var checkBoxForm = gui.currentPageWidget().LaunchQtCreatorCheckBoxForm;
-    if (checkBoxForm && checkBoxForm.launchQtCreatorCheckBox) {
-        checkBoxForm.launchQtCreatorCheckBox.checked = false;
-    }
-    gui.clickButton(buttons.FinishButton);
-}