revert changes to config.yml + added missing files

.circleci/config.yml

@@ -250,6 +250,7 @@ jobs:
           command: |
             git submodule sync
             git submodule update --init --recursive
+            mkdir -p ~/skip/build
       - run:
           name: system status
           command: |
@@ -260,6 +261,8 @@ jobs:
             echo Versions
             echo $(which gcc) - $(gcc --version | head -1)
             echo $(which clang) - $(clang --version | head -1)
+            echo $(which cmake) - $(cmake --version | head -1)
+            echo $(which ninja) - $(ninja --version | head -1)
             echo $(which brew) - $(brew --version | head -1)
             echo
             echo Processor Count: $(sysctl -n hw.ncpu)
@@ -275,21 +278,24 @@ jobs:
       - run:
           name: install prerequisites
           command: |
-            for item in autoconf automake pkg-config libtool; do
+            for item in ninja cmake dwarfutils libelf boost gflags glog jemalloc autoconf automake pkg-config libtool; do
             brew info "${item}" | grep -q 'Not installed' && brew install "${item}"
             done
       - run:
           name: configure
           working_directory: ~/skip/build
-          command: |
-            ./build_submodules
-	    ./configure
+          command: | # Fix for broken hombrew cmake 1.15.3  Homebrew path for ICU.
+            cmake .. -DBoost_NO_BOOST_CMAKE=ON              -DICU_HINT=/usr/local/opt/icu4c
 
+      - run:
+          name: compile runtimes
+          working_directory: ~/skip/build
+          command: ninja skip_runtime.lkg.dep skip_runtime.src.dep skip_runtime.tests.dep
       - run:
           name: smoke test
           command: |
             ulimit -c 0
-            make -j 4
+            ninja -C build -k 0 mac_smoke_test
       - run:
           name: analyze test results
           when: always

build_submodules.sh

@@ -0,0 +1,90 @@
+#!/bin/bash
+
+echo "-------------------------------------------------------------------------------"
+echo "- BUILDING SUBMODULES FOR SKIP -"
+echo "-------------------------------------------------------------------------------"
+
+export TPDIR="$PWD/subbuild"
+mkdir -p $TPDIR
+
+rm -f Makefile.config
+touch Makefile.config
+
+echo "-------------------------------------------------------------------------------"
+echo "- Checking that the files are there -"
+echo "-------------------------------------------------------------------------------"
+
+if [ ! -f "third-party/jemalloc/src/README" ]; then
+    echo "ERROR: looks like the git submodules have not been checked out"
+    echo "Try running: git submodule update --init --recursive"
+    exit 2
+fi
+
+echo "-------------------------------------------------------------------------------"
+echo "- Building JEMALLOC -"
+echo "-------------------------------------------------------------------------------"
+
+(cd ./third-party/jemalloc/src && autoconf)
+(cd ./third-party/jemalloc/src && ./configure --prefix=$TPDIR --with-mangling)
+(cd ./third-party/jemalloc/src && make -j 16 build_lib_static)
+(cd ./third-party/jemalloc/src && make install_bin install_include install_lib)
+cat $TPDIR/include/jemalloc/jemalloc.h | grep -v "define je_posix_memalign posix_memalign" > $TPDIR/include/jemalloc/jemalloc_hack.h
+cp $TPDIR/include/jemalloc/jemalloc_hack.h $TPDIR/include/jemalloc/jemalloc.h
+
+echo "-------------------------------------------------------------------------------"
+echo "- Building ICU -"
+echo "-------------------------------------------------------------------------------"
+
+export ICUFLAGS="-DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1 -DU_USING_ICU_NAMESPACE=0 -DU_CHARSET_IS_UTF8=1"
+(cd third-party/icu/src/icu4c/source/ && \
+  CPPFLAGS="$ICUFLAGS" CFLAGS="$ICUFLAGS" ./runConfigureICU Linux --disable-shared --enable-static --disable-tests --disable-samples --prefix="$TPDIR")
+(cd third-party/icu/src/icu4c/source/ && make -j 16 && make install)
+(cd third-party/icu/src/icu4c/source/tools/escapesrc/ && rm -f *.o)
+
+echo "-------------------------------------------------------------------------------"
+echo "- Building PCRE -"
+echo "-------------------------------------------------------------------------------"
+
+# Unfortunately, we have to modify those files for the configuration step to succeed.
+# So we just make a copy and then, copy them back after we are done ...
+cp third-party/pcre/src/INSTALL third-party/pcre/src/INSTALL.back
+cp third-party/pcre/src/Makefile.in third-party/pcre/src/Makefile.in.back
+cp third-party/pcre/src/aclocal.m4 third-party/pcre/src/aclocal.m4.back
+cp third-party/pcre/src/ar-lib third-party/pcre/src/ar-lib.back
+cp third-party/pcre/src/compile third-party/pcre/src/compile.back
+cp third-party/pcre/src/config.guess third-party/pcre/src/config.guess.back
+cp third-party/pcre/src/config.sub third-party/pcre/src/config.sub.back
+cp third-party/pcre/src/configure third-party/pcre/src/configure.back
+cp third-party/pcre/src/depcomp third-party/pcre/src/depcomp.back
+cp third-party/pcre/src/install-sh third-party/pcre/src/install-sh.back
+cp third-party/pcre/src/ltmain.sh third-party/pcre/src/ltmain.sh.back
+cp third-party/pcre/src/m4/libtool.m4 third-party/pcre/src/m4/libtool.m4.back
+cp third-party/pcre/src/missing third-party/pcre/src/missing.back
+cp third-party/pcre/src/test-driver third-party/pcre/src/test-driver.back
+
+(cd third-party/pcre/src/ && autoreconf -f -i && ./configure --prefix="$TPDIR" --enable-static --disable-shared --enable-utf && make -j 16 && make install)
+
+
+cp third-party/pcre/src/INSTALL.back third-party/pcre/src/INSTALL
+cp third-party/pcre/src/Makefile.in.back third-party/pcre/src/Makefile.in
+cp third-party/pcre/src/aclocal.m4.back third-party/pcre/src/aclocal.m4
+cp third-party/pcre/src/ar-lib.back third-party/pcre/src/ar-lib
+cp third-party/pcre/src/compile.back third-party/pcre/src/compile
+cp third-party/pcre/src/config.guess.back third-party/pcre/src/config.guess
+cp third-party/pcre/src/config.sub.back third-party/pcre/src/config.sub
+cp third-party/pcre/src/configure.back third-party/pcre/src/configure
+cp third-party/pcre/src/depcomp.back third-party/pcre/src/depcomp
+cp third-party/pcre/src/install-sh.back third-party/pcre/src/install-sh
+cp third-party/pcre/src/ltmain.sh.back third-party/pcre/src/ltmain.sh
+cp third-party/pcre/src/m4/libtool.m4.back third-party/pcre/src/m4/libtool.m4
+cp third-party/pcre/src/missing.back third-party/pcre/src/missing
+cp third-party/pcre/src/test-driver.back third-party/pcre/src/test-driver
+
+
+if [ "$(uname)" != "Darwin" ]; then
+    echo "-------------------------------------------------------------------------------"
+    echo "- Building LIBUNWIND -"
+    echo "-------------------------------------------------------------------------------"
+
+    (cd third-party/libunwind && ./autogen.sh && ./configure --prefix="$TPDIR" --disable-minidebuginfo && make -j 16 && make install)
+fi

