wip [ci skip]

Author: biojppm

.github/setenv.sh

@@ -53,7 +53,8 @@ function c4_show_info()
         *)
             ;;
     esac
-    set -x
+    pwd
+    ls -l
     git branch
     git rev-parse HEAD
     git tag || echo
@@ -151,6 +152,7 @@ function c4_run_target()  # does not run in parallel
     target=$2
     build_dir=`pwd`/build/$id
     export CTEST_OUTPUT_ON_FAILURE=1
+    export CTEST_PARALLEL_LEVEL=`_c4getnumcores`
     cmake --build $build_dir --config $BT --target $target -- $(_c4_generator_build_flags)
 }
 

ext/Makefile

@@ -24,12 +24,14 @@ c4core-check-sync: c4core-check-sync-src c4core-check-sync-dev
 c4core-check-list: c4core-check-list-src c4core-check-list-dev
 c4core-check-sync-src: c4core-clone
 	@echo "check c4core list src..."
+	@set -e ; \
 	for s in $(C4CORE_SRC); do \
 	  ( $(COLORDIFF) -u $(C4CORE_DIR_PROJ)/$$s $(C4CORE_DIR_SRC)/$$s ) ; \
 	done
 	@echo "check c4core sync src: PASS"
 c4core-check-sync-dev: c4core-clone
 	@echo "check c4core list dev..."
+	@set -e ; \
 	for s in $(C4CORE_DEV); do \
 	  ( $(COLORDIFF) -u $(C4CORE_DIR_PROJ)/$$s $(C4CORE_DIR_DEV)/$$s ) ; \
 	done
@@ -71,7 +73,7 @@ $(C4CORE_DIR_GIT):
 c4core-clone: $(C4CORE_DIR_GIT) c4core-clone-check
 c4core-check-clone: c4core-clone-check
 c4core-clone-check: $(C4CORE_DIR_GIT)
-	@ \
+	@set -e ; \
 	currsha=$$(git -C $(C4CORE_DIR_GIT) rev-parse HEAD) ; \
 	currtag=$$(git -C $(C4CORE_DIR_GIT) tag --points-at HEAD || echo -n) ; \
 	echo "c4core sha: $$currsha" ; \

ext/c4core.mk

@@ -2,4 +2,4 @@
 
 C4CORE_REPO := https://github.com/biojppm/c4core
 # must be tag or a FULL commit hash; cannot be a branch name.
-C4CORE_TAG := v0.2.10
+C4CORE_TAG := 897cf0a4961cddc2feacb76559534cc257259a42

ext/c4core.src/c4/substr_fwd.hpp

@@ -6,9 +6,9 @@
 namespace c4 {
 
 #ifndef DOXYGEN
-template<class C> struct basic_substring;
-using csubstr = C4CORE_EXPORT basic_substring<const char>;
-using substr = C4CORE_EXPORT basic_substring<char>;
+template<class C> C4CORE_EXPORT struct basic_substring;
+using csubstr = basic_substring<const char>;
+using substr = basic_substring<char>;
 template<class T> struct is_string;
 template<class T> struct is_writeable_string;
 #endif // !DOXYGEN

test/test_install/CMakeLists.txt

@@ -3,8 +3,8 @@ project(ryml
     DESCRIPTION "Test project for an installed ryml"
     HOMEPAGE_URL "https://github.com/biojppm/rapidyaml"
     LANGUAGES CXX)
-include(../../ext/c4core/cmake/c4Project.cmake)
-c4_project(VERSION 0.11.1
+include(../../proj/c4proj/c4Project.cmake)
+c4_project(VERSION 0.11.0
     AUTHOR "Joao Paulo Magalhaes <dev@jpmag.me>")
 
 

test/test_singleheader/CMakeLists.txt

@@ -3,8 +3,8 @@ project(ryml
     DESCRIPTION "Single header version of ryml library for testing"
     HOMEPAGE_URL "https://github.com/biojppm/rapidyaml"
     LANGUAGES CXX)
-include(../../ext/c4core/cmake/c4Project.cmake)
-c4_project(VERSION 0.11.1
+include(../../proj/c4proj/c4Project.cmake)
+c4_project(VERSION 0.11.0
     AUTHOR "Joao Paulo Magalhaes <dev@jpmag.me>")
 
 # amalgamate ryml to get the single header