Log error when cannot read properties.
This commit is contained in:
@@ -22,12 +22,10 @@ import com.intellij.openapi.vfs.VirtualFile
|
|||||||
import com.intellij.util.Processor
|
import com.intellij.util.Processor
|
||||||
|
|
||||||
import java.io.*
|
import java.io.*
|
||||||
import java.util.Enumeration
|
|
||||||
import java.util.Properties
|
import java.util.Properties
|
||||||
import java.util.jar.Attributes
|
import java.util.jar.Attributes
|
||||||
import java.util.jar.JarFile
|
import java.util.jar.JarFile
|
||||||
import java.util.jar.Manifest
|
import java.util.jar.Manifest
|
||||||
import java.util.zip.ZipEntry
|
|
||||||
import java.util.zip.ZipFile
|
import java.util.zip.ZipFile
|
||||||
import kotlin.platform.platformStatic
|
import kotlin.platform.platformStatic
|
||||||
|
|
||||||
@@ -52,8 +50,8 @@ public object LibraryUtils {
|
|||||||
try {
|
try {
|
||||||
val properties = Properties()
|
val properties = Properties()
|
||||||
properties.load(manifestProperties)
|
properties.load(manifestProperties)
|
||||||
jsStdLib = properties.getProperty("manifest.impl.title.kotlin.javascript.stdlib")
|
jsStdLib = properties.getPropertyOrFail("manifest.impl.title.kotlin.javascript.stdlib")
|
||||||
jsLib = properties.getProperty("manifest.spec.title.kotlin.javascript.lib")
|
jsLib = properties.getPropertyOrFail("manifest.spec.title.kotlin.javascript.lib")
|
||||||
}
|
}
|
||||||
catch (e: IOException) {
|
catch (e: IOException) {
|
||||||
LOG.error(e)
|
LOG.error(e)
|
||||||
@@ -227,4 +225,16 @@ public object LibraryUtils {
|
|||||||
val value = attributes?.getValue(attributeName)
|
val value = attributes?.getValue(attributeName)
|
||||||
return value != null && value == expected
|
return value != null && value == expected
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun Properties.getPropertyOrFail(propName: String): String {
|
||||||
|
val value = getProperty(propName)
|
||||||
|
|
||||||
|
if (value == null) {
|
||||||
|
val bytes = ByteArrayOutputStream()
|
||||||
|
list(PrintStream(bytes))
|
||||||
|
LOG.error("$propName not found.\n $bytes")
|
||||||
|
}
|
||||||
|
|
||||||
|
return value
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user