Reverse pull on 25 Feb 2019.

.travis.yml

@@ -1,41 +1,64 @@
+dist: bionic
 language: go
-go: 1.9.x
+go: 1.16.3
 env:
-  - PREFIX=$HOME/local GDALVER=2.2.4
+  - PREFIX=$HOME/local PROJVER=6.1.1 GDALVER=3.0.1 OPENJPVER=2.3.1 NJOBS=2
 services:
   - postgresql
 cache:
   directories:
     - $PREFIX
 addons:
-  postgresql: "9.6"
+  postgresql: "10"
   apt:
     packages:
-    - postgresql-9.6-postgis-2.3
-    - libproj-dev
+    - postgresql-10-postgis-2.4
+    - postgresql-10-postgis-2.4-scripts
+    - postgresql-client-10
     - libhdf4-dev
     - libhdf5-dev
     - libnetcdf-dev
-    - libopenjpeg-dev
-    - openjpeg-tools
 
 before_script:
-  - psql -U postgres -c "create extension postgis"
+  - sudo service postgresql stop
+  - sudo rm -rf /var/lib/postgresql/10/main
+  - rm -rf $PGDATA
+  - /usr/lib/postgresql/10/bin/initdb -U $PGUSER
+  - mkdir -p $PREFIX/pg_socket
+  - /usr/lib/postgresql/10/bin/pg_ctl -o "-h ' ' -k $PGHOST" -w -t 5 start
 
 install:
   - git clone https://github.com/sstephenson/bats.git
   - (cd bats && git checkout 03608115df2071fff4eaaff1605768c275e5f81f && ./install.sh $PREFIX)
+  - export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
+  - export LD_LIBRARY_PATH=$PREFIX/lib:$LD_LIBRARY_PATH
+  - export CPPFLAGS=-I$PREFIX/include
+  - export CXXFLAGS=-I$PREFIX/include
+  - export CFLAGS=-I$PREFIX/include
+  - export LDFLAGS=-L$PREFIX/lib
+  - export PGDATA=$PREFIX/pg_data
+  - export PGHOST=$PREFIX/pg_socket
+  - export PGUSER=postgres
   - >
-    if ! test -f $PREFIX/local/lib/libgdal.a ; then
+    if ! test -f $PREFIX/lib/libgdal.a ; then
+      wget --quiet https://github.com/uclouvain/openjpeg/archive/v${OPENJPVER}.tar.gz || exit 1
+      tar xf v${OPENJPVER}.tar.gz
+      (cd openjpeg-${OPENJPVER} && mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX && make -j${NJOBS} install)
+      wget --quiet https://github.com/OSGeo/PROJ/releases/download/$PROJVER/proj-$PROJVER.tar.gz || exit 1
+      tar xf proj-$PROJVER.tar.gz
+      (cd proj-$PROJVER && ./configure --prefix=$PREFIX && make -j${NJOBS} install)
       wget --quiet http://download.osgeo.org/gdal/$GDALVER/gdal-$GDALVER.tar.gz{,.md5} || exit 1
       md5sum gdal-$GDALVER.tar.gz | cmp - gdal-$GDALVER.tar.gz.md5 || exit 1
-      tar xfvz gdal-$GDALVER.tar.gz
-      (cd gdal-$GDALVER && ./configure --with-openjpeg --prefix=$HOME/gdal-install && make -s all install)
+      tar xf gdal-$GDALVER.tar.gz
+      (cd gdal-$GDALVER && ./configure --prefix=$PREFIX && make -j${NJOBS} install)
     fi
 
 script:
-  - cd $TRAVIS_BUILD_DIR/mas/db && psql -f schema.sql -U postgres
-  - go tool vet $TRAVIS_BUILD_DIR
+  - cd $TRAVIS_BUILD_DIR/mas/db && psql -f schema.sql
+  - cd $TRAVIS_BUILD_DIR/mas/api && psql -f mas.sql
   - gofmt -d $TRAVIS_BUILD_DIR
   # Ensure that gofmt -d produces zero diff output
   - test -z "$(gofmt -d $TRAVIS_BUILD_DIR)"
+  - mkdir -p $(go env GOPATH)/src/github.com/nci
+  - test -d "$(go env GOPATH)/src/github.com/nci/gsky" || cp -r $TRAVIS_BUILD_DIR $(go env GOPATH)/src/github.com/nci/gsky
+  - cd $TRAVIS_BUILD_DIR && ./configure && make all

