Working version provided by Xwang

2 files changed, 33 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fd96e24b82c6..c83ff5561b4e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,12 +26,14 @@ pkgbase = openmodelica-git
 	depends = python
 	depends = ruby
 	depends = suitesparse
-	depends = boost-libs
 	depends = qt5-webkit
 	depends = qt5-xmlpatterns
-	depends = qt5-svg
-	depends = qt5-tools
 	depends = fmilib
+	depends = qwt
+	depends = coin-or-ipopt
+	depends = python2
+	depends = lib32-gcc-libs
+	depends = lib32-zlib
 	provides = openmodelica
 	conflicts = openmodelica
 	conflicts = openmodelica-svn
diff --git a/PKGBUILD b/PKGBUILD
index 72ef7af9c05e..666b2d30a126 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,48 +8,50 @@ pkgdesc="The Open Source Modelica Suite"
 arch=('i686' 'x86_64')
 url="https://openmodelica.org"
 license=('OSMC-PL')
-depends=('java-environment' 'lpsolve' 'openscenegraph' 'python' 'ruby' 'suitesparse' 'boost-libs' 'qt5-webkit' 'qt5-xmlpatterns' 'qt5-svg' 'qt5-tools' 'fmilib')
+depends=('java-environment' 'lpsolve' 'openscenegraph' 'python' 'ruby' 'suitesparse' 'qt5-webkit' 'qt5-xmlpatterns'  'fmilib'  'qwt' 'coin-or-ipopt' 'python2' 'lib32-gcc-libs' 'lib32-zlib')
 makedepends=('autoconf' 'automake' 'libtool' 'gcc' 'gcc-fortran-multilib' 'boost' 'clang' 'cmake' 'jre7-openjdk' 'antlr2' 'subversion' 'lib32-expat' 'lib32-ncurses' 'lib32-readline')
 provides=('openmodelica')
 conflicts=('openmodelica' 'openmodelica-svn' 'openmodelica-dev')
+#source=('git+https://github.com/ppenguin/OpenModelica.git')
+#md5sums=('SKIP')
 
 prepare() {
     # clone all submodules
+    #place for openmodelica-git.sh
+    #./openmodelica-git.sh
+    
     mkdir -p "$srcdir/$pkgname"
     if [ ! -d "$srcdir/$pkgname/.git" ]; then
-        git clone https://github.com/OpenModelica/OpenModelica "$srcdir/$pkgname"
-        echo "***** CLONING COMPLETED!!!!! ****"
+        MY_FORK=MyGitHubUserName ; git clone https://github.com/ppenguin/OpenModelica --recursive && (cd OpenModelica && git remote set-url --push origin git@github.com:$MY_FORK/OpenModelica.git && git submodule foreach --recursive 'git remote set-url --push origin `git config --get remote.origin.url | sed s,^.*/,git@github.com:'$MY_FORK'/,`')
+         echo "***** CLONING COMPLETED!!!!! ****"
     fi
-    cd "$srcdir/$pkgname"
-    git submodule sync
-    git submodule update --init --recursive
-    cd "$srcdir"
-    cd "$srcdir/$pkgname"
 }
  
-pkgver() {
-    cd "$pkgname"
-    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
+#pkgver() {
+    #cd "$pkgname"
+    #git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+#}
  
 build() {
-cd "$srcdir/$pkgname"
-    autoconf
-    export CPPFLAGS="$CPPFLAGS -DH5_USE_18_API"
-	./configure --prefix=/usr/ CC=clang CXX=clang++ --with-UMFPACK 
-    make
+cd "$srcdir/OpenModelica"
+./build.sh
+make -j1
 }
  
 package() {  
-    cd "$srcdir/$pkgname" 
+    cd "$srcdir/OpenModelica" 
     make install DESTDIR=${pkgdir}
-   
-    install -D -m644 "OMEdit/OMEditLIB/Resources/icons/omedit.ico" "${pkgdir}/usr/share/openmodelica/icons/omedit.ico"
-    install -D -m644 "OMNotebook/OMNotebook/OMNotebookGUI/Resources/OMNotebook_icon.ico" "${pkgdir}/usr/share/openmodelica/icons/omnotebook.ico"
-#   install -D -m644 "OMOptim/OMOptim/GUI/Resources/omoptim.ico" "${pkgdir}/usr/share/openmodelica/icons/omoptim.ico"
-    install -D -m644 "OMShell/OMShell/OMShellGUI/Resources/omshell.ico" "${pkgdir}/usr/share/openmodelica/icons/omshell.ico"
-    install -D -m644 "OMPlot/OMPlot/OMPlotGUI/Resources/icons/omplot.ico" "${pkgdir}/usr/share/openmodelica/icons/omplot.ico"
+    
+    install -D -m644 "OMEdit/OMEditLIB/Resources/icons/omedit.ico" "${pkgdir}/opt/OpenModelica/share/icons/omedit.ico"
+    install -D -m644 "OMNotebook/OMNotebook/OMNotebookGUI/Resources/OMNotebook_icon.ico" "${pkgdir}/opt/OpenModelica/share/icons/omnotebook.ico"
+#   install -D -m644 "OMOptim/OMOptim/GUI/Resources/omoptim.ico" "${pkgdir}/opt/OpenModelica/share/icons/omoptim.ico"
+    install -D -m644 "OMShell/OMShell/OMShellGUI/Resources/omshell.ico" "${pkgdir}/opt/OpenModelica/share/icons/omshell.ico"
+    install -D -m644 "OMPlot/OMPlot/OMPlotGUI/Resources/icons/omplot.ico" "${pkgdir}/opt/OpenModelica/share/icons/omplot.ico"
     install -D -m644 "OMCompiler/COPYING" "${pkgdir}/usr/share/licenses/openmodelica/LICENSE"
-    mkdir ${pkgdir}/usr/OMSens/
-    cp -r "OMSens" "${pkgdir}/usr/" #Copy OMSens' modules in the working directory
+#    mkdir ${pkgdir}/usr/OMSens/
+    cp -r "OMSens" "${pkgdir}/opt/OpenModelica" #Copy OMSens' modules in the working directory
+#This MANUALLY solves the issues about the folders; otherwise a patch will be needed
+#    rmdir usr/OMSens
+#    mv "${pkgdir}/usr/share/openmodelica/icons/" "${pkgdir}/opt/OpenModelica/share/icons/"
+    echo "OMSens is now in /opt/OpenModelica"
 }