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

gradle-plugin: Update compiler downloading path

Browse Source
This commit is contained in:
Ilya Matveev
2017-11-08 20:07:05 +03:00
committed by ilmat192
parent d745e80135
commit 8d8da0acf2
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanCompilerDownloadTask.kt
+13 -13
View File
@@ -28,18 +28,14 @@ import java.io.IOException
open class KonanCompilerDownloadTask : DefaultTask() { open class KonanCompilerDownloadTask : DefaultTask() {
internal companion object { internal companion object {
internal const val DOWNLOAD_URL = "https://download.jetbrains.com/kotlin/native" internal const val BASE_DOWNLOAD_URL = "https://download.jetbrains.com/kotlin/native/builds"
internal val KONAN_PARENT_DIR = "${System.getProperty("user.home")}/.konan" internal val KONAN_PARENT_DIR = "${System.getProperty("user.home")}/.konan"
} }
/** /**
* A list of tasks used to download dependencies. If empty then dependencies will be downloaded for the host. * If true the task will also download dependencies for targets specified by the konan.targets project extension.
* Isn't used if [downloadDependencies] is false.
*/ */
@Internal var targets: MutableCollection<String> = mutableSetOf<String>()
/** If true the task will also download dependencies for targets specified by [targets] property. */
@Internal var downloadDependencies: Boolean = false @Internal var downloadDependencies: Boolean = false
@TaskAction @TaskAction
@@ -55,9 +51,16 @@ open class KonanCompilerDownloadTask : DefaultTask() {
} }
} else { } else {
try { try {
val downloadUrlDirectory = buildString {
append("$BASE_DOWNLOAD_URL/")
val version = project.konanVersion
append(if (version.contains("dev")) "dev/" else "releases/")
append("$version/")
append(project.simpleOsName)
}
val konanCompiler = project.konanCompilerName() val konanCompiler = project.konanCompilerName()
logger.info("Downloading Kotlin/Native compiler from ${DOWNLOAD_URL}/$konanCompiler into ${KONAN_PARENT_DIR}") logger.info("Downloading Kotlin/Native compiler from $downloadUrlDirectory/$konanCompiler into $KONAN_PARENT_DIR")
DependencyProcessor(File(KONAN_PARENT_DIR), DOWNLOAD_URL, listOf(konanCompiler)).run() DependencyProcessor(File(KONAN_PARENT_DIR), downloadUrlDirectory, listOf(konanCompiler)).run()
} catch (e: IOException) { } catch (e: IOException) {
throw GradleScriptException("Cannot download Kotlin/Native compiler", e) throw GradleScriptException("Cannot download Kotlin/Native compiler", e)
} }
@@ -66,11 +69,8 @@ open class KonanCompilerDownloadTask : DefaultTask() {
// Download dependencies if a user said so. // Download dependencies if a user said so.
if (downloadDependencies) { if (downloadDependencies) {
val runner = KonanCompilerRunner(project) val runner = KonanCompilerRunner(project)
if (targets.isEmpty()) { project.konanExtension.konanTargets.forEach {
// Download for the host. runner.run("--check_dependencies", "-target", it.userName)
runner.run("--check_dependencies")
} else {
targets.forEach { runner.run("--check_dependencies", "-target", it) }
} }
} }
} }
tools/publish-release.sh
+3 -2
View File
@@ -107,8 +107,9 @@ if [ "$UPLOAD" == "true" ]; then
./gradlew build --refresh-dependencies ./gradlew build --refresh-dependencies
# 6. Upload the bundle to the CDN # 6. Upload the bundle to the CDN
stage "Uploading the bundle to CDN: $BUNDLE_TAR -> ftp://uploadcds.labs.intellij.net/kotlin/native/" stage "Uploading the bundle to CDN: $BUNDLE_TAR -> ftp://uploadcds.labs.intellij.net/builds/releases/$VERSION/$OS"
curl --upload-file "$BUNDLE_TAR" "ftp://$CDN_USER:$CDN_PASS@uploadcds.labs.intellij.net/kotlin/native/" curl --upload-file "$BUNDLE_TAR" "ftp://$CDN_USER:$CDN_PASS@uploadcds.labs.intellij.net/builds/releases/$VERSION/$OS"
echo "Available at https://download.jetbrains.com/kotlin/native/builds/releases/$VERSION/$OS/$BUNDLE_TAR"
echo "Wait ${WAIT_TIME} seconds to ensure that the bundle can be downloaded." echo "Wait ${WAIT_TIME} seconds to ensure that the bundle can be downloaded."
sleep ${WAIT_TIME} sleep ${WAIT_TIME}