Makefile.in

@@ -9,27 +9,36 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 BASEPATH=github.com/nci/gsky
+VERSION=$(shell git rev-parse HEAD)
 LDFLAGS="-X=$(BASEPATH)/utils.LibexecDir=${libexecdir} -X=$(BASEPATH)/worker/gdalservice.LibexecDir=${libexecdir} \
-	-X=$(BASEPATH)/utils.EtcDir=$(sysconfdir) -X=$(BASEPATH)/utils.DataDir=${datarootdir}/gsky"
+	-X=$(BASEPATH)/utils.EtcDir=$(sysconfdir) -X=$(BASEPATH)/utils.DataDir=${datarootdir}/gsky \
+	-X=$(BASEPATH)/utils.GSKYVersion=${VERSION}"
 GOBIN=$(shell go env GOBIN)
 ifeq ($(strip $(GOBIN)),)
   GOBIN=$(shell go env GOPATH)/bin
 endif
+GDALCFLAGS=$(shell pkg-config gdal --cflags)
+GDALLDLAGS=$(shell pkg-config gdal --libs)
+NCCFLAGS=-DNETCDF_HAS_NC4 -DNETCDF_HAS_NC2 -DHAVE_HDF4 -DHAVE_HDF5 -DENABLE_UFFD -I$(shell nc-config --includedir)
+NCLDFLAGS=$(shell nc-config --libs)
 
-all: concurrent pkg-config
+all: pkg-config concurrent gdal_GSKY_netCDF.so
 	go get ./...
 	go install -ldflags=$(LDFLAGS) ./...
 
 check test: pkg-config
 	go test ./...
 	bats testsuite
 
