Skip to content

Commit

Permalink
migrate the xmake configuration from project level to run-configurati…
Browse files Browse the repository at this point in the history 
…on level
  • Loading branch information
@windchargerj
windchargerj committed Aug 20, 2024
1 parent d99e2b9 commit f4773ea
Show file tree
Hide file tree
Showing 5 changed files with 221 additions and 127 deletions.
31 changes: 4 additions & 27 deletions src/main/kotlin/io/xmake/project/XMakeProjectConfigurable.kt
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,11 @@
package io.xmake.project

import com.intellij.execution.ExecutionBundle
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
import com.intellij.openapi.options.Configurable
import com.intellij.openapi.options.ConfigurationException
import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.LabeledComponent
import com.intellij.openapi.ui.TextFieldWithBrowseButton
import com.intellij.ui.*
import com.intellij.ui.components.JBCheckBox
import com.intellij.ui.components.JBTextField
import com.intellij.ui.dsl.builder.*
import com.intellij.util.ui.JBFont
import com.intellij.util.ui.JBUI
import com.intellij.util.ui.UIUtil
import io.xmake.shared.XMakeConfiguration
import io.xmake.shared.xmakeConfigurationOrNull
import java.awt.Dimension
import java.awt.event.ItemEvent
import java.awt.event.ItemListener
import java.awt.event.KeyEvent
import java.awt.event.KeyListener
import javax.swing.*
import javax.swing.event.ListDataEvent
import javax.swing.event.ListDataListener

