UPD to v1.2.0 and make split package

3 files changed, 60 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a68c89b6e18..547b032bdb3e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bibtex2website
-	pkgdesc = A program that can generate an ordered website out of BibTeX files
-	pkgver = 1.0.1
+	pkgdesc = A program and library that can generate an ordered website out of BibTeX files
+	pkgver = 1.2.0
 	pkgrel = 1
 	url = https://github.com/nullptrT/bibtex2website
 	arch = x86_64
@@ -8,14 +8,18 @@ pkgbase = bibtex2website
 	arch = armv6h
 	arch = armv7h
 	license = GPL3
+	license = LGPL3
 	makedepends = cmake
-	depends = qt5-base
-	source = bibtex2website-v1.0.1.tar.gz::https://github.com/nullptrT/bibtex2website/archive/v1.0.1.tar.gz
+	source = bibtex2website-v1.2.0.tar.gz::https://github.com/nullptrT/bibtex2website/archive/v1.2.0.tar.gz
 	source = liblogcpp-v1.9.3.tar.gz::https://github.com/nullptrT/liblogcpp/archive/v1.9.3.tar.gz
-	source = bibtex2website.desktop
-	sha256sums = b2c947bda7e5028d3639a266b653220361f0eb25d5765fe471bedf328de8acb4
+	sha256sums = 1a77febde8c2144190782ed4feddeb26ef2e3e11c92f182fa9f32aeb402918a3
 	sha256sums = e0b758cbe3031548f54ab9d9189bf6a67faf54a4a54fa3c608786194cb56c76f
-	sha256sums = 75d71bf43d00dc869d797afeb8e12e94e2a7cddac335c84940f48d7abd91d565
 
 pkgname = bibtex2website
+	license = GPL3
+	license = LGPL3
+
+pkgname = bibtex2website-gui
+	license = LGPL3
+	depends = qt5-base
 
diff --git a/PKGBUILD b/PKGBUILD
index 958d01d9ce71..20a314fdaad9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,79 @@
 # Maintainer: Sebastian Lau <lauseb644 _at_ gmail _dot_ com>
 
-pkgname="bibtex2website"
-pkgver=1.0.1
+pkgbase="bibtex2website"
+pkgname=('bibtex2website' 'bibtex2website-gui')
+pkgver=1.2.0
 pkgrel=1
 _logcppver=1.9.3
-pkgdesc="A program that can generate an ordered website out of BibTeX files"
+pkgdesc="A program and library that can generate an ordered website out of BibTeX files"
 arch=('x86_64' 'i686' 'armv6h' 'armv7h')
 url="https://github.com/nullptrT/bibtex2website"
-license=('GPL3')
-depends=('qt5-base')
+license=('GPL3' 'LGPL3')
+depends=()
 makedepends=('cmake')
 source=("bibtex2website-v${pkgver}.tar.gz::https://github.com/nullptrT/${pkgname}/archive/v${pkgver}.tar.gz"
-	"liblogcpp-v${_logcppver}.tar.gz::https://github.com/nullptrT/liblogcpp/archive/v${_logcppver}.tar.gz"
-	"bibtex2website.desktop")
-sha256sums=('b2c947bda7e5028d3639a266b653220361f0eb25d5765fe471bedf328de8acb4'
-            'e0b758cbe3031548f54ab9d9189bf6a67faf54a4a54fa3c608786194cb56c76f'
-            '75d71bf43d00dc869d797afeb8e12e94e2a7cddac335c84940f48d7abd91d565')
-
+	"liblogcpp-v${_logcppver}.tar.gz::https://github.com/nullptrT/liblogcpp/archive/v${_logcppver}.tar.gz")
+sha256sums=('1a77febde8c2144190782ed4feddeb26ef2e3e11c92f182fa9f32aeb402918a3'
+            'e0b758cbe3031548f54ab9d9189bf6a67faf54a4a54fa3c608786194cb56c76f')
 
 
 prepare() {
     [[ -e "$srcdir/build" ]] && rm -r "$srcdir/build"
     mkdir "$srcdir/build"
+
+    [[ -e "$srcdir/build-lib" ]] && rm -r "$srcdir/build-lib"
+    mkdir "$srcdir/build-lib"
+
+    [[ -e "$srcdir/build-gui" ]] && rm -r "$srcdir/build-gui"
+    mkdir "$srcdir/build-gui"
+
     rm -r "$srcdir/bibtex2website-$pkgver/3rdparty/liblogcpp"
     cp -r "$srcdir/liblogcpp-$_logcppver" "$srcdir/bibtex2website-$pkgver/3rdparty/liblogcpp"
 }
 
-build() {
+build_bibtex2website() {
     cd "$srcdir/build"
 
     cmake -DCMAKE_INSTALL_PREFIX:PATH="/usr" \
+        -DCMAKE_BUILD_TYPE=Release \
+	"../bibtex2website-${pkgver}"
+
+    make
+}
+
+build_bibtex2website-gui() {
+    cd "$srcdir/build-gui"
+
+    cmake -DCMAKE_INSTALL_PREFIX:PATH="/usr" \
+        -DCMAKE_BUILD_TYPE=Release \
 	-DENABLE_QT_GUI=ON \
 	"../bibtex2website-${pkgver}"
 
     make
 }
 
-package() {
+package_bibtex2website() {
+    pkgname=('bibtex2website')
+    license=('GPL3' 'LGPL3')
+
+    build_bibtex2website
+
     cd "$srcdir/build"
 
-    install -Dm644 "$srcdir/build/bin/bibtex2website_generator" "$pkgdir/usr/bin/bibtex2website"
-    install -Dm644 "$srcdir/build/bin/BibTeX2WebsiteGUI" "$pkgdir/usr/bin/bibtex2website-gui"
-    chmod +x "$pkgdir/usr/bin/bibtex2website"*
+    install -Dm644 "$srcdir/build/bin/bibtex2website" "$pkgdir/usr/bin/bibtex2website"
+    chmod +x "$pkgdir/usr/bin/bibtex2website"
+}
+
+package_bibtex2website-gui() {
+    pkgname=('bibtex2website-gui')
+    depends+=('qt5-base')
+    license=('LGPL3')
+
+    build_bibtex2website-gui
+
+    install -Dm644 "$srcdir/build-gui/bin/BibTeX2WebsiteGUI" "$pkgdir/usr/bin/bibtex2website-gui"
+    chmod +x "$pkgdir/usr/bin/bibtex2website-gui"
 
-    install -Dm644 "$srcdir/bibtex2website.desktop" "$pkgdir/usr/share/applications/bibtex2website.desktop"
+    install -Dm644 "$srcdir/$pkgbase-$pkgver/lib/bibtex2website-gui.desktop" "$pkgdir/usr/share/applications/bibtex2website-gui.desktop"
+    install -Dm644 "$srcdir/$pkgbase-$pkgver/lib/bibtex2website.svg" "$pkgdir/usr/share/$pkgbase/bibtex2website.svg"
 }
diff --git a/bibtex2website.desktop b/bibtex2website.desktop
deleted file mode 100644
index 6866bf3aa284..000000000000
--- a/bibtex2website.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=BibTeX2Website
-Comment=A program that can generate an ordered website out of BibTeX files
-Comment[de]=Ein Programm, dass eine geordnete Webseite aus BibTeX-Dateien erstellen kann
-Exec=/usr/bin/bibtex2website-gui
-Icon=texstudio
-Keywords=LaTeX;TeX;editor;
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Categories=Office;Publishing
-StartupNotify=false