+gdal_GSKY_netCDF.so: $(wildcard libs/gdal/frmts/gsky_netcdf/*.cpp)
+	$(CXX) -std=c++11 -Wall -shared -fPIC -fvisibility=hidden -Ofast $(NCCFLAGS) $(GDALCFLAGS) $(NCLDFLAGS) $(GDALLDFLAGS) $^ -o $@
+
 concurrent: src/concurrent.c
 	$(CC) -std=c99 -Wall -O2 $< -o $@
 
 src/concurrent.c:
 	mkdir -p $(dir $@)
-	wget --quiet https://github.com/seanpringle/concurrent/raw/634330a119f16916e5ad24da32172fa9312ab5a3/concurrent.c -O $@
+	wget --quiet https://github.com/edisonguo/concurrent/raw/e6ff2d98fb7f4cebf297b1725fee9a9e3d1cc164/concurrent.c -O $@
 
 # Note: install(1) can't deal with directories as source, so use cp -r.
 install:
@@ -38,6 +47,7 @@ install:
 	install -d $(datarootdir)/gsky/static
 	install -d $(datarootdir)/mas
 	install concurrent $(bindir)
+	install gdal_GSKY_netCDF.so $(sbindir)
 	install $(GOBIN)/gsky $(sbindir)/gsky-ows
 	install $(GOBIN)/gdal-process $(sbindir)/gsky-gdal-process
 	install $(GOBIN)/grpc-server $(sbindir)/gsky-rpc
@@ -62,3 +72,4 @@ distclean: clean
 .PHONY: pkg-config
 pkg-config:
 	pkg-config --exists gdal
+	nc-config --version

README.md

@@ -7,33 +7,43 @@ What Is This?
 GSKY was developed at [NCI](http://nci.org.au) and is a scalable,
 distributed server which presents a new approach for geospatial data
 discovery and delivery using OGC standards. The most recent release is
-version 1.0 (June 2018).
+[here](https://github.com/nci/gsky/releases).
 
-License
--------
+[![Build Status](https://api.travis-ci.com/nci/gsky.svg?branch=master)](https://travis-ci.com/github/nci/gsky)
 
-Copyright 2016, 2017, 2018 Australian National University
+GSKY Docker Image
+-----------------
 
-Licensed under the Apache License, Version 2.0 (the "License"); you
-may not use this package except in compliance with the License.  A
-copy of the [License](http://www.apache.org/licenses/LICENSE-2.0) may
-be found in this source distribution in `LICENSE-2.0.txt`.
+The quickest way to try out GSKY is via GSKY docker image.
 
-Contributions
--------------
+GSKY's docker image ships with a fully functional environment of GSKY cluster,
+as well as sample data files and configuration files for testing.
 
-Suggestions, enhancement requests, bug reports and patches to GSKY are
-welcome via this GitHub page. Please submit patches as a GitHub pull
-request. Authors retain copyright over their contributions.
+```
+docker pull gjmouse/gsky:latest
+```
 
-[![Build Status](https://travis-ci.org/nci/gsky.svg?branch=master)](https://travis-ci.org/nci/gsky)
+For more details of GSKY docker image, please refer [here](docker/README.md).
 
-Citing GSKY in publications
----------------------------
+Overview of Servers Components
+------------------------------
 
-When referring to GSKY in publications please use the citation in
-[CITATION.md](CITATION.md).  A ready-to-use BibTeX entry for LaTeX
-users can also be found in this file.
+GSKY mainly consists of three servers working together to deliver services. The main server (`ows.go`) is the front-end server that takes WMS/WCS/WPS HTTP requests as inputs. The main server talks to the MAS Restful API server (`mas/api/api.go`) for the data files that intersect with the polygon bounding box in the WMS/WCS/WPS requests. With those data files, the main server talks to the RPC worker nodes (`grpc-server/main.go`) for compute and IO intensive tasks and then sends the results back to the client side.
+
+How To Start the Servers
+------------------------
+
+- Start the MAS Restful API server: `/opt/gsky/sbin/masapi -port 8888`
+
+	The `-port` option sets the API server listening port. The default is port 8080.
+
+- Start all the RPC worker nodes: `/opt/gsky/sbin/gsky-rpc -p 6000`
+
+	The `-p` option sets the gRPC listening port. The default is port 6000.
+
+- Start the main server: `/opt/gsky/sbin/gsky-ows -p 8080`
+
+	The `-p` option sets the main server listening port. The default is port 8080.
 
 Configuration Files
 -------------------
@@ -73,37 +83,43 @@ How To Compile the Source
 
 Dependencies:
 
-+ Go > 1.6.0
-+ GDAL > 2.1.0
-+ Various Go packages (handled by the build system)
++ Go 1.16.x+
++ C++ 14+
++ GDAL 3.x+
++ PostgreSQL 11+
++ PostGIS 3.x+
++ Various Go packages (handled by go modules)
 
 ```console
-$ export GOPATH=~/go
-$ go get github.com/nci/gsky
-$ cd $GOPATH/src/github.com/nci/gsky
+$ git clone https://github.com/nci/gsky
+$ cd gsky
 $ ./configure
 $ make all install
 ```
 
 The `configure` script takes all of the standard GNU `configure` flags
 such as `--prefix` (to specify where to install GSKY).
 
-Overview of the Servers
------------------------
-
-GSKY mainly consists of three servers working together to deliver services. The main server (`ows.go`) is the front-end server that takes WMS/WCS/WPS HTTP requests as inputs. The main server talks to the MAS Restful API server (`mas/api/api.go`) for the data files that intersect with the polygon bounding box in the WMS/WCS/WPS requests. With those data files, the main server talks to the RPC worker nodes (`grpc-server/main.go`) for compute and IO intensive tasks and then sends the results back to the client side.
-
-How To Start the Servers
------------------------
+Contributions
+-------------
 
-- Start the MAS Restful API server: `/opt/gsky/sbin/masapi -port 8888`
+Suggestions, enhancement requests, bug reports and patches to GSKY are
+welcome via this GitHub page. Please submit patches as a GitHub pull
+request. Authors retain copyright over their contributions.
 
-	The `-port` option sets the API server listening port. The default is port 8080.
+Citing GSKY in publications
+---------------------------
 
-- Start all the RPC worker nodes: `/opt/gsky/sbin/gsky-rpc -p 6000`
+When referring to GSKY in publications please use the citation in
+[CITATION.md](CITATION.md).  A ready-to-use BibTeX entry for LaTeX
+users can also be found in this file.
 
-	The `-p` option sets the gRPC listening port. The default is port 6000.
+License
+-------
 
-- Start the main server: `/opt/gsky/sbin/gsky-ows -p 8080`
+Copyright 2016 Australian National University
 
-	The `-p` option sets the main server listening port. The default is port 8080.
+Licensed under the Apache License, Version 2.0 (the "License"); you
+may not use this package except in compliance with the License.  A
+copy of the [License](http://www.apache.org/licenses/LICENSE-2.0) may
+be found in this source distribution in `LICENSE-2.0.txt`.