Merge pull request #36 from jfsmig/2.x-fixes-20181015

Fix output oddities

Author: jfsmig

.travis.yml

@@ -2,17 +2,24 @@ sudo: required
 dist: trusty
 language: c
 install:
-  - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse"
-  - sudo apt-get update -qq
-  - sudo apt-get install -y --force-yes autoconf automake libtool xutils-dev gcc make cmake libglib2.0-dev
+  - sudo apt-get install -y --force-yes gcc make cmake libglib2.0-dev
+  - sudo apt-get install -y --force-yes autoconf automake libtool xutils-dev
+  - sudo apt-get install -y --force-yes jq
 env:
   matrix:
     - BUILD_TYPE=Debug
     - BUILD_TYPE=Release
-script:
+before_script:
   - set -e
   - mkdir /tmp/oio
-  - export CMAKE_OPTS='-DCMAKE_INSTALL_PREFIX=/tmp/oio -DLD_LIBDIR=lib'
+  - export CMAKE_OPTS='-DCMAKE_INSTALL_PREFIX=/tmp/ROOT'
   - cmake ${CMAKE_OPTS} -DCMAKE_BUILD_TYPE=$BUILD_TYPE .
   - make all
   - make install
+script:
+  - set -e
+  - export PATH="$PATH:/tmp/ROOT/bin" TMPDIR=/tmp
+  - ./tools/gridinit-genconf.sh 15
+  - gridinit -d -s gridinit /tmp/gridinit/gridinit.conf
+  - ./tools/cycle.sh
+  - pkill gridinit

CMakeLists.txt

@@ -1,18 +1,15 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.0)
 project (GridInit C)
 
 include(CheckIncludeFile)
 include(CheckLibraryExists)
 include(CheckTypeSize)
 
-set(GridInit_VERSION_MAJOR 1)
-set(GridInit_VERSION_MINOR 1)
-set(GridInit_RELEASE 5)
+set(GridInit_VERSION_MAJOR 2)
+set(GridInit_VERSION_MINOR 0)
+set(GridInit_RELEASE 1)
 set(API_VERSION "${GridInit_VERSION_MAJOR}.${GridInit_VERSION_MINOR}.${GridInit_RELEASE}")
 set(SHORT_API_VERSION "${GridInit_VERSION_MAJOR}.${GridInit_VERSION_MINOR}")
-if (NOT ABI_VERSION)
-	set(ABI_VERSION 0)
-endif()
 
 add_definitions(-DAPI_VERSION="${API_VERSION}")
 add_definitions(-DSHORT_API_VERSION="${SHORT_API_VERSION}")
@@ -129,7 +126,6 @@ add_dependencies(gridinit
 
 add_executable(gridinit_cmd
 		main/gridinit_cmd.c
-		main/format_output.c
 		main/utils.c)
 target_link_libraries(gridinit_cmd ${GLIB2_LIBRARIES})