From 4bad84dc2d8a3d06588da4a015864009adc2c1d1 Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Tue, 12 Sep 2017 09:21:11 +0300 Subject: [PATCH] Fail if base dir isn't defined --- .../python/tools/BuildStubsForSdk.kt | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/python/tools/src/com/jetbrains/python/tools/BuildStubsForSdk.kt b/python/tools/src/com/jetbrains/python/tools/BuildStubsForSdk.kt index 6b2a4e316200..e793d9e08d7d 100644 --- a/python/tools/src/com/jetbrains/python/tools/BuildStubsForSdk.kt +++ b/python/tools/src/com/jetbrains/python/tools/BuildStubsForSdk.kt @@ -25,6 +25,7 @@ import com.jetbrains.python.psi.PyFileElementType import com.jetbrains.python.psi.impl.stubs.PyPrebuiltStubsProvider.PREBUILT_INDEXES_PATH_PROPERTY import com.jetbrains.python.psi.impl.stubs.PyPrebuiltStubsProvider.SDK_STUBS_STORAGE_NAME import junit.framework.TestCase +import org.junit.Assert import java.io.ByteArrayInputStream import java.io.File import java.util.* @@ -37,14 +38,25 @@ val stubsFileName = SDK_STUBS_STORAGE_NAME val MERGE_STUBS_FROM_PATHS = "MERGE_STUBS_FROM_PATHS" -val path: String? = System.getProperty(PREBUILT_INDEXES_PATH_PROPERTY) -val baseDir = if (path != null && File(path).exists()) { - path -} -else { - System.getProperty("user.dir") + +fun getBaseDirValue(): String? { + val path: String? = System.getProperty(PREBUILT_INDEXES_PATH_PROPERTY) + + if (path == null) { + Assert.fail("$PREBUILT_INDEXES_PATH_PROPERTY variable is not defined") + } + else + if (File(path).exists()) { + return path + } + else { + Assert.fail("Directory $path doesn't exist") + } + return null } +val baseDir = getBaseDirValue() + fun main(args: Array) { if (System.getenv().containsKey(MERGE_STUBS_FROM_PATHS)) { mergeStubs(System.getenv(MERGE_STUBS_FROM_PATHS).split(File.pathSeparatorChar)) @@ -173,9 +185,9 @@ fun buildStubs() { val root = System.getenv(PYCHARM_PYTHONS) for (python in File(root).listFiles()) { - indexSdkAndStoreSerializedStubs("${PathManager.getHomePath()}/python/testData/empty", - python.absolutePath, - "$baseDir/$stubsFileName") + indexSdkAndStoreSerializedStubs("${PathManager.getHomePath()}/python/testData/empty", + python.absolutePath, + "$baseDir/$stubsFileName") } } catch (e: Throwable) {