update to 10.0.0 & allow opening multiple files via the launcher

7 files changed, 55 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5ca542d4401..f82b91c5a5dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xmlmind-xmleditor
 	pkgdesc = IDE for editing XML files
-	pkgver = 9.5.1
+	pkgver = 10.0.0
 	pkgrel = 1
 	url = https://www.xmlmind.com/xmleditor
 	install = xxe.install
@@ -10,27 +10,27 @@ pkgbase = xmlmind-xmleditor
 	makedepends = icoutils
 	makedepends = gendesk
 	depends = java-runtime>=8
-	depends = bash
+	depends = sh
 	depends = perl
 	optdepends = cups-pdf: for the ability to print into PDF-files
 	provides = xxe
-	source = http://www.xmlmind.com/xmleditor/_download/xxe-perso-9_5_1.zip
-	source = http://www.xmlmind.com/xmleditor/_download/xxe-devdocs-9_5_1.zip
+	source = https://www.xmlmind.com/xmleditor/_download/xxe-perso-10_0_0.zip
+	source = https://www.xmlmind.com/xmleditor/_download/xxe-devdocs-10_0_0.zip
 	source = xxe.sh
-	source = xxetool.sh
+	source = xxeconvert.sh
 	source = xmltool.sh
 	source = csscheck.sh
 	source = authvalue.sh
-	source = deployxxe.sh
 	source = xmltool.1
-	sha256sums = 46dccd4e8e826d9b6dccb886e72ac2baf08ff250f7c0103122ab0f84fad34dc0
-	sha256sums = 830190d73d8d94646369332d1560933558a25c0e5043172a167e6b8850a686f6
-	sha256sums = b77a9be5922bd692af5ac80a7f1b88fe4b1e997dcdfb5d8fe6e37440c19e1fd3
-	sha256sums = c28c54c62aff121c84cfcda399ff21bd914a4e2757f29358e91c6f4865208fcf
+	source = icon64x64.png
+	sha256sums = 0cd52ed3df76ee32aa7892cdc10774120553ba36665ca6d85af525a4560306a9
+	sha256sums = b0b8a50eb20dd75eb54ee6885e81c650c30696a5184899052421a395164a63a0
+	sha256sums = 72d24d6216f0fe5515edb50c38566d3f1f3ce134634a0da04fbb32ac3a216452
+	sha256sums = 3f04f7b1ecb934a96f15ed75e0593e545d7f820a95705710b39a2916377c57fa
 	sha256sums = 40fd7e5f73eaf9f05adabd29715f3dc2d78f4eeddb9440bdd3aece1341308a01
 	sha256sums = 541de90c98dc15d2957834611df41872837144397735c62be67924ce8af2ef84
 	sha256sums = 61251006be3625075958f6257d5eb5eba983115312d7df32e4449a2847c5ca7f
-	sha256sums = cda6355dfc122b862694126affd50852ae8470ff1927c3af94b1e16c33140e58
 	sha256sums = dd1efd7074aef4b28c130a781f21e34ada3f9b15673ad9df61ff77dba4930482
+	sha256sums = 9c97b679944fa57e9aab3e3143fb23f2c4dba5e70d10127bfa99d60233a2d76f
 
 pkgname = xmlmind-xmleditor
diff --git a/PKGBUILD b/PKGBUILD
index 0b314755feab..d9d7cfe5f9ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,36 +2,36 @@
 
 pkgname=xmlmind-xmleditor
 _pkgname=xxe
