diff --git a/info/configure.txt b/info/configure.txt index 8527f0b..2d3da59 100644 --- a/info/configure.txt +++ b/info/configure.txt @@ -3,6 +3,6 @@ files to. If does not contain a Project.xml file, the tool recursively scans subdirectories and adds IDE templates to all projects it finds (handy for flixel-demos for instance). - -ide : The IDE to use (overrides your setup). + -ide : The IDE to use (overrides your setup). For VSCode, a .code-workspace file is generated if there's more than one project. \ No newline at end of file diff --git a/info/create.txt b/info/create.txt index edf516b..0e24034 100644 --- a/info/create.txt +++ b/info/create.txt @@ -4,4 +4,4 @@ or a number representing the number of the demo to create. -dir : The directory in which to (recursively) look for projects. Optional, defaults to the flixel-demos haxelib. - -ide : The IDE to use (overrides the configuration). \ No newline at end of file + -ide : The IDE to use (overrides the configuration). \ No newline at end of file diff --git a/info/template.txt b/info/template.txt index 98c1b5a..3db3ddc 100644 --- a/info/template.txt +++ b/info/template.txt @@ -7,4 +7,4 @@ template's template.json. The default template has options such as -n for project name and -w -h for width and height. Eg. flixel tpl -n "Name" -w 680 -h 480 - -ide : The IDE to use (overrides the configuration). \ No newline at end of file + -ide : The IDE to use (overrides the configuration). \ No newline at end of file diff --git a/run.n b/run.n index 1d19eab..b612159 100644 Binary files a/run.n and b/run.n differ diff --git a/src/FlxTools.hx b/src/FlxTools.hx index b9c37f8..57cd721 100644 --- a/src/FlxTools.hx +++ b/src/FlxTools.hx @@ -98,7 +98,6 @@ class FlxTools extends CommandLineRunner enum abstract IDE(String) from String to String { final SUBLIME_TEXT = "Sublime Text"; - final FLASH_DEVELOP = "FlashDevelop"; final INTELLIJ_IDEA = "IntelliJ IDEA"; final VISUAL_STUDIO_CODE = "Visual Studio Code"; final NONE = "None"; diff --git a/src/commands/Setup.hx b/src/commands/Setup.hx index 845576d..2d74bd8 100644 --- a/src/commands/Setup.hx +++ b/src/commands/Setup.hx @@ -133,13 +133,7 @@ class Setup extends Command function promptForSettings():FlxToolSettings { - final ides = [ - IDE.SUBLIME_TEXT, - IDE.FLASH_DEVELOP, - IDE.INTELLIJ_IDEA, - IDE.VISUAL_STUDIO_CODE, - IDE.NONE - ]; + final ides = [IDE.SUBLIME_TEXT, IDE.INTELLIJ_IDEA, IDE.VISUAL_STUDIO_CODE, IDE.NONE]; var ide = IDE.NONE; var AuthorName = ""; var IDEAutoOpen = false; diff --git a/src/utils/CommandUtils.hx b/src/utils/CommandUtils.hx index 1b59c2d..b2ade7d 100644 --- a/src/utils/CommandUtils.hx +++ b/src/utils/CommandUtils.hx @@ -308,7 +308,6 @@ class CommandUtils ideDataPath = combine(ideDataPath, "ide-data"); FlxTools.templateSourcePaths = [ - IDE.FLASH_DEVELOP => combine(ideDataPath, "flash-develop"), IDE.INTELLIJ_IDEA => combine(ideDataPath, "intellij-idea"), IDE.SUBLIME_TEXT => combine(ideDataPath, "sublime-text"), IDE.VISUAL_STUDIO_CODE => combine(ideDataPath, "visual-studio-code") @@ -337,9 +336,7 @@ class CommandUtils final settings:FlxToolSettings = Json.parse(jsonContent); // backwards compatibility with settings from versions <= 1.0.5 - if (settings.DefaultEditor == "Flash Develop") - settings.DefaultEditor = IDE.FLASH_DEVELOP; - else if (settings.DefaultEditor == "Intellij Idea") + if (settings.DefaultEditor == "Intellij Idea") settings.DefaultEditor = IDE.INTELLIJ_IDEA; return settings; diff --git a/src/utils/ProjectUtils.hx b/src/utils/ProjectUtils.hx index 50aa989..f7d68e6 100644 --- a/src/utils/ProjectUtils.hx +++ b/src/utils/ProjectUtils.hx @@ -120,11 +120,7 @@ class ProjectUtils addOption("IDEA_Flixel_Engine_Library", settings.IDEA_Flixel_Engine_Library); addOption("IDEA_Flixel_Addons_Library", settings.IDEA_Flixel_Addons_Library); - case IDE.FLASH_DEVELOP: - addOption("WIDTH", 640); - addOption("HEIGHT", 480); - - case _: // TODO: IDE.FLASH_DEVELOP_FDZ + case _: } if (templateSource != null) @@ -137,7 +133,6 @@ class ProjectUtils { final options = [ "subl" => IDE.SUBLIME_TEXT, - "fd" => IDE.FLASH_DEVELOP, "idea" => IDE.INTELLIJ_IDEA, "vscode" => IDE.VISUAL_STUDIO_CODE, "none" => IDE.NONE @@ -174,7 +169,6 @@ class ProjectUtils public static function openWithIDE(projectPath:String, projectName:String, ide:IDE):Bool { final ideHandlers:Map Bool> = [ - IDE.FLASH_DEVELOP => openWithFlashDevelop, IDE.SUBLIME_TEXT => openWithSublimeText, IDE.INTELLIJ_IDEA => openWithIntelliJIDEA, IDE.VISUAL_STUDIO_CODE => openWithVisualStudioCode @@ -192,19 +186,6 @@ class ProjectUtils return result; } - public static function openWithFlashDevelop(projectPath:String, projectName:String):Bool - { - var projectFile = CommandUtils.combine(projectPath, projectName + ".hxproj"); - projectFile = projectFile.replace("/", "\\"); - - if (FileSys.exists(projectFile)) - { - runCommand("explorer", [projectFile]); - return true; - } - return false; - } - public static function openWithSublimeText(projectPath:String, projectName:String):Bool { final projectFile = CommandUtils.combine(projectPath, projectName + ".sublime-project");