diff --git a/.gitignore b/.gitignore index ea9ee2e52a1..e64da9ed6d5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ .idea/shelf /dependencies/all dist -kotlin-native-*.tgz +kotlin-native-*.tar.gz translator/src/test/kotlin/tests/*/linked out tmp @@ -44,9 +44,3 @@ proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc # translator auto generated artifacts kotstd/ll - -# directory for manual debug runs -run-debug/** -!run-debug/interop -!run-debug/konanc - diff --git a/build.gradle b/build.gradle index c82ef3f84b6..5f9730e5ee0 100644 --- a/build.gradle +++ b/build.gradle @@ -277,19 +277,18 @@ task cross_dist { task bundle(type: Tar) { dependsOn('cross_dist') + baseName = "kotlin-native-${simpleOsName()}-${project.konanVersion}" from("$project.rootDir/dist") { include '**' exclude 'dependencies' - into 'kotlin-native' + into baseName } from(project.rootDir) { include 'samples/**' - into 'kotlin-native' + into baseName } - baseName = 'kotlin-native' - appendix = simpleOsName() destinationDir = file('.') - extension = 'tgz' + extension = 'tar.gz' compression = Compression.GZIP } diff --git a/gradle.properties b/gradle.properties index fadd2b4537e..077fcee808b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,3 +22,4 @@ remoteRoot=konan_tests # Download artifacts of https://teamcity.jetbrains.com/viewType.html?buildTypeId=bt345 testDataVersion=1009012:id kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20170310.145051-441 +konanVersion=0.1 \ No newline at end of file