Save trove4j as separate jar (#4168)

This commit is contained in:
LepilkinaElena
2020-05-13 10:33:30 +03:00
committed by GitHub
parent bbd19dd7e0
commit 0a3b42d649
3 changed files with 10 additions and 2 deletions
+6
View File
@@ -328,6 +328,8 @@ task shadowJar(type: ShadowJar) {
mergeServiceFiles()
destinationDirectory.set(file("$distDir/konan/lib"))
archiveBaseName.set("kotlin-native")
// Exclude trove4j because of license agreement.
exclude "*trove4j*"
configurations = [project.configurations.distPack]
archiveClassifier.set(null)
transform(CollisionTransformer.class) {
@@ -344,6 +346,10 @@ task distCompiler(type: Copy) {
into('konan/nativelib')
}
from(project(':backend.native').file('build/external_jars/trove4j.jar')) {
into('konan/lib')
}
from(project(':Interop').file('Indexer/build/nativelibs')) {
into('konan/nativelib')
}
+2 -1
View File
@@ -78,7 +78,8 @@ while IFS=$'\r' read -r line || [[ -n "$line" ]]; do
done < "${KONAN_HOME}/tools/env_blacklist"
KONAN_JAR="${KONAN_HOME}/konan/lib/kotlin-native.jar"
KONAN_CLASSPATH="$KONAN_JAR"
TROVE_JAR="${KONAN_HOME}/konan/lib/trove4j.jar"
KONAN_CLASSPATH="$KONAN_JAR:$TROVE_JAR"
TOOL_CLASS=org.jetbrains.kotlin.cli.utilities.MainKt
LIBCLANG_DISABLE_CRASH_RECOVERY=1 \
$TIMECMD "$JAVACMD" "${java_opts[@]}" "${java_args[@]}" -cp "$KONAN_CLASSPATH" "$TOOL_CLASS" "$TOOL_NAME" "${konan_args[@]}"
+2 -1
View File
@@ -55,8 +55,9 @@ set "NATIVE_LIB=%_KONAN_HOME%\konan\nativelib"
set "KONAN_LIB=%_KONAN_HOME%\konan\lib"
set "KONAN_JAR=%KONAN_LIB%\kotlin-native.jar"
set TROVE_JAR="%KONAN_LIB%\trove4j.jar"
set "KONAN_CLASSPATH=%KONAN_JAR%"
set "KONAN_CLASSPATH=%KONAN_JAR%;%TROVE_JAR%"
set JAVA_OPTS=-ea ^
-Xmx3G ^