[GRASS-SVN] r68652 - in grass/trunk: . .travis

svn_grass at osgeo.org svn_grass at osgeo.org
Thu Jun 9 01:30:55 PDT 2016


Author: neteler
Date: 2016-06-09 01:30:55 -0700 (Thu, 09 Jun 2016)
New Revision: 68652

Added:
   grass/trunk/.gitignore
   grass/trunk/.travis/
   grass/trunk/.travis/.travis.linux.before_install.sh
   grass/trunk/.travis/.travis.linux.install.sh
   grass/trunk/.travis/.travis.linux.script.sh
   grass/trunk/.travis/.travis.osx.before_install.sh
   grass/trunk/.travis/.travis.osx.install.sh
   grass/trunk/.travis/.travis.osx.script.sh
Modified:
   grass/trunk/.travis.yml
Log:
travis CI: Addition of testing for OSX (contributed by rkrug, https://github.com/GRASS-GIS/grass-ci/pull/1)

Added: grass/trunk/.gitignore
===================================================================
--- grass/trunk/.gitignore	                        (rev 0)
+++ grass/trunk/.gitignore	2016-06-09 08:30:55 UTC (rev 68652)
@@ -0,0 +1,2 @@
+/emacs.desktop
+*.lock

Added: grass/trunk/.travis/.travis.linux.before_install.sh
===================================================================
--- grass/trunk/.travis/.travis.linux.before_install.sh	                        (rev 0)
+++ grass/trunk/.travis/.travis.linux.before_install.sh	2016-06-09 08:30:55 UTC (rev 68652)
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+# Author: Ivan Mincik, ivan.mincik at gmail.com
+
+# build dependencies
+sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable -y
+sudo apt-get update -qq
+


Property changes on: grass/trunk/.travis/.travis.linux.before_install.sh
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + text/x-sh
Added: svn:eol-style
   + native

Added: grass/trunk/.travis/.travis.linux.install.sh
===================================================================
--- grass/trunk/.travis/.travis.linux.install.sh	                        (rev 0)
+++ grass/trunk/.travis/.travis.linux.install.sh	2016-06-09 08:30:55 UTC (rev 68652)
@@ -0,0 +1,42 @@
+#!/usr/bin/env sh
+# Author: Ivan Mincik, ivan.mincik at gmail.com
+
+sudo apt-get install --no-install-recommends \
+    autoconf2.13 \
+    autotools-dev \
+    debhelper \
+    fakeroot \
+    flex \
+    bison \
+    libcairo2-dev \
+    libfftw3-dev \
+    libfreetype6-dev \
+    libgdal-dev \
+    libgeos-dev \
+    libglu1-mesa-dev \
+    libjpeg-dev \
+    libpng-dev \
+    libtiff-dev \
+    libmysqlclient-dev \
+    libncurses5-dev \
+    libpq-dev \
+    libproj-dev \
+    proj-bin \
+    libreadline-dev \
+    libsqlite3-dev \
+    libwxgtk2.8-dev \
+    libxmu-dev \
+    python \
+    python-wxgtk2.8 \
+    python-dev \
+    unixodbc-dev \
+    libnetcdf-dev   \
+    netcdf-bin \
+    dpatch \
+    libblas-dev \
+    liblapack-dev \
+    python-numpy
+
+# test dataset
+wget http://grass.osgeo.org/sampledata/north_carolina/nc_basic_spm_grass7.tar.gz
+tar xzf ./nc_basic_spm_grass7.tar.gz


Property changes on: grass/trunk/.travis/.travis.linux.install.sh
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + text/x-sh
Added: svn:eol-style
   + native

Added: grass/trunk/.travis/.travis.linux.script.sh
===================================================================
--- grass/trunk/.travis/.travis.linux.script.sh	                        (rev 0)
+++ grass/trunk/.travis/.travis.linux.script.sh	2016-06-09 08:30:55 UTC (rev 68652)
@@ -0,0 +1,30 @@
+#!/usr/bin/env sh
+# Author: Ivan Mincik, ivan.mincik at gmail.com
+
+./configure --host=x86_64-linux-gnu \
+            --build=x86_64-linux-gnu \
+            --prefix=/usr/lib \
+            --sysconfdir=/etc \
+            --sharedstatedir=/var \
+            --enable-shared \
+            --with-postgres \
+            --with-cxx \
+            --with-gdal \
+            --with-freetype \
+            --with-readline \
+            --with-nls \
+            --with-odbc \
+            --with-geos \
+            --with-lapack \
+            --with-netcdf \
+            --with-blas \
+            --with-sqlite \
+            --enable-largefile \
+            --with-freetype-includes=/usr/include/freetype2/ \
+            --with-postgres-includes=/usr/include/postgresql/ \
+            --with-proj-share=/usr/share/proj \
+            --with-wxwidgets=/usr/bin/wx-config \
+            --with-python \
+            --with-cairo
+
+make -j2


Property changes on: grass/trunk/.travis/.travis.linux.script.sh
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + text/x-sh
Added: svn:eol-style
   + native

Added: grass/trunk/.travis/.travis.osx.before_install.sh
===================================================================
--- grass/trunk/.travis/.travis.osx.before_install.sh	                        (rev 0)
+++ grass/trunk/.travis/.travis.osx.before_install.sh	2016-06-09 08:30:55 UTC (rev 68652)
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+# Author: Rainer M. Krug, Rainer at krugs.de
+
+## add taps for homebrew installs
+brew tap rkrug/experimental
+brew tap rkrug/head-only
+brew tap rkrug/dev-only
+
+brew tap homebrew/science
+brew tap osgeo/osgeo4mac
+
+brew update


Property changes on: grass/trunk/.travis/.travis.osx.before_install.sh
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + text/x-sh
Added: svn:eol-style
   + native

Added: grass/trunk/.travis/.travis.osx.install.sh
===================================================================
--- grass/trunk/.travis/.travis.osx.install.sh	                        (rev 0)
+++ grass/trunk/.travis/.travis.osx.install.sh	2016-06-09 08:30:55 UTC (rev 68652)
@@ -0,0 +1,24 @@
+#!/usr/bin/env sh
+# Author: Rainer M. Krug, Rainer at krugs.de
+
+## install dependencies
+# brew install --only-dependencies \
+#      liblas
+# 
+# brew install --build-from-source \
+#      liblas
+
+# brew install --only-dependencies \
+#      --HEAD \
+#      --with-nc_spm_08_grass7 \
+#      --with-ffmpeg \
+#      --with-mysql \
+#      --with-netcdf \
+#      --with-postgresql \
+#      --with-openblas \
+#      --with-liblas \
+#      grass-trunk
+
+## download and install test dataset
+wget http://grass.osgeo.org/sampledata/north_carolina/nc_basic_spm_grass7.tar.gz
+tar xzf ./nc_basic_spm_grass7.tar.gz


Property changes on: grass/trunk/.travis/.travis.osx.install.sh
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + text/x-sh
Added: svn:eol-style
   + native

Added: grass/trunk/.travis/.travis.osx.script.sh
===================================================================
--- grass/trunk/.travis/.travis.osx.script.sh	                        (rev 0)
+++ grass/trunk/.travis/.travis.osx.script.sh	2016-06-09 08:30:55 UTC (rev 68652)
@@ -0,0 +1,41 @@
+#!/usr/bin/env sh
+# Author: Rainer M. Krug, Rainer at krugs.de
+
+## some tests for the recipe 
+# brew audit -v $RECIPE
+
+## install GRASS trunk
+brew install --HEAD \
+             --enable-shared \
+             --with-postgresql \
+             --with-cxx \
+             --with-gdal-1 \
+             --with-freetype \
+             --with-readline \
+             --with-nls \
+             --with-odbc \
+             --with-geos \
+             --with-lapack \
+             --with-netcdf \
+             --with-blas \
+             --with-sqlite \
+             --with-freetype \
+             --with-python \
+             grass-trunk
+
+## Not implementyed yet:
+             # --enable-largefile
+             # --with-ffmpeg \
+             # --with-mysql \
+             # --with-netcdf \
+             # --with-openblas \
+             # --with-liblas \
+
+brew test -v grass-trunk
+# brew info grass-trunk
+
+## run tests
+## grass71 ./nc_basic_spm_grass7/PERMANENT --exec python -m grass.gunittest.main --location './nc_basic_spm_grass7' --location-type nc
+
+## uninstall grass-trunk
+# brew uninstall grass-trunk


Property changes on: grass/trunk/.travis/.travis.osx.script.sh
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + text/x-sh
Added: svn:eol-style
   + native

Modified: grass/trunk/.travis.yml
===================================================================
--- grass/trunk/.travis.yml	2016-06-09 07:40:22 UTC (rev 68651)
+++ grass/trunk/.travis.yml	2016-06-09 08:30:55 UTC (rev 68652)
@@ -1,95 +1,42 @@
-# Author: Ivan Mincik, ivan.mincik at gmail.com
+# Author: Ivan Mincik, ivan.mincik at gmail.com (linux)
+#         Rainer M. Krug, Rainer at krugs.de (osx)
 
 language: c
 
-compiler:
-        - gcc
-        - clang
+matrix:
+   include:
+      - os: linux
+        compiler: gcc
+        sudo: required
+      - os: linux
+        compiler: clang
+        sudo: required
+      - language: objective-c
+        os: osx
 
-cache: apt
+env:
+  global:
+    - CFLAGS="-Werror=implicit-function-declaration"
 
 before_install:
-        # build dependencies
-        - sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable -y
-        - sudo apt-get update -qq
+  - ./.travis/.travis.$TRAVIS_OS_NAME.before_install.sh
 
-        # test dataset
-        - wget http://grass.osgeo.org/sampledata/north_carolina/nc_basic_spm_grass7.tar.gz
-        - tar xzf ./nc_basic_spm_grass7.tar.gz
-
 install:
-        - sudo apt-get install --no-install-recommends
-                autoconf2.13
-                autotools-dev
-                debhelper
-                fakeroot
-                flex
-                bison
-                libcairo2-dev
-                libfftw3-dev
-                libfreetype6-dev
-                libgdal-dev
-                libgeos-dev
-                libglu1-mesa-dev
-                libjpeg-dev
-                libpng-dev
-                libtiff-dev
-                libmysqlclient-dev
-                libncurses5-dev
-                libpq-dev
-                libproj-dev
-                proj-bin
-                libreadline-dev
-                libsqlite3-dev
-                libwxgtk2.8-dev
-                libxmu-dev
-                python
-                python-wxgtk2.8
-                python-dev
-                unixodbc-dev
-                libnetcdf-dev  
-                netcdf-bin
-                dpatch
-                libblas-dev
-                liblapack-dev
-                python-numpy
+  - ./.travis/.travis.$TRAVIS_OS_NAME.install.sh
 
-env:
-  global:
-    - CFLAGS="-Werror=implicit-function-declaration"
-
 script:
-        - ./configure --host=x86_64-linux-gnu --build=x86_64-linux-gnu
-                --prefix=/usr/lib
-                --sysconfdir=/etc
-                --sharedstatedir=/var
-                --enable-shared
-                --with-postgres
-                --with-cxx
-                --with-gdal
-                --with-freetype
-                --with-readline
-                --with-nls
-                --with-odbc
-                --with-geos
-                --with-lapack
-                --with-netcdf
-                --with-blas
-                --with-sqlite
-                --enable-largefile
-                --with-freetype-includes=/usr/include/freetype2/
-                --with-postgres-includes=/usr/include/postgresql/
-                --with-proj-share=/usr/share/proj
-                --with-wxwidgets=/usr/bin/wx-config
-                --with-python
-                --with-cairo
-        - make -j2
+  - ./.travis/.travis.$TRAVIS_OS_NAME.script.sh
 
-notifications:
-        email:
-            recipients:
-                - grass-dev at lists.osgeo.org
-                - landa.martin at gmail.com
-                - wenzeslaus at gmail.com
-            on_success: change
-            on_failure: always
+## Notifications:
+##         email:
+##             recipients:
+##                 - grass-dev at lists.osgeo.org
+##                 - landa.martin at gmail.com
+##                 - wenzeslaus at gmail.com
+##                 - rainer at krugs.de
+##             on_success: change
+##             on_failure: always
+
+
+## TODO Change so that the .travis.yml files are in one repo and the
+## grass repo is downloaded automatically
\ No newline at end of file



More information about the grass-commit mailing list