Move C to c_components, resume use of pkg-config fork

Author: lilith

Cargo.lock

@@ -1,2 +1,5 @@
 [workspace]
 members = ["imageflow_serde", "imageflow_core", "imageflow_cdylib", "imageflow_tool", "imageflow_server"]
+
+[replace]
+"pkg-config:0.3.8" = { git = "https://github.com/imazen/pkg-config-rs", branch="master"}

Cargo.toml

@@ -38,6 +38,7 @@ test_script:
   - rustc -V
   - cargo -V
   - nasm -v
+  - cd c_components
   - mkdir build
   - cd build
   - if "%PLATFORM%"=="x86" set CONAN_ARCH=x86
@@ -47,6 +48,7 @@ test_script:
   - conan build ../
   - cd ..
   - conan export imazen/testing
+  - cd ..
   - cd imageflow_core
   - conan install --build missing -s build_type=Release -s arch=%CONAN_ARCH%
   - cargo test

appveyor.yml

@@ -117,49 +117,53 @@ BUILD_VARS=(
 
 echo "build.sh sees these relevant variables: ${BUILD_VARS[*]}"
 
-[[ -d build ]] || mkdir build
+( 
+	cd c_components
+	[[ -d build ]] || mkdir build
 
-echo "================================== C/C++ =========================== [build.sh]"
+	echo "================================== C/C++ =========================== [build.sh]"
 
-if [[ "$TEST_C" == 'True' ]]; then
-	echo "Testing C/C++ components of Imageflow "
-	echo "(and fetching and compiling dependencies)"
-	echo 
-	echo
+	if [[ "$TEST_C" == 'True' ]]; then
+		echo "Testing C/C++ components of Imageflow "
+		echo "(and fetching and compiling dependencies)"
+		echo 
+		echo
 
-	(
-		cd build
-		eval "$COPY_VALGRINDRC"
-		conan install --scope build_tests=True --scope "debug_build=${TEST_C_DEBUG_BUILD:-False}" --scope "coverage=${COVERAGE:-False}" --scope "skip_test_run=${VALGRIND:-False}" --build missing -u ../
-		conan build ../
-		if [[ "$VALGRIND" == 'True' ]]; then
-			#Sync to build/CTestTestfile.cmake
-			$VALGRIND_COMMAND ./bin/test_imageflow
-			$VALGRIND_COMMAND ./bin/test_variations
-			$VALGRIND_COMMAND ./bin/test_fastscaling
-			#echo "This next test is slow; it's a quickcheck running under valgrind"
-			#$VALGRIND_COMMAND ./bin/test_theft_render
-		fi 
-	)
-	if [[ "$COVERAGE" == 'True' ]]; then
+		(
+			cd build
+			eval "$COPY_VALGRINDRC"
+			conan install --scope build_tests=True --scope "debug_build=${TEST_C_DEBUG_BUILD:-False}" --scope "coverage=${COVERAGE:-False}" --scope "skip_test_run=${VALGRIND:-False}" --build missing -u ../
+			conan build ../
+			if [[ "$VALGRIND" == 'True' ]]; then
+				#Sync to build/CTestTestfile.cmake
+				$VALGRIND_COMMAND ./bin/test_imageflow
+				$VALGRIND_COMMAND ./bin/test_variations
+				$VALGRIND_COMMAND ./bin/test_fastscaling
+				#echo "This next test is slow; it's a quickcheck running under valgrind"
+				#$VALGRIND_COMMAND ./bin/test_theft_render
+			fi 
+		)
+		if [[ "$COVERAGE" == 'True' ]]; then
 
-		echo "==================================================================== [build.sh]"
-		echo "Process coverage information with lcov"
-		lcov -q --directory ./build --capture --output-file coverage.info
-		lcov -q --remove coverage.info 'tests/*' '.conan/*' '/usr/*' --output-file coverage.info
+			echo "==================================================================== [build.sh]"
+			echo "Process coverage information with lcov"
+			lcov -q --directory ./build --capture --output-file coverage.info
+			lcov -q --remove coverage.info 'tests/*' '.conan/*' '/usr/*' --output-file coverage.info
+		fi
 	fi
-fi
 
-echo "==================================================================== [build.sh]"
-echo "Build C/C++ parts of Imageflow & dependencies as needed"
-echo 
-if [[ "$REBUILD_C" == 'True' ]]; then
-  conan remove imageflow/* -f
-fi
-conan export imazen/testing
-(
-	cd imageflow_core
-	conan install --build missing
+
+	echo "==================================================================== [build.sh]"
+	echo "Build C/C++ parts of Imageflow & dependencies as needed"
+	echo 
+	if [[ "$REBUILD_C" == 'True' ]]; then
+	  conan remove imageflow/* -f
+	fi
+	conan export imazen/testing
+	(
+		cd ../imageflow_core
+		conan install --build missing
+	)
 )
 
 echo 

build.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-rm ./{imageflow_core,imageflow_server,imageflow_tool}/*.{dot,dot.png}
+rm ./{c_components,imageflow_core,imageflow_server,imageflow_tool}/*.{dot,dot.png}

.clion.codestyle.xml renamed to c_components/.clion.codestyle.xml

@@ -5,10 +5,11 @@ set -x
 
 cd ..
 
+cd c_components
 conan remove imageflow/* -f
 conan export imazen/testing
 
-cd imageflow_core
+cd ../imageflow_core
 
 conan install --build missing # Will build imageflow package with your current settings
 cargo test

.idea/.name renamed to c_components/.idea/.name

@@ -3,6 +3,7 @@
 
 rm -rf artifacts
 rm -rf build
+rm -rf c_components/build
 rm -rf target
 rm libimageflow.so
 rm conaninfo.txt

.idea/encodings.xml renamed to c_components/.idea/encodings.xml

@@ -1,5 +1,6 @@
 cmd.exe /c "win_verify_tools.bat"
 
+cd c_components
 mkdir build
 cd build
 
@@ -8,6 +9,7 @@ set CONAN_ARCH=x86_64
 conan install --scope build_tests=True -o shared=True --build missing -s build_type=Release -s arch=%CONAN_ARCH%  -u ../
 conan build ../
 cd ..
+cd ..
 
 echo Clearing cached C component
 conan remove imageflow/* -f

.idea/modules.xml renamed to c_components/.idea/modules.xml

@@ -4,7 +4,9 @@ REM set CONAN_ARCH=x86
 set CONAN_ARCH=x86_64
 SET RUST_TARGET=x86_64-pc-windows-msvc
 
+cd c_components
 conan export imazen/testing
+cd ..
 cd imageflow_core
 conan install --build missing -s build_type=Release -s arch=%CONAN_ARCH%
 cargo test