use separate build() function

3 files changed, 24 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9544bd7b96cd..b9d2e3e3f2fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ninja-ide-git
 	pkgdesc = Cross-platform IDE focused on Python application development
-	pkgver = 20180921
+	pkgver = 20181007
 	pkgrel = 1
 	url = http://ninja-ide.org
 	arch = any
@@ -10,12 +10,10 @@ pkgbase = ninja-ide-git
 	depends = python-pyqt5
 	depends = qt5-declarative
 	source = git+https://github.com/ninja-ide/ninja-ide.git
-	source = ninja-ide-git.desktop
 	source = setup.py
 	source = MANIFEST.in
 	md5sums = SKIP
-	md5sums = 8501ff78ec0150270be0f48ee87bddb5
-	md5sums = 9f9a5b9894d192de503bc98969067f56
+	md5sums = 0fcce442aa8925c14927985d00044bf1
 	md5sums = e8fd6b8243172d576d032c26d9140285
 
 pkgname = ninja-ide-git
diff --git a/PKGBUILD b/PKGBUILD
index e6c0fdaa22f7..ad1a3ba459bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Federico Cinelli <cinelli.federico@gmail.com>
 
 pkgname=ninja-ide-git
-pkgver=20180921
+pkgver=20181007
 pkgrel=1
 pkgdesc="Cross-platform IDE focused on Python application development"
 arch=('any')
@@ -11,34 +11,40 @@ license=('GPL3')
 depends=('python' 'python-pyqt5' 'qt5-declarative')
 makedepends=('python-setuptools')
 source=("git+https://github.com/ninja-ide/ninja-ide.git"
-        "ninja-ide-git.desktop"
         "setup.py"
         "MANIFEST.in")
 md5sums=('SKIP'
-         '8501ff78ec0150270be0f48ee87bddb5'
-         '9f9a5b9894d192de503bc98969067f56'
+         '0fcce442aa8925c14927985d00044bf1'
          'e8fd6b8243172d576d032c26d9140285')
 
 pkgver() {
-  cd "$srcdir/ninja-ide"
+  cd ninja-ide
   git log -1 --date=short --pretty=format:%ad | sed 's/-//g'
 }
 
 prepare() {
-  cd "$srcdir/ninja-ide"
-  rm -rf build *.egg-info
+  cd ninja-ide
+
+  ln -sf $srcdir/setup.py
+  ln -sf $srcdir/MANIFEST.in
+
   rm -rf ninja_tests ninja_profiling
 }
-package() {
-  cd "$srcdir/ninja-ide"
 
-  cp $srcdir/setup.py .
-  cp $srcdir/MANIFEST.in .
+build () {
+  cd ninja-ide
+
+  python3 setup.py clean --all
+  python3 setup.py build
+}
+
+package() {
+  cd ninja-ide
 
-  python3 setup.py install --root="$pkgdir" -O1
+  python3 setup.py install --root="$pkgdir" --skip-build -O1
 
-  install -Dm755 "$srcdir/ninja-ide/ninja-ide.py" "$pkgdir/usr/bin/$pkgname"
-  install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$srcdir/ninja-ide/ninja_ide/images/icon.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.png"
-  install -Dm644 "$srcdir/ninja-ide/icon.png" "$pkgdir/usr/share/icons/hicolor/256x256/apps/$pkgname.png"
+  install -Dm755 ninja-ide.py "$pkgdir/usr/bin/$pkgname"
+  install -Dm644 ninja_ide/images/icon.png "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.png"
+  install -Dm644 icon.png "$pkgdir/usr/share/icons/hicolor/256x256/apps/$pkgname.png"
+  install -Dm644 build_files/$pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
 }
diff --git a/ninja-ide-git.desktop b/ninja-ide-git.desktop
deleted file mode 100644
index b362c8beed62..000000000000
--- a/ninja-ide-git.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Ninja IDE
-Comment=A Python IDE
-Exec=ninja-ide-git %F
-Icon=ninja-ide-git
-Terminal=false
-Type=Application
-Categories=Development;IDE;
-StartupNotify=true
-MimeType=application/x-python;application/x-ninja-ide;