From 5c05891ba70963023c12331c13b0ac9a9f73a151 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Wed, 15 Nov 2017 19:07:09 +0700 Subject: [PATCH] samples: Use headerFilterAdditionalSearchPrefixes interop option --- samples/gitchurn/build.gradle | 9 +++++---- samples/gitchurn/build.sh | 18 ++++++++---------- .../gitchurn/src/main/c_interop/libgit2.def | 2 +- samples/libcurl/build.gradle | 4 ++-- samples/libcurl/build.sh | 16 ++++++++-------- samples/videoplayer/build.gradle | 4 ++-- 6 files changed, 26 insertions(+), 27 deletions(-) diff --git a/samples/gitchurn/build.gradle b/samples/gitchurn/build.gradle index fb04f4b815c..bcd4722a043 100644 --- a/samples/gitchurn/build.gradle +++ b/samples/gitchurn/build.gradle @@ -4,11 +4,12 @@ konan.targets = ['macbook', 'linux'] konanArtifacts { interop('libgit2') { - target('linux') { - includeDirs '/usr/include' - } + target('linux') { + headerFilterAdditionalSearchPrefix '/usr/include' + } + target('macbook') { - includeDirs '/opt/local/include', '/usr/local/include' + headerFilterAdditionalSearchPrefixes '/opt/local/include', '/usr/local/include' } } diff --git a/samples/gitchurn/build.sh b/samples/gitchurn/build.sh index 58fdd565071..20d81bea982 100755 --- a/samples/gitchurn/build.sh +++ b/samples/gitchurn/build.sh @@ -4,8 +4,9 @@ DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd ) source "$DIR/../konan.sh" -CFLAGS_macbook="-I/opt/local/include -I/usr/local/include" -CFLAGS_linux=-I/usr/include +INTEROP_ARGS_macbook="-headerFilterAdditionalSearchPrefix /usr/local/include \ + -headerFilterAdditionalSearchPrefix /opt/local/include" +INTEROP_ARGS_linux="-headerFilterAdditionalSearchPrefix /usr/include" if [ x$TARGET == x ]; then case "$OSTYPE" in @@ -15,20 +16,17 @@ case "$OSTYPE" in esac fi -var=CFLAGS_${TARGET} -CFLAGS=${!var} -var=LINKER_ARGS_${TARGET} -LINKER_ARGS=${!var} -var=COMPILER_ARGS_${TARGET} -COMPILER_ARGS=${!var} # add -opt for an optimized build. +var=INTEROP_ARGS_${TARGET} +INTEROP_ARGS=${!var} +COMPILER_ARGS= # add -opt for an optimized build. mkdir -p $DIR/build/c_interop/ mkdir -p $DIR/build/bin/ -cinterop -compilerOpts "$CFLAGS" -def $DIR/src/main/c_interop/libgit2.def -target $TARGET \ +cinterop $INTEROP_ARGS -def $DIR/src/main/c_interop/libgit2.def -target $TARGET \ -o $DIR/build/c_interop/libgit2 || exit 1 -konanc -target $TARGET $DIR/src/main/kotlin -library $DIR/build/c_interop/libgit2 \ +konanc $COMPILER_ARGS -target $TARGET $DIR/src/main/kotlin -library $DIR/build/c_interop/libgit2 \ -o $DIR/build/bin/GitChurn || exit 1 echo "Artifact path is $DIR/build/bin/GitChurn.kexe" diff --git a/samples/gitchurn/src/main/c_interop/libgit2.def b/samples/gitchurn/src/main/c_interop/libgit2.def index 6c3e229b774..c8b7558d6b3 100644 --- a/samples/gitchurn/src/main/c_interop/libgit2.def +++ b/samples/gitchurn/src/main/c_interop/libgit2.def @@ -1,4 +1,4 @@ headers = git2.h linkerOpts.osx = -L/opt/local/lib -L/usr/local/lib -lgit2 linkerOpts.linux = -L/usr/lib/x86_64-linux-gnu -lgit2 -headerFilter = git2/** +headerFilter = git2/** git2.h diff --git a/samples/libcurl/build.gradle b/samples/libcurl/build.gradle index 6ce0cdbaef6..ce35f8ad931 100644 --- a/samples/libcurl/build.gradle +++ b/samples/libcurl/build.gradle @@ -5,10 +5,10 @@ konan.targets = ['macbook', 'linux'] konanArtifacts { interop('libcurl') { target('linux') { - includeDirs '/usr/include' + headerFilterAdditionalSearchPrefixes '/usr/include' } target('macbook') { - includeDirs '/opt/local/include', '/usr/local/include' + headerFilterAdditionalSearchPrefixes '/opt/local/include', '/usr/local/include' } } diff --git a/samples/libcurl/build.sh b/samples/libcurl/build.sh index e86fcf50210..759d70b23d8 100755 --- a/samples/libcurl/build.sh +++ b/samples/libcurl/build.sh @@ -4,8 +4,9 @@ DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd ) source "$DIR/../konan.sh" -CFLAGS_macbook=-I/opt/local/include -CFLAGS_linux="-I /usr/include -I /usr/include/x86_64-linux-gnu" +INTEROP_ARGS_macbook="-headerFilterAdditionalSearchPrefix /opt/local/include" +INTEROP_ARGS_linux="-headerFilterAdditionalSearchPrefix /usr/include \ + -headerFilterAdditionalSearchPrefix /usr/include/x86_64-linux-gnu" if [ x$TARGET == x ]; then case "$OSTYPE" in @@ -15,18 +16,17 @@ case "$OSTYPE" in esac fi -var=CFLAGS_${TARGET} -CFLAGS=${!var} -var=COMPILER_ARGS_${TARGET} -COMPILER_ARGS=${!var} # add -opt for an optimized build. +var=INTEROP_ARGS_${TARGET} +INTEROP_ARGS=${!var} +COMPILER_ARGS= # add -opt for an optimized build. mkdir -p $DIR/build/c_interop/ mkdir -p $DIR/build/bin/ -cinterop -compilerOpts "$CFLAGS" -compilerOpts -I$DIR -def $DIR/src/main/c_interop/libcurl.def -target $TARGET \ +cinterop $INTEROP_ARGS -def $DIR/src/main/c_interop/libcurl.def -target $TARGET \ -o $DIR/build/c_interop/libcurl || exit 1 -konanc -target $TARGET $DIR/src/main/kotlin -library $DIR/build/c_interop/libcurl \ +konanc $COMPILER_ARGS -target $TARGET $DIR/src/main/kotlin -library $DIR/build/c_interop/libcurl \ -o $DIR/build/bin/Curl || exit 1 echo "Artifact path is $DIR/build/bin/Curl.kexe" diff --git a/samples/videoplayer/build.gradle b/samples/videoplayer/build.gradle index fd97c092937..32fae9097f9 100644 --- a/samples/videoplayer/build.gradle +++ b/samples/videoplayer/build.gradle @@ -7,11 +7,11 @@ konanArtifacts { defFile 'src/main/c_interop/ffmpeg.def' target 'linux', { - includeDirs '/usr/include', '/usr/include/x86_64-linux-gnu' + headerFilterAdditionalSearchPrefixes '/usr/include', '/usr/include/x86_64-linux-gnu' } target 'macbook', { - includeDirs '/opt/local/include', '/usr/local/include' + headerFilterAdditionalSearchPrefixes '/opt/local/include', '/usr/local/include' } target 'mingw', {