Modified to avoid cloning the complete repository if the package is rebuilt

2 files changed, 20 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7435e92117c4..40d64893a25e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openmodelica-git
 	pkgdesc = The Open Source Modelica Suite
 	pkgver = 1.9.3.dev.r335.g8c5d48e
-	pkgrel = 3
+	pkgrel = 4
 	url = https://openmodelica.org
 	arch = i686
 	arch = x86_64
@@ -35,7 +35,11 @@ pkgbase = openmodelica-git
 	depends = qjson
 	depends = suitesparse
 	depends = boost-libs
+	provides = openmodelica
+	conflicts = openmodelica
 	conflicts = openmodelica-svn
+	source = openmodelica-git::git+https://github.com/OpenModelica/OpenModelica
+	md5sums = SKIP
 
 pkgname = openmodelica-git
 
diff --git a/PKGBUILD b/PKGBUILD
index d52121896344..847da1429206 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,7 @@
- 
 # Maintainer: Xwang <xwaang1976@gmail.com>
 pkgname=openmodelica-git
 pkgver=1.9.3.dev.r335.g8c5d48e
-pkgrel=3
+pkgrel=4
 pkgdesc="The Open Source Modelica Suite"
 arch=('i686' 'x86_64')
 url="https://openmodelica.org"
@@ -12,30 +11,28 @@ depends=('java-environment' 'lpsolve' 'hdf5-openmpi' 'omniorb' 'openscenegraph'
 
 makedepends=('autoconf' 'automake' 'libtool' 'gcc' 'gcc-fortran-multilib' 'boost' 'clang' 'cmake' 'jre7-openjdk' 'antlr2' 'subversion' 'lib32-expat' 'lib32-ncurses' 'lib32-readline')
 
-conflicts=('openmodelica-svn')
+provides=('openmodelica')
+conflicts=('openmodelica' 'openmodelica-svn')
 
-#source=('openmodelica::git+https://openmodelica.org/git-readonly/OpenModelica.git')
-source=()
-md5sums=()
+source=($pkgname::git+https://github.com/OpenModelica/OpenModelica) 
+md5sums=('SKIP')
 
-_gitmod="openmodelica"
+prepare() {
+    # clone all submodules
+    cd "$srcdir/$pkgname"
+    sed -i 's,../,https://github.com/OpenModelica/,g' .gitmodules
+    git submodule sync
+    git submodule update --init --recursive --depth 1
+}
 
 pkgver() {
-    cd "${srcdir}/${_gitmod}"
+    cd "$pkgname"
     git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-    cd "${srcdir}"
-      
-    rm -r -f "${srcdir}/${_gitmod}"
-    git clone https://openmodelica.org/git-readonly/OpenModelica.git "${_gitmod}" --recursive
-}
-
-
 
 build() {
-    cd "${srcdir}/${_gitmod}"
+    cd "$srcdir/$pkgname"
     autoconf
     ./configure --prefix=/usr/ --with-omniORB  --with-cppruntime --with-lapack='-llapack -lblas'
     make
@@ -48,7 +45,7 @@ build() {
 
 package() {
     mkdir -p ${pkgdir}/usr/
-    cd "${srcdir}/${_gitmod}"
+    cd "$srcdir/$pkgname"
     cp -r build/bin/ ${pkgdir}/usr/bin/
     cp -r build/include/ ${pkgdir}/usr/include/
     cp -r build/lib/ ${pkgdir}/usr/lib/