[platform] migrating app directories on macOS; part 2 (IDEA-230993)

GitOrigin-RevId: 47120488aa4c1620f37f371623853509a092db73
This commit is contained in:
Roman Shevchenko
2020-01-20 22:32:22 +01:00
committed by intellij-monorepo-bot
parent bea31565e0
commit 4ca86428be
3 changed files with 4 additions and 3 deletions

View File

@@ -334,7 +334,7 @@ NSString *getPropertiesFilePath() {
NSString *getPreferencesFolderPath() {
return [NSString stringWithFormat:@"%@/Library/Preferences/%@", NSHomeDirectory(), getSelector()];
return [NSString stringWithFormat:@"%@/Library/Application Support/%@/%@", NSHomeDirectory(), getJVMProperty(@"idea.vendor.name"), getSelector()];
}
// NSString *getDefaultVMOptionsFilePath() {

View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.intellij.build.impl
import com.intellij.util.SystemProperties
@@ -154,8 +154,9 @@ class MacDistributionBuilder extends OsSpecificDistributionBuilder {
//todo[nik] don't mix properties for idea.properties file with properties for Info.plist
Map<String, String> properties = readIdeaProperties(ideaPropertiesFile, customIdeaProperties)
properties["idea.vendor.name"] = buildContext.applicationInfo.shortCompanyName
def coreKeys = ["idea.platform.prefix", "idea.paths.selector", "idea.executable"]
def coreKeys = ["idea.platform.prefix", "idea.paths.selector", "idea.executable", "idea.vendor.name"]
String coreProperties = submapToXml(properties, coreKeys)