Fixed build for package

2 files changed, 76 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 341e9794780d..be5bd6da5f6b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Thu Jun 29 19:57:49 UTC 2017
 pkgbase = openvsp-git
 	pkgdesc = OpenVSP allows the user to create a 3D model of an aircraft defined by common engineering parameters.
-	pkgver = 20170629
+	pkgver = r3975.bc8a5674
 	pkgrel = 1
 	url = http://www.openvsp.org
 	arch = i686
@@ -10,10 +8,21 @@ pkgbase = openvsp-git
 	license = NASA OPEN SOURCE AGREEMENT VERSION 1.3
 	makedepends = cmake
 	makedepends = git
+	depends = cblas
+	depends = cminpack
+	depends = eigen
 	depends = fltk
-	depends = libxml2
+	depends = freeglut
+	depends = gcc
 	depends = glew
-	source = openvsp-git::git+https://github.com/OpenVSP/OpenVSP.git
+	depends = glm
+	depends = libxml2
+	optdepends = doxygen: generate documentation
+	optdepends = graphviz: generate documentation
+	optdepends = python: python API module
+	optdepends = swig: build interface to APIs
+	provides = openvsp
+	source = git+https://github.com/OpenVSP/OpenVSP.git
 	md5sums = SKIP
 
 pkgname = openvsp-git
diff --git a/PKGBUILD b/PKGBUILD
index 334508265b60..98e50c99b0e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,64 +1,80 @@
 # Contributor: Max Devaine <max@devaine.cz>
-
+# Maintainer: acxz <akashpatel2008 at yahoo dot com>
 pkgname=openvsp-git
-pkgver=20170629
+pkgver=r3975.bc8a5674
 pkgrel=1
-pkgdesc='OpenVSP allows the user to create a 3D model of an aircraft defined by common engineering parameters.'
-arch=(i686 x86_64)
+pkgdesc='OpenVSP allows the user to create a 3D model of an aircraft defined by
+         common engineering parameters.'
+arch=('i686' 'x86_64')
 url='http://www.openvsp.org'
 license=('NASA OPEN SOURCE AGREEMENT VERSION 1.3')
+depends=('cblas'
+         'cminpack'
+         'eigen'
+         'fltk'
+         'freeglut'
+         'gcc'
+         'glew'
+         'glm'
+         'libxml2')
+optdepends=('doxygen: generate documentation'
+            'graphviz: generate documentation'
+            'python: python API module'
+            'swig: build interface to APIs')
 makedepends=('cmake' 'git')
-depends=('fltk' 'libxml2' 'glew')
-provides=('')
-conflicts=('')
-groups=('')
-
-
-source=("$pkgname"::'git+https://github.com/OpenVSP/OpenVSP.git')
+provides=('openvsp')
+_name=OpenVSP
+source=("git+https://github.com/OpenVSP/OpenVSP.git")
 md5sums=('SKIP')
 
+pkgver() {
+  cd "${_name}"
+
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
 
 prepare() {
-    if [ -d "${srcdir}/build" ] ; then
-        rm -fr "${srcdir}/build"
-    fi
-
-    if [ -d "${srcdir}/buildlibs" ] ; then
-        rm -fr "${srcdir}/buildlibs"
-    fi
-    
-    mkdir "${srcdir}/buildlibs" 
-    mkdir "${srcdir}/build" 
+
+  # Add -lcblas to cmake flags
+  sed -i -e 's/fPIC/fPIC -lcblas/g' ${srcdir}/${_name}/SuperProject/CMakeLists.txt
+
 }
 
+_buildtype="Release"
+
 build() {
-   cd "$srcdir/buildlibs"
-   cmake ../$pkgname/Libraries/ \
-         -DCMAKE_BUILD_TYPE=Release \
-   	 -DCMAKE_PREFIX_PATH='/usr' \
-         -DVSP_USE_SYSTEM_FLTK=true \
-         -DVSP_USE_SYSTEM_GLEW=true \
-         -DVSP_USE_SYSTEM_LIBXML2=true \
-         -DVSP_USE_SYSTEM_GLM=true \
-         -DVSP_USE_SYSTEM_CPPTEST=false \
-         -DVSP_USE_SYSTEM_EIGEN=false \
-         -DVSP_USE_SYSTEM_CMINPACK=false \
-         -DVSP_USE_SYSTEM_CODEELI=false
-   
-   make || return 1
-
-   cd "$srcdir/build"
-   cmake ../$pkgname/src/ \
-         -DVSP_LIBRARY_PATH=$srcdir/buildlibs \
-         -DCMAKE_BUILD_TYPE=Release
-
-   make || return 1
+
+  # Create a build directory
+  mkdir -p "${srcdir}/${_name}/SuperProject/build"
+  cd "${srcdir}/${_name}/SuperProject/build"
+
+  msg "Starting CMake (build type: ${_buildtype})"
+
+  cmake .. \
+        -DCMAKE_BUILD_TYPE=${_buildtype} \
+        -DCMAKE_PREFIX_PATH='/usr'
+
+  msg "Building the project"
+  make || return 0
 }
 
 package() {
-  cd "$srcdir/build/"
-  cmake -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr/openvsp" -P cmake_install.cmake
+  cd "${srcdir}/${_name}/SuperProject/build/OpenVSP-prefix/src/OpenVSP-build/_CPack_Packages/Linux/ZIP/OpenVSP-3.17.1-Linux"
+
+  msg "Installing files"
+
+  # binary
   mkdir -p ${pkgdir}/usr/bin
-  cd ${pkgdir}/usr/openvsp
-  mv vsp vspaero vspscript vspviewer ${pkgdir}/usr/bin/
+  cp vsp vspaero vspscript vspslicer vspviewer ${pkgdir}/usr/bin/
+
+  # misc
+  mkdir -p ${pkgdir}/usr/share
+  cp README.md ${pkgdir}/usr/share/
+  cp LICENSE ${pkgdir}/usr/share/
+  cp -r CustomScripts ${pkgdir}/usr/share/
+  cp -r airfoil ${pkgdir}/usr/share/
+  cp -r matlab ${pkgdir}/usr/share/
+  cp -r scripts ${pkgdir}/usr/share/
+  cp -r textures ${pkgdir}/usr/share/
+
 }