From ff1c89b28803ed71bbae09939151a2cd25437189 Mon Sep 17 00:00:00 2001 From: Mikhail Golubev Date: Thu, 18 Jul 2019 13:02:02 +0300 Subject: [PATCH] PY-36884 Better indication of skeleton generation script steps I deliberately decided not to delete the created cache here, since normally it's going to be removed with the rest of sources where skeletons are built anyway, and it's likely to be useful for debugging if something goes wrong. GitOrigin-RevId: 992cb5fda7a5131a810b1cfed8b817e36c09d502 --- .../jetbrains/python/tools/BuildZippedSkeletons.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/python/tools/src/com/jetbrains/python/tools/BuildZippedSkeletons.kt b/python/tools/src/com/jetbrains/python/tools/BuildZippedSkeletons.kt index dc7891b9425d..8158fcdcd242 100644 --- a/python/tools/src/com/jetbrains/python/tools/BuildZippedSkeletons.kt +++ b/python/tools/src/com/jetbrains/python/tools/BuildZippedSkeletons.kt @@ -41,6 +41,10 @@ fun main(args: Array) { try { val root = System.getenv(PYCHARM_PYTHONS) + val workingDir = System.getProperty("user.dir") + + val cacheDir = File(workingDir, "cache") + println("Skeletons will share common cache at $cacheDir") for (python in File(root).listFiles()) { @@ -50,8 +54,7 @@ fun main(args: Array) { val sdk = PySdkTools.createTempSdk(VfsUtil.findFileByIoFile(File(executable), true)!!, SdkCreationType.SDK_PACKAGES_ONLY, null) - val skeletonsDir = File(System.getProperty("user.dir"), - "skeletons-${sdk.versionString!!.replace(" ", "_")}_" + Math.abs(sdk.homePath!!.hashCode())) + val skeletonsDir = File(workingDir, "skeletons-${sdk.versionString!!.replace(" ", "_")}_" + Math.abs(sdk.homePath!!.hashCode())) println("Generating skeletons in ${skeletonsDir.absolutePath}") @@ -61,7 +64,9 @@ fun main(args: Array) { refresher.regenerateSkeletons(SkeletonVersionChecker(SkeletonVersionChecker.PREGENERATED_VERSION)) - val dirPacked = File(skeletonsDir.parent, DefaultPregeneratedSkeletonsProvider.getPregeneratedSkeletonsName(sdk, refresher.generatorVersion, true, true)) + val artifactName = DefaultPregeneratedSkeletonsProvider.getPregeneratedSkeletonsName(sdk, refresher.generatorVersion, true, true) + val dirPacked = File(skeletonsDir.parent, artifactName!!) + println("Creating artifact $dirPacked") ZipOutputStream(FileOutputStream(dirPacked)).use { ZipUtil.addDirToZipRecursively(it, dirPacked, skeletonsDir, "", null, null) }