MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

build scripts cleanup: removed unnecessary semicolons and unused code

Browse Source
This commit is contained in:
nik
2017-04-27 11:10:44 +03:00
parent 73bc66d84d
commit db4567a0cc
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.groovy
+4 -5
View File
@@ -149,12 +149,12 @@ class MacDistributionBuilder extends OsSpecificDistributionBuilder {
def coreKeys = ["idea.platform.prefix", "idea.paths.selector", "idea.executable"]
String coreProperties = submapToXml(properties, coreKeys);
String coreProperties = submapToXml(properties, coreKeys)
StringBuilder effectiveProperties = new StringBuilder()
properties.each { k, v ->
if (!coreKeys.contains(k)) {
effectiveProperties.append("$k=$v\n");
effectiveProperties.append("$k=$v\n")
}
}
@@ -198,7 +198,7 @@ class MacDistributionBuilder extends OsSpecificDistributionBuilder {
</array>
"""
}
String bundledHelpAttributes;
String bundledHelpAttributes
if (helpId != null) {
bundledHelpAttributes = """
<key>CFBundleHelpBookName</key>
@@ -232,7 +232,6 @@ class MacDistributionBuilder extends OsSpecificDistributionBuilder {
replacefilter(token: "@@url_schemes@@", value: urlSchemesString)
replacefilter(token: "@@archs@@", value: archsString)
replacefilter(token: "@@min_osx@@", value: macCustomizer.minOSXVersion)
replacefilter(token: "@@min_osx@@", value: macCustomizer.minOSXVersion)
replacefilter(token: "@@bundled_help_attributes@@", value: bundledHelpAttributes)
}
@@ -341,7 +340,7 @@ class MacDistributionBuilder extends OsSpecificDistributionBuilder {
private Map<String, String> readIdeaProperties(File propertiesFile, Map<String, String> customProperties = [:]) {
Map<String, String> ideaProperties = [:]
propertiesFile.withReader {
Properties loadedProperties = new Properties();
Properties loadedProperties = new Properties()
loadedProperties.load(it)
ideaProperties.putAll(loadedProperties as Map<String, String>)
}
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy
+2 -2
View File
@@ -211,7 +211,7 @@ class MacDmgBuilder {
by the main Ant classloader as well and fail because 'commons-net-*.jar' isn't included to Ant classpath.
Probably we could call FTPClient directly to avoid this hack.
*/
def ftpTaskLoaderRef = "FTP_TASK_CLASS_LOADER";
def ftpTaskLoaderRef = "FTP_TASK_CLASS_LOADER"
Path ftpPath = new Path(ant.project)
ftpPath.createPathElement().setLocation(new File("$communityLib/commons-net-3.3.jar"))
ftpPath.createPathElement().setLocation(new File("$communityLib/ant/lib/ant-commons-net.jar"))
@@ -219,7 +219,7 @@ class MacDmgBuilder {
["FTP", "FTPTaskConfig"] as String[]))
ant.taskdef(name: "ftp", classname: "org.apache.tools.ant.taskdefs.optional.net.FTP", loaderRef: ftpTaskLoaderRef)
def sshTaskLoaderRef = "SSH_TASK_CLASS_LOADER";
def sshTaskLoaderRef = "SSH_TASK_CLASS_LOADER"
Path pathSsh = new Path(ant.project)
pathSsh.createPathElement().setLocation(new File("$communityLib/jsch-0.1.54.jar"))
pathSsh.createPathElement().setLocation(new File("$communityLib/ant/lib/ant-jsch.jar"))