azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

samples, concurrent: Download dependencies before building

Browse Source
This commit is contained in:
Ilya Matveev
2017-08-28 15:37:26 +07:00
committed by ilmat192
parent f68380c2d2
commit 68d0c9987b
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/concurrent/build.gradle
-1
View File
@@ -14,7 +14,6 @@ konanArtifacts {
} }
task compileCpp(type: Exec) { task compileCpp(type: Exec) {
dependsOn 'genMessageChannelInteropStubs'
workingDir project.getProjectDir() workingDir project.getProjectDir()
commandLine './buildCpp.sh' commandLine './buildCpp.sh'
} }
samples/concurrent/build.sh
+1 -1
View File
@@ -24,7 +24,7 @@ $DIR/buildCpp.sh
cinterop -def $DIR/src/main/c_interop/MessageChannel.def -copt "-I$DIR/src/main/cpp" -target $TARGET \ cinterop -def $DIR/src/main/c_interop/MessageChannel.def -copt "-I$DIR/src/main/cpp" -target $TARGET \
-o $DIR/build/c_interop/MessageChannel || exit 1 -o $DIR/build/c_interop/MessageChannel || exit 1
konanc $DIR/src/main/kotlin/Concurrent.kt -library $DIR/build/c_interop/MessageChannel \ konanc $DIR/src/main/kotlin/Concurrent.kt -target $TARGET -library $DIR/build/c_interop/MessageChannel \
-nativelibrary $DIR/build/clang/MessageChannel.bc -o $DIR/build/bin/Concurrent || exit 1 -nativelibrary $DIR/build/clang/MessageChannel.bc -o $DIR/build/bin/Concurrent || exit 1
echo "Artifact path is $DIR/build/bin/Concurrent.kexe" echo "Artifact path is $DIR/build/bin/Concurrent.kexe"
samples/concurrent/buildCpp.sh
+3
View File
@@ -12,6 +12,9 @@ case "$OSTYPE" in
esac esac
fi fi
# Ensure that C compiler for the target is available.
konanc --check_dependencies -target $TARGET || exit 1
CLANG_linux=$DEPS/clang-llvm-3.9.0-linux-x86-64/bin/clang++ CLANG_linux=$DEPS/clang-llvm-3.9.0-linux-x86-64/bin/clang++
CLANG_macbook=$DEPS/clang-llvm-3.9.0-darwin-macos/bin/clang++ CLANG_macbook=$DEPS/clang-llvm-3.9.0-darwin-macos/bin/clang++