@Deprecated("Migrate to Run Configuration Editor.")
class XMakeProjectConfigurable(
private val project: Project
) : Configurable, Configurable.NoScroll {
private val project: Project,
)/* : Configurable, Configurable.NoScroll {
private val platformsModel = DefaultComboBoxModel<String>()

// the architectures ui
Expand Down Expand Up @@ -290,4 +267,4 @@ class XMakeProjectConfigurable(
companion object {
private val Log = Logger.getInstance(XMakeProjectConfigurable::class.java.getName())
}
}
}*/
21 changes: 21 additions & 0 deletions src/main/kotlin/io/xmake/run/XMakeRunConfiguration.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@ class XMakeRunConfiguration(
@OptionTag(tag = "target")
var runTarget: String = "default"

@OptionTag(tag = "platform")
var runPlatform: String = SystemUtils.platform()

@OptionTag(tag = "architecture")
var runArchitecture: String = ""

@OptionTag(tag = "mode")
var runMode: String = "release"

// the run arguments
@OptionTag(tag = "arguments")
var runArguments: String = ""
Expand All @@ -43,6 +52,18 @@ class XMakeRunConfiguration(
@OptionTag(tag = "workingDirectory")
var runWorkingDir: String = ""

@OptionTag(tag = "buildDirectory")
var buildDirectory: String = ""

@OptionTag(tag = "androidNDKDirectory")
var androidNDKDirectory: String = ""

@OptionTag(tag = "enableVerbose")
var enableVerbose: Boolean = false

@OptionTag(tag = "additionalConfiguration")
var additionalConfiguration: String = ""

// the run command line
val runCommandLine: GeneralCommandLine
get() {
Expand Down
179 changes: 158 additions & 21 deletions src/main/kotlin/io/xmake/run/XMakeRunConfigurationEditor.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.xmake.run

import com.intellij.execution.configuration.EnvironmentVariablesComponent
import com.intellij.execution.configuration.EnvironmentVariablesTextFieldWithBrowseButton
import com.intellij.execution.wsl.WSLDistribution
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.options.SettingsEditor
Expand All @@ -9,14 +9,19 @@ import com.intellij.openapi.ui.ComboBox
import com.intellij.ssh.config.unified.SshConfig
import com.intellij.ui.PopupMenuListenerAdapter
import com.intellij.ui.RawCommandLineEditor
import com.intellij.ui.components.CheckBox
import com.intellij.ui.dsl.builder.AlignX
import com.intellij.ui.dsl.builder.AlignY
import com.intellij.ui.dsl.builder.RowLayout
import com.intellij.ui.dsl.builder.panel
import com.intellij.ui.layout.ComboBoxPredicate
import io.xmake.project.directory.ui.DirectoryBrowser
import io.xmake.project.target.TargetManager
import io.xmake.project.toolkit.Toolkit
import io.xmake.project.toolkit.ToolkitHostType.*
import io.xmake.project.toolkit.ui.ToolkitComboBox
import io.xmake.project.toolkit.ui.ToolkitListItem
import io.xmake.shared.xmakeConfiguration
import io.xmake.utils.execute.SyncDirection
import io.xmake.utils.execute.syncProjectBySftp
import io.xmake.utils.execute.syncProjectByWslSync
Expand All @@ -36,43 +41,99 @@ class XMakeRunConfigurationEditor(

private val scope = CoroutineScope(Dispatchers.Default)

private val toolkitComboBox = ToolkitComboBox(runConfiguration::runToolkit)
private var toolkit: Toolkit? = runConfiguration.runToolkit
private val toolkitComboBox = ToolkitComboBox(::toolkit)

// the targets ui
private val targetsModel = DefaultComboBoxModel<String>()
private val targetsComboBox = ComboBox(targetsModel)
private val targetsComboBox = ComboBox(targetsModel).apply { item = runConfiguration.runTarget }

private val platformsModel = DefaultComboBoxModel(project.xmakeConfiguration.platforms)
private val platformsComboBox = ComboBox(platformsModel).apply { item = runConfiguration.runPlatform }

private val architecturesModel = DefaultComboBoxModel(project.xmakeConfiguration.architectures)
private val architecturesComboBox = ComboBox(architecturesModel).apply { item = runConfiguration.runArchitecture }

private val modesModel = DefaultComboBoxModel(project.xmakeConfiguration.modes)
private val modesComboBox = ComboBox(modesModel).apply { item = runConfiguration.runMode }

// the run arguments
private val runArguments = RawCommandLineEditor()

// the environment variables
private val environmentVariables = EnvironmentVariablesComponent()
private val environmentVariables = EnvironmentVariablesTextFieldWithBrowseButton()

private val workingDirectoryBrowser = DirectoryBrowser(project).apply { text = runConfiguration.runWorkingDir }

private val buildDirectoryBrowser = DirectoryBrowser(project).apply { text = runConfiguration.buildDirectory }

private val androidNDKDirectoryBrowser =
DirectoryBrowser(project).apply { text = runConfiguration.androidNDKDirectory }

private var enableVerbose: Boolean = runConfiguration.enableVerbose

private val browser = DirectoryBrowser(project)
private val enableVerboseCheckBox = CheckBox("Enable verbose output", enableVerbose)

private val additionalConfiguration = RawCommandLineEditor()

// reset editor from configuration
override fun resetEditorFrom(configuration: XMakeRunConfiguration) {

toolkit = configuration.runToolkit

// reset targets
targetsModel.removeAllElements()
targetsModel.selectedItem = configuration.runTarget

platformsComboBox.item = configuration.runPlatform

architecturesComboBox.item = configuration.runArchitecture

modesComboBox.item = configuration.runMode

// reset run arguments
runArguments.text = configuration.runArguments

// reset environment variables
environmentVariables.envData = configuration.runEnvironment
environmentVariables.data = configuration.runEnvironment

workingDirectoryBrowser.text = configuration.runWorkingDir

browser.text = configuration.runWorkingDir
buildDirectoryBrowser.text = configuration.buildDirectory

androidNDKDirectoryBrowser.text = configuration.androidNDKDirectory

enableVerbose = configuration.enableVerbose

additionalConfiguration.text = configuration.additionalConfiguration
}

// apply editor to configuration
override fun applyEditorTo(configuration: XMakeRunConfiguration) {

configuration.runToolkit = toolkit

configuration.runTarget = (targetsModel.selectedItem ?: "").toString()

configuration.runPlatform = platformsComboBox.item

configuration.runArchitecture = architecturesComboBox.item

configuration.runMode = modesComboBox.item

configuration.runArguments = runArguments.text
configuration.runEnvironment = environmentVariables.envData
configuration.runWorkingDir = browser.text

configuration.runEnvironment = environmentVariables.data

configuration.runWorkingDir = workingDirectoryBrowser.text

configuration.buildDirectory = buildDirectoryBrowser.text

configuration.androidNDKDirectory = androidNDKDirectoryBrowser.text

configuration.enableVerbose = enableVerbose

configuration.additionalConfiguration = additionalConfiguration.text

project.xmakeConfiguration.changed = true
}

// create editor
Expand All @@ -82,23 +143,66 @@ class XMakeRunConfigurationEditor(
cell(toolkitComboBox).align(AlignX.FILL).applyToComponent {
// Todo: Store previously selected toolkit to restore it if not applied.
addToolkitChangedListener { toolkit ->
browser.removeBrowserAllListener()
workingDirectoryBrowser.removeBrowserAllListener()
buildDirectoryBrowser.removeBrowserAllListener()
androidNDKDirectoryBrowser.removeBrowserAllListener()
toolkit?.let {
browser.addBrowserListenerByToolkit(it)
workingDirectoryBrowser.addBrowserListenerByToolkit(it)
buildDirectoryBrowser.addBrowserListenerByToolkit(it)
androidNDKDirectoryBrowser.addBrowserListenerByToolkit(it)
}
}
activatedToolkit?.let { browser.addBrowserListenerByToolkit(it) }
activatedToolkit?.let {
workingDirectoryBrowser.addBrowserListenerByToolkit(it)
buildDirectoryBrowser.addBrowserListenerByToolkit(it)
androidNDKDirectoryBrowser.addBrowserListenerByToolkit(it)
}
}
}

row {
label("Configuration:").align(AlignY.TOP)
panel {
row {
label("Platform:")
}
row {
cell(platformsComboBox).applyToComponent {
addItemListener {
architecturesModel.removeAllElements()
architecturesModel.addAll(project.xmakeConfiguration.architectures.toMutableList())
}
}.align(AlignX.FILL)
}
}.resizableColumn()
panel {
row {
label("Architecture:")
}
row {
cell(architecturesComboBox).align(AlignX.FILL)
}
}.resizableColumn()
panel {
row {
label("Mode:")
}
row {
cell(modesComboBox).align(AlignX.FILL)
}
}.resizableColumn()
}.layout(RowLayout.PARENT_GRID)

separator()

row("Target:") {
cell(targetsComboBox).applyToComponent {
addPopupMenuListener(object : PopupMenuListenerAdapter() {
override fun popupMenuWillBecomeVisible(e: PopupMenuEvent?) {
super.popupMenuWillBecomeVisible(e)
targetsModel.removeAllElements()
with(runConfiguration){
if (runToolkit != null && runWorkingDir.isNotEmpty()){
with(runConfiguration) {
if (runToolkit != null && runWorkingDir.isNotEmpty()) {
TargetManager.getInstance(project)
.detectXmakeTarget(runToolkit!!, runConfiguration.runWorkingDir).forEach { target ->
targetsModel.addElement(target)
Expand All @@ -113,29 +217,62 @@ class XMakeRunConfigurationEditor(
row("Program arguments:") {
cell(runArguments).align(AlignX.FILL)
}
row(environmentVariables.label) {
// environmentVariables.label
row("Environment variables") {
cell(environmentVariables).align(AlignX.FILL)
}

row("Working directory") {
cell(browser).align(AlignX.FILL)
cell(workingDirectoryBrowser).align(AlignX.FILL)
}

collapsibleGroup("Additional Configurations") {
row("Build directory") {
cell(buildDirectoryBrowser).align(AlignX.FILL)
}

row("Android NDK directory") {
cell(androidNDKDirectoryBrowser).align(AlignX.FILL)
}

row("Additional Configuration") {
cell(additionalConfiguration).align(AlignX.FILL)
}

row("") {
cell(enableVerboseCheckBox)
}
}


row("Sync Directory:") {
button("Upload") {
toolkitComboBox.activatedToolkit?.let { toolkit ->
val workingDirectoryPath = browser.text
val workingDirectoryPath = workingDirectoryBrowser.text

scope.launch(Dispatchers.IO) {
when (toolkit.host.type) {
LOCAL -> {}
WSL -> {
val wslDistribution = toolkit.host.target as? WSLDistribution
syncProjectByWslSync(scope, project, wslDistribution!!, workingDirectoryPath, SyncDirection.LOCAL_TO_UPSTREAM)
syncProjectByWslSync(
scope,
project,
wslDistribution!!,
workingDirectoryPath,
SyncDirection.LOCAL_TO_UPSTREAM
)
}

SSH -> {
val sshConfig = toolkit.host.target as? SshConfig
syncProjectBySftp(scope, project, sshConfig!!, workingDirectoryPath, SyncDirection.LOCAL_TO_UPSTREAM)
syncProjectBySftp(
scope,
project,
sshConfig!!,
workingDirectoryPath,
SyncDirection.LOCAL_TO_UPSTREAM
)
}
}
}
Expand Down
Loading

0 comments on commit f4773ea

Please sign in to comment.