updated build process

Author: mschenk42

.travis.yml

@@ -8,18 +8,15 @@ go:
   - "1.10"
 
 before_install:
-  - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then sudo apt-get install -y curl libcurl3 libcurl3-gnutls libcurl4-gnutls-dev; fi
   - $GOPATH/src/github.com/git-time-metric/gtm/script/git2go-init.sh
-  - cd $GOPATH/src/github.com/libgit2/git2go
-  - make install-static
+  - $GOPATH/src/github.com/git-time-metric/gtm/script/build-libgit2-${TRAVIS_OS_NAME}.sh
   - go get github.com/mattn/goveralls
 
 before_deploy:
   - go build -v --tags static -ldflags "-X main.Version=${TRAVIS_TAG}"
   - tar -zcf gtm.${TRAVIS_TAG}.${TRAVIS_OS_NAME}.tar.gz gtm
 
 script:
-  - cd $TRAVIS_BUILD_DIR
   - go get -d ./...
   - $HOME/gopath/bin/goveralls -v -flags=--tags=static -service=travis-ci
 

Makefile

@@ -17,7 +17,7 @@ fmt:
 
 install-git2go:
 	./script/git2go-init.sh
-	cd ${GOPATH}/src/github.com/libgit2/git2go && make install-static
+	./script/build-libgit2-osx.sh
 
 install:
 	go install --tags static ${LDFLAGS}

script/appveyor-build.sh

@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/bin/bash
+
 set -ex
 
 export PATH=/c/msys64/mingw64/bin:/c/msys64/usr/bin:/c/Go/bin:/c/gopath/go/bin:$PATH
@@ -20,6 +21,7 @@ cmake -DTHREADSAFE=ON \
       -DUSE_BUNDLED_ZLIB=ON \
       -DUSE_HTTPS=OFF \
       -DUSE_SSH=OFF \
+      -DCURL=OFF \
       -G "MSYS Makefiles" \
       .. &&
 

script/build-libgit2-linux.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -ex
+
+pushd ${PWD}
+
+cd ${GOPATH}/src/github.com/libgit2/git2go/vendor/libgit2 &&
+mkdir -p install/lib &&
+mkdir -p build &&
+cd build &&
+cmake -DTHREADSAFE=ON \
+      -DBUILD_CLAR=OFF \
+      -DBUILD_SHARED_LIBS=OFF \
+      -DCMAKE_C_FLAGS=-fPIC \
+      -DUSE_SSH=OFF \
+      -DCURL=OFF \
+      -DUSE_HTTPS=OFF \
+      -DUSE_BUNDLED_ZLIB=ON \
+      -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+      -DCMAKE_INSTALL_PREFIX=../install \
+      .. &&
+
+cmake --build .
+
+popd

script/build-libgit2-osx.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -ex
+
+pushd ${PWD}
+
+cd ${GOPATH}/src/github.com/libgit2/git2go/vendor/libgit2 &&
+mkdir -p install/lib &&
+mkdir -p build &&
+cd build &&
+cmake -DTHREADSAFE=ON \
+      -DBUILD_CLAR=OFF \
+      -DBUILD_SHARED_LIBS=OFF \
+      -DCMAKE_C_FLAGS=-fPIC \
+      -DUSE_SSH=OFF \
+      -DCURL=OFF \
+      -DUSE_HTTPS=OFF \
+      -DUSE_BUNDLED_ZLIB=ON \
+      -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+      -DCMAKE_INSTALL_PREFIX=../install \
+      .. &&
+
+cmake --build .
+
+popd

script/git2go-init.sh

@@ -1,12 +1,14 @@
-#!/bin/sh
+#!/bin/bash
+
 set -ex
 
+pushd ${PWD}
+
 COMMIT_HASH=v27
 PROJPATH="$GOPATH/src/github.com/libgit2/git2go"
 [ ! -f "$GOPATH/src/github.com/libgit2/git2go/.git/config" ] && git clone https://github.com/libgit2/git2go.git $PROJPATH
 cd $PROJPATH
 git checkout -qf $COMMIT_HASH
 git submodule update --init
-# sed -i -- 's/ZLIB_FOUND/FALSE/g' $PROJPATH/vendor/libgit2/CMakeLists.txt
-# sed -i -- 's/OPENSSL_FOUND/FALSE/g' $PROJPATH/vendor/libgit2/CMakeLists.txt
-sed -i -- 's/USE_SSH.*"Link with libssh to enable SSH support".*ON/USE_SSH  "Link with libssh to enable SSH support"  OFF/g' $PROJPATH/vendor/libgit2/CMakeLists.txt
+
+popd