configure

@@ -0,0 +1,79 @@
+#!/bin/bash
+
+echo "-------------------------------------------------------------------------------"
+echo "- CONFIGURE BUILD FOR SKIP -"
+echo "-------------------------------------------------------------------------------"
+
+rm -f Makefile.config
+touch Makefile.config
+
+CLANG=`which clang`
+EXPVERSION=5
+
+if [ -f $CLANG ]; then
+    VERSION=`$CLANG --version | grep version | sed 's/[^0-9]*\([0-9]*\).*/\1/'`
+    if [ $((VERSION)) -lt $((EXPVERSION)) ]; then
+	echo "ERROR: clang compiler version is too old!"
+	echo "ERROR: SKIP needs at least version $EXPVERSION"
+	echo "ERROR: your version is $VERSION"
+	exit 2
+    fi
+    echo "clang compiler found: $CLANG"
+else
+    echo "ERROR: clang compiler not found"
+    exit 2
+fi
+
+CLANGXX=`which clang++`
+
+if [ -f $CLANGXX ]; then
+    VERSION=`$CLANGXX --version | grep version | sed 's/[^0-9]*\([0-9]*\).*/\1/'`
+    if [ $((VERSION)) -lt $((EXPVERSION)) ]; then
+	echo "ERROR: clang compiler version is too old!"
+	echo "ERROR: SKIP needs at least version $EXPVERSION"
+	echo "ERROR: your version is $VERSION"
+	exit 2
+    fi
+    echo "clang++ compiler found: $CLANGXX"
+else
+    echo "ERROR: clang++ compiler not found"
+    exit 2
+fi
+
+RANLIB=`which ranlib`
+
+if [ -f $RANLIB ]; then
+    echo "ranlib found: $RANLIB"
+else
+    echo "ERROR: ranlib not found"
+    exit 2
+fi
+
+AR=`which ar`
+
+if [ -f $AR ]; then
+    echo "ar found: $AR"
+else
+    echo "ERROR: ar not found"
+    exit 2
+fi
+
+echo "CC:=$CLANG" >> Makefile.config
+echo "CXX:=$CLANGXX" >> Makefile.config
+echo "CLANGXX:=$CLANGXX" >> Makefile.config
+echo "RANLIB:=$RANLIB" >> Makefile.config
+echo "AR:=$AR" >> Makefile.config
+
+if [ "$(uname)" == "Darwin" ]; then
+    echo "LIBUNWIND:=" >> Makefile.config
+else
+    echo "LIBUNWIND:=subbuild/lib/libunwind.a" >> Makefile.config
+fi
+
+echo "INCLUDEPATH:= -I$ICUDIR" >> Makefile.config
+
+if [ -z "$PREFIX" ]; then
+    echo "PREFIX:=/usr/local" >> Makefile.config
+else
+    echo "PREFIX:=$PREFIX"
+fi