-pkgver=9.5.1
+pkgver=10.0.0
 _pkgver=${pkgver//./_}
 pkgrel=1
 pkgdesc="IDE for editing XML files"
 license=('Custom')
 url="https://www.xmlmind.com/xmleditor"
 arch=('any')
-depends=('java-runtime>=8' 'bash' 'perl')
+depends=('java-runtime>=8' 'sh' 'perl')
 optdepends=('cups-pdf: for the ability to print into PDF-files')
 makedepends=('libicns' 'icoutils' 'gendesk')
 provides=('xxe')
 install=${_pkgname}.install
-source=("http://www.xmlmind.com/xmleditor/_download/xxe-perso-${_pkgver}.zip"
-        "http://www.xmlmind.com/xmleditor/_download/xxe-devdocs-${_pkgver}.zip"
+source=("https://www.xmlmind.com/xmleditor/_download/xxe-perso-${_pkgver}.zip"
+        "https://www.xmlmind.com/xmleditor/_download/xxe-devdocs-${_pkgver}.zip"
         "xxe.sh"
-        "xxetool.sh"
+        "xxeconvert.sh"
         "xmltool.sh"
         "csscheck.sh"
         "authvalue.sh"
-        "deployxxe.sh"
-        "xmltool.1")
-sha256sums=('46dccd4e8e826d9b6dccb886e72ac2baf08ff250f7c0103122ab0f84fad34dc0'
-            '830190d73d8d94646369332d1560933558a25c0e5043172a167e6b8850a686f6'
-            'b77a9be5922bd692af5ac80a7f1b88fe4b1e997dcdfb5d8fe6e37440c19e1fd3'
-            'c28c54c62aff121c84cfcda399ff21bd914a4e2757f29358e91c6f4865208fcf'
+        "xmltool.1"
+        "icon64x64.png")
+sha256sums=('0cd52ed3df76ee32aa7892cdc10774120553ba36665ca6d85af525a4560306a9'
+            'b0b8a50eb20dd75eb54ee6885e81c650c30696a5184899052421a395164a63a0'
+            '72d24d6216f0fe5515edb50c38566d3f1f3ce134634a0da04fbb32ac3a216452'
+            '3f04f7b1ecb934a96f15ed75e0593e545d7f820a95705710b39a2916377c57fa'
             '40fd7e5f73eaf9f05adabd29715f3dc2d78f4eeddb9440bdd3aece1341308a01'
             '541de90c98dc15d2957834611df41872837144397735c62be67924ce8af2ef84'
             '61251006be3625075958f6257d5eb5eba983115312d7df32e4449a2847c5ca7f'
-            'cda6355dfc122b862694126affd50852ae8470ff1927c3af94b1e16c33140e58'
-            'dd1efd7074aef4b28c130a781f21e34ada3f9b15673ad9df61ff77dba4930482')
+            'dd1efd7074aef4b28c130a781f21e34ada3f9b15673ad9df61ff77dba4930482'
+            '9c97b679944fa57e9aab3e3143fb23f2c4dba5e70d10127bfa99d60233a2d76f')
 
 prepare() {
   # use better icons
@@ -45,8 +45,7 @@ prepare() {
   mv xxe_2_48x48x32.png xxe_48x48x32.png
 
   # 64px
-  jar -xf xxe-perso-${_pkgver}/bin/xxe_tool.jar com/xmlmind/xmledittool/deploy/icon64x64.png
-  mv com/xmlmind/xmledittool/deploy/icon64x64.png xxe_64x64x32.png
+  mv icon64x64.png xxe_64x64x32.png
 
   # create launcher
   gendesk -f -n \
@@ -54,7 +53,7 @@ prepare() {
       --name="XXE" \
       --genericname="XML IDE" \
       --comment="Edit XML files" \
-      --exec=xxe \
+      --exec="xxe %F" \
       --startupnotify=True \
       --categories='Development;IDE;Java' \
       --mimetypes='text/xml' \
@@ -67,12 +66,11 @@ package() {
   cp -a xxe-perso-${_pkgver} "${pkgdir}"/usr/share/java/${_pkgname}
 
   # launch scripts
-  install -Dm755 xxe.sh       "${pkgdir}"/usr/bin/xxe
-  install -Dm755 xxetool.sh   "${pkgdir}"/usr/bin/xxetool
-  install -Dm755 xmltool.sh   "${pkgdir}"/usr/bin/xmltool
-  install -Dm755 csscheck.sh  "${pkgdir}"/usr/bin/csscheck
-  install -Dm755 authvalue.sh "${pkgdir}"/usr/bin/authvalue
-  install -Dm755 deployxxe.sh "${pkgdir}"/usr/bin/deployxxe
+  install -Dm755 xxe.sh        "${pkgdir}"/usr/bin/xxe
+  install -Dm755 xxeconvert.sh "${pkgdir}"/usr/bin/xxeconvert
+  install -Dm755 xmltool.sh    "${pkgdir}"/usr/bin/xmltool
+  install -Dm755 csscheck.sh   "${pkgdir}"/usr/bin/csscheck
+  install -Dm755 authvalue.sh  "${pkgdir}"/usr/bin/authvalue
 
   # place icons
   for size in 16 24 32 48 64 128 256 512; do
@@ -99,7 +97,7 @@ package() {
   find  "${pkgdir}"/usr/share/java/xxe/bin/ -name \*.bat -delete
   find  "${pkgdir}"/usr/share/java/xxe/bin/ -name \*.exe -delete
   rm    "${pkgdir}"/usr/share/java/xxe/bin/xxe.jstart
-  rm    "${pkgdir}"/usr/share/java/xxe/bin/{xxe,xxetool,xmltool,csscheck,authvalue,deployxxe}
+  rm    "${pkgdir}"/usr/share/java/xxe/bin/{xxe,xxeconvert,xmltool,authvalue}
   rm -r "${pkgdir}"/usr/share/java/xxe/bin/icon
 
   # include devdocs (optional)
diff --git a/deployxxe.sh b/deployxxe.sh
deleted file mode 100644
index 78045f4ff32c..000000000000
--- a/deployxxe.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-dist=/usr/share/java/xxe/bin
-jars="$dist/xerces.jar:$dist/resolver.jar:$dist/relaxng.jar:$dist/saxon.jar:$dist/saxon9.jar"
-cp="$dist/xxe_tool.jar:$dist/xxe.jar:$jars"
-
-exec java -classpath "$cp" \
-          -Djava.awt.headless=true \
-          com.xmlmind.xmledittool.deploy.DeployTool "$@"
diff --git a/icon64x64.png b/icon64x64.png
new file mode 100644
index 000000000000..daa405f8498d
--- /dev/null
+++ b/icon64x64.png
diff --git a/xxe.install b/xxe.install
index f8fcc5bad504..5aa6ac8e37c3 100644
--- a/xxe.install
+++ b/xxe.install
@@ -16,6 +16,7 @@ post_install() {
 
 post_upgrade() {
     manual
+
     fix_scaling=$(vercmp $2 9.4.1-2 )
     if [[ $fix_scaling -le 0 ]]
     then
@@ -25,6 +26,15 @@ post_upgrade() {
         echo ">>> The setting is at Options -> Preferences -> General"
         echo ""
     fi
+
+    major_update=$(vercmp ${1/.*} ${2/.*})
+    if [[ major_update -gt 0 ]]
+    then
+        echo ""
+        echo "Major Version Update. XXE will use a new configuration directory."
+        echo "Copy over your old one or download add-ons again."
+        echo ""
+    fi
 }
 
 manual() {
diff --git a/xxe.sh b/xxe.sh
index 17ea0156d658..36955ab550d1 100644
--- a/xxe.sh
+++ b/xxe.sh
@@ -14,9 +14,8 @@ exec java -Xss4m -Xmx512m \
           -Dsun.java2d.uiScale.enabled=false \
           -Dawt.useSystemAAFontSettings=on \
           -Dswing.aatext=true \
-          -DXXE_GUI="$XXE_GUI" \
           -DXXE_ADDON_PATH="$XXE_ADDON_PATH" \
           -DXXE_PREFS_DIR="$XXE_PREFS_DIR" \
           $XXE_JAVA_OPTS \
           -classpath "$cp" \
-          com.xmlmind.xmleditapp.app.QuickStart "$@"
+          com.xmlmind.xmleditapp.desktop.QuickStart "$@"
diff --git a/xxeconvert.sh b/xxeconvert.sh
new file mode 100644
index 000000000000..f4981a9de5b6
--- /dev/null
+++ b/xxeconvert.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+dist=/usr/share/java/xxe/bin
+jars="$dist/xerces.jar:$dist/resolver.jar:$dist/relaxng.jar:$dist/saxon.jar:$dist/saxon9.jar"
+cp="$dist/xxe.jar:$jars"
+
+exec java -Xss4m -Xmx512m \
+          -Djava.awt.headless=true \
+          -DXXE_ADDON_PATH="$XXE_ADDON_PATH" \
+          -DXXE_PREFS_DIR="$XXE_PREFS_DIR" \
+          -classpath "$cp" \
+          com.xmlmind.xmleditapp.convert.StartConvert "$@"