Commit a2c225c6 authored by Paal Kvamme's avatar Paal Kvamme
Browse files

Merge branch 'kvamme62/misc-devops' into 'master'

Sync with in-house changes

See merge request !94
parents 19464797 ab7df838
Pipeline #61627 passed with stage
in 21 seconds
......@@ -9,6 +9,15 @@ test-venv
# The singe-click-build assumes the SDAPI source code is cloned inside
# the OpenZGY source but not using submodules. Because it is optional
# and less tightly coupled to OpenZGY than a submodule would expect.
# The SDAPI source needs to be explicitly hidden from git.
# The same applies to the binary repo when used.
# These really shouldn't be in the source area.
......@@ -22,9 +31,6 @@ typescript
# Not checked in because I want to avoid bloat in git.
# This is sort-of a submodule but not using git's submodule mechanism.
# Dependencies that this project has ought to have been
# checked in, but large binaries and git don't mix.
# Also, zfp is now built locally. So it ought to have
......@@ -38,7 +38,7 @@ export AZURE_BUILDID ?= dev0
# (centos, ubuntu) about the environment. This only works
# as long as no two distros use the exact same compiler.
GCCVERSION := $(shell ($(CXX) -dumpfullversion 2>/dev/null || $(CXX) -dumpversion) | sed -e 's;[0-9][0-9][0-9]*;9;g' -e 's;\.;;g')
GCCVERSION := $(shell ($(CXX) -dumpfullversion 2>/dev/null || $(CXX) -dumpversion) | sed -e 's;\.[0-9][0-9][0-9]*;.9;g' -e 's;\.;;g')
MYGCCVERS := $(shell echo $(GCCVERSION) | sed -e 's;[0-9]$$;;')
export PLATFORM := Lin64_gcc$(GCCVERSION)
......@@ -145,7 +145,7 @@ tar zcf ../sdapi_linux64.tar.gz -C tmp version.txt include lib
set +e
GCCVERSION=$(g++ -dumpversion 2>/dev/null)
expr x"$GCCVERSION" : '.*\.' >/dev/null || GCCVERSION=$(g++ -dumpfullversion 2>/dev/null)
PLATFORM=Lin64_gcc$(echo "$GCCVERSION" | sed -e 's;[0-9][0-9][0-9]*;9;g' -e 's;\.;;g')
PLATFORM=Lin64_gcc$(echo "$GCCVERSION" | sed -e 's;\.[0-9][0-9][0-9]*;.9;g' -e 's;\.;;g')
test ${PLATFORM} != Lin64_gcc492 || PLATFORM=Lin64_gcc485
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment