Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-28 17:16:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add ${relative_dir} useful to solve case mentioned at https://github.com/SpartanJ/ecode/discussions/876

Browse Source
This commit is contained in:
Martín Lucas Golini
2026-04-15 00:34:49 -03:00
parent 4a4da521d9
commit f95f32eeba
6 changed files with 71 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/assets/i18n/de.xml
View File

@@ -202,7 +202,7 @@ Dateipfad: </string>
<string name="custom_variables">Angepasste Variablen</string>
<string name="custom_variables_desc">Angepasste Variablen erlauben das Vereinfachen von Build-Befehlsschritten durch Hinzufügen eigener Variablen, die über die Build-Einstellungen in Befehlen, Argumenten und Arbeitsverzeichnissen angewendet werden können.</string>
<string name="custom_variables_desc_2">Angepasste Variablen können mit ${variable_name} in beliebigen Befehlen aufgerufen werden.</string>
<string name="custom_variables_desc_3">Es gibt bereits vordefinierte angepasste Variablen zur Nutzung:&amp;#10;${project_root}: Ordner-/Projekt-Root-Verzeichnis.&amp;#10;${build_type}: Ausgewählter Build-Typ zur Projekterstellung.&amp;#10;${os}: Name des aktuellen Betriebssystems.&amp;#10;${arch}: Architektur des aktuellen Betriebssystems.&amp;#10;${nproc}: Anzahl logischer Prozessoreinheiten.&amp;#10;${current_doc}: Letzter oder aktueller Dokumentenpfad.&amp;#10;${current_doc_name}: Letzter oder aktueller Name fokussierten Dokuments (ohne Erweiterung).&amp;#10;${current_doc_dir}: Letztes oder gegenwärtig fokussiertes Projektverzeichnis.</string>
<string name="custom_variables_desc_3">Es gibt bereits vordefinierte angepasste Variablen zur Nutzung:&#10;${project_root}: Das Projekt-Stammverzeichnis.&#10;${build_type}: Der aktuell ausgewählte Build-Typ.&#10;${os}: Der Name des aktuellen Betriebssystems.&#10;${arch}: Die Architektur des aktuellen Betriebssystems.&#10;${nproc}: Die Anzahl der logischen Prozessorkerne.&#10;${current_doc}: Der Pfad des aktuell fokussierten Dokuments.&#10;${current_doc_name}: Der Name des aktuell fokussierten Dokuments (ohne Erweiterung).&#10;${current_doc_dir}: Das Verzeichnis des aktuell fokussierten Dokuments.&#10;${relative_dir}: Der relative Verzeichnispfad zwischen ${project_root} und ${current_doc_dir}.</string>
<string name="cut">Ausschneiden</string>
<string name="dark">Dunkel</string>
<string name="date">Datum</string>

2
bin/assets/i18n/en.xml
View File

@@ -186,7 +186,7 @@ File path is: </string>
<string name="custom_variables">Custom Variables</string>
<string name="custom_variables_desc">Custom Variables allow to simplify the build commands steps adding custom variables that can be used over the build settings in commands, arguments, and working directories.</string>
<string name="custom_variables_desc_2">Custom Variables can be invoked using ${variable_name} in any of the commands.</string>
<string name="custom_variables_desc_3">There are predefined custom variables available to use:&#10;${project_root}: The folder / project root directory.&#10;${build_type}: The build type selected to build the project.&#10;${os}: The current operating system name.&#10;${arch}: The current operating architecture.&#10;${nproc}: The number of logical processing units.&#10;${current_doc}: The last or current focused document path.&#10;${current_doc_name}: The last or current focused document name without extension.&#10;${current_doc_dir}: The last or current focused document directory.</string>
<string name="custom_variables_desc_3">There are predefined custom variables available to use:&#10;${project_root}: The project root directory.&#10;${build_type}: The currently selected build type.&#10;${os}: The current operating system name.&#10;${arch}: The current operating system architecture.&#10;${nproc}: The number of logical processor cores.&#10;${current_doc}: The path of the currently focused document.&#10;${current_doc_name}: The name of the currently focused document (without extension).&#10;${current_doc_dir}: The directory of the currently focused document.&#10;${relative_dir}: The relative directory path between ${project_root} and ${current_doc_dir}.</string>
<string name="cut">Cut</string>
<string name="dark">Dark</string>
<string name="date">Date</string>

14
bin/assets/i18n/fr.xml
View File

@@ -187,15 +187,7 @@ Le chemin du fichier est : </string>
<string name="custom_variables">Variables personnalisées</string>
<string name="custom_variables_desc">Les variables personnalisées permettent de simplifier les étapes des commandes de construction en ajoutant des variables personnalisées qui peuvent être utilisées sur les paramètres de construction dans les commandes, les arguments et les répertoires de travail.</string>
<string name="custom_variables_desc_2">Les variables personnalisées peuvent être appelées à l'aide de ${nom_variable} dans n'importe laquelle des commandes.</string>
<string name="custom_variables_desc_3">Il existe des variables personnalisées prédéfinies disponibles :
${project_root} : le dossier / répertoire racine du projet.
${build_type} : le type de construction sélectionné pour construire le projet.
${os} : le nom du système d'exploitation courant.
${arch} : l'architecture d'exploitation courante.
${nproc} : le nombre de processeurs.
${current_doc} : le chemin du document courant ou le plus récent.
${current_doc_name} : le nom du document courant ou le plus récent sans extension.
${current_doc_dir} : le répertoire du document courant ou le plus récent.</string>
<string name="custom_variables_desc_3">Il existe des variables personnalisées prédéfinies disponibles :&#10;${project_root} : le répertoire racine du projet.&#10;${build_type} : le type de construction actuellement sélectionné.&#10;${os} : le nom du système d'exploitation actuel.&#10;${arch} : l'architecture du système d'exploitation actuel.&#10;${nproc} : le nombre de cœurs de processeurs logiques.&#10;${current_doc} : le chemin du document actuellement focalisé.&#10;${current_doc_name} : le nom du document actuellement focalisé (sans extension).&#10;${current_doc_dir} : le répertoire du document actuellement focalisé.&#10;${relative_dir} : le chemin du répertoire relatif entre ${project_root} et ${current_doc_dir}.</string>
<string name="cut">Couper</string>
<string name="dark">Sombre</string>
<string name="date">Date</string>
@@ -858,7 +850,7 @@ dans l'arborescence de répertoires ainsi que dans les boites de dialogues de s
<string name="uicodeeditor_delete">Supprimer</string>
<string name="uicodeeditor_open_containing_folder_in_fm">Ouvrir le dossier parent dans l'explorateur de fichiers</string>
<string name="uicodeeditor_paste">Coller</string>
<string name="uicodeeditor_redo">Refaire/string>
<string name="uicodeeditor_redo">Refaire</string>
<string name="uicodeeditor_select_all">Sélectionner tout</string>
<string name="uicodeeditor_undo">Annuler</string>
<string name="uiconsole_copy">Copier</string>
@@ -921,3 +913,5 @@ Redémarrer ecode pour voir les changements.</string>
<string name="terminal_paste">Coller dans le terminal</string>
<string name="terminal_rename">Renommer le terminal</string>
</resources>
me="terminal_rename">Renommer le terminal</string>
</resources>

94
bin/assets/i18n/zh_CN.xml
View File

@@ -16,8 +16,8 @@
license: 'MIT (respective)'
?-->
<resources language="en" title="简体中文（粗翻）">
<string name="about_ecode">关于Ecode</string>
<resources language="zh_CN" title="简体中文">
<string name="about_ecode">关于 Ecode</string>
<string name="add_branch">新增分支</string>
<string name="add_build">新增构建</string>
<string name="add_build_step">新增构建步骤</string>
@@ -61,29 +61,27 @@
<string name="build_type_name_del">删除构建名称 %s?</string>
<string name="build_type_required">构建类型必填！</string>
<string name="build_types">构建类型</string>
<string name="build_types_desc">Build types can be used as a dynamic build option represented by the special key ${build_type}. The build type can be switch easily from the editor.</string>
<string name="build_types_desc">构建类型可用作由特殊键 ${build_type} 表示的动态构建选项。可以在编辑器中轻松切换构建类型。</string>
<string name="camsg_box_cancel">取消</string>
<string name="cancel_build">取消构建</string>
<string name="cancel_clean">取消清理</string>
<string name="capture_positions">Capture Positions</string>
<string name="case_sensitive">Case sensitive</string>
<string name="change_case">Change Case</string>
<string name="change_escape_sequence">Change Escape Sequence</string>
<string name="change_whole_word">Change Whole Word</string>
<string name="check_for_new_updates_at_startup">Always check for new updates at startup.</string>
<string name="check_for_updates">Check For Updates</string>
<string name="check_languages_health">Check Languages Health</string>
<string name="clean">Clean</string>
<string name="clean_failed">Clean run with errors
</string>
<string name="capture_positions">捕捉位置</string>
<string name="case_sensitive">区分大小写</string>
<string name="change_case">切换大小写</string>
<string name="change_escape_sequence">更改转义序列</string>
<string name="change_whole_word">更改全词匹配</string>
<string name="check_for_new_updates_at_startup">启动时总是检查更新。</string>
<string name="check_for_updates">检查更新</string>
<string name="check_languages_health">检查语言健康状况</string>
<string name="clean">清理</string>
<string name="clean_failed">清理运行时出错&#10;</string>
<string name="clean_steps">清理步骤</string>
<string name="clean_successful">成功清理run
</string>
<string name="clean_successful">成功清理运行&#10;</string>
<string name="clear_history">清理历史</string>
<string name="clear_menu">清空菜单</string>
<string name="clear_system_environment">Clear System Environment</string>
<string name="clone_setting">Clone Setting</string>
<string name="cloned_name_must_be_different">Cloned name must be different from any existing build name.</string>
<string name="clear_system_environment">清除系统环境</string>
<string name="clone_setting">克隆设置</string>
<string name="cloned_name_must_be_different">克隆名称必须与任何现有构建名称不同。</string>
<string name="close">关闭</string>
<string name="close_all_tabs">关闭所有标签页</string>
<string name="close_app">关闭Ecode</string>
@@ -151,21 +149,21 @@
<string name="custom_environment_variables">自定义环境变量</string>
<string name="custom_output_parser">自定义输出解析器</string>
<string name="custom_variables">自定义环境变量</string>
<string name="custom_variables_desc">Custom Variables allow to simplify the build commands steps adding custom variables that can be used over the build settings in commands, arguments, and working directories.</string>
<string name="custom_variables_desc_2">Custom Variables can be invoked using ${variable_name} in any of the commands.</string>
<string name="custom_variables_desc_3">There are predefined custom variables available to use:&amp;#10;${project_root}: The folder / project root directory.&amp;#10;${build_type}: The build type selected to build the project.&amp;#10;${os}: The current operating system name.&amp;#10;${nproc}: The number of logical processing units.</string>
<string name="custom_variables_desc">自定义变量允许通过添加自定义变量来简化构建命令步骤，这些变量可以在构建设置的命令、参数和工作目录中使用。</string>
<string name="custom_variables_desc_2">可以在任何命令中使用 ${variable_name} 来调用自定义变量。</string>
<string name="custom_variables_desc_3">有以下预定义的自定义变量可用：&#10;${project_root}: 项目根目录。&#10;${build_type}: 当前选中的构建类型。&#10;${os}: 当前操作系统名称。&#10;${arch}: 当前操作系统架构。&#10;${nproc}: 逻辑处理器核心数。&#10;${current_doc}: 当前选中的文档路径。&#10;${current_doc_name}: 当前选中的文档名称（不含扩展名）。&#10;${current_doc_dir}: 当前选中的文档所在目录。&#10;${relative_dir}: ${project_root} 与 ${current_doc_dir} 之间的相对目录路径。</string>
<string name="cut">剪切</string>
<string name="dark">Dark</string>
<string name="dark">深色</string>
<string name="date">日期</string>
<string name="debug_draw_boxes">Draw Boxes</string>
<string name="debug_draw_boxes_toggle">Debug Draw Boxes Toggle</string>
<string name="debug_draw_debug_data">Debug Draw Debug Data</string>
<string name="debug_draw_highlight">Highlight Focus &amp; Hover</string>
<string name="debug_draw_highlight_toggle">Debug Draw Highlight Toggle</string>
<string name="debug_widget_tree_view">Debug Widget Tree View</string>
<string name="default_theme">Default Theme</string>
<string name="del_custom_output_parser">Delete Selected Custom Output Parser</string>
<string name="del_custom_variable">Delete Selected Environment Variable</string>
<string name="debug_draw_boxes">绘制框</string>
<string name="debug_draw_boxes_toggle">调试绘制框切换</string>
<string name="debug_draw_debug_data">调试绘制调试数据</string>
<string name="debug_draw_highlight">高亮焦点和悬停</string>
<string name="debug_draw_highlight_toggle">调试绘制高亮切换</string>
<string name="debug_widget_tree_view">调试组件树视图</string>
<string name="default_theme">默认主题</string>
<string name="del_custom_output_parser">删除选定的自定义输出解析器</string>
<string name="del_custom_variable">删除选定的环境变量</string>
<string name="delete">删除</string>
<string name="delete_selected">删除已选</string>
<string name="delete_setting">删除设置</string>
@@ -447,8 +445,8 @@ Restart ecode to see the changes.</string>
<string name="open_workspace_symbol_search">打开工作区符号搜索</string>
<string name="output">输出</string>
<string name="output_parser">输出解析器</string>
<string name="output_parser_desc">Custom output parsers scan command line output for user-provided error patterns to create entries in Build Issues and highlight those errors on the Build Output</string>
<string name="output_parser_preset">Presets are provided as generic output parsers, you can select one below, by default a "generic" preset will be selected:</string>
<string name="output_parser_desc">自定义输出解析器扫描命令行输出，查找用户提供的错误模式，以在构建问题中创建条目并在构建输出上突出显示这些错误。</string>
<string name="output_parser_preset">预设提供为通用输出解析器，您可以在下面选择一个，默认情况下将选择“通用”预设：</string>
<string name="overwrite">覆盖</string>
<string name="owner">主人</string>
<string name="paste">粘贴</string>
@@ -576,7 +574,7 @@ Restart ecode to see the changes.</string>
</string>
<string name="status">状态</string>
<string name="supported_platforms">支持的平台</string>
<string name="supported_platforms_desc">Selecting none means that the build settings will work and be available on any Operating System</string>
<string name="supported_platforms_desc">不选择任何内容表示构建设置将在任何操作系统上工作并可用。</string>
<string name="switch_build">选择构建</string>
<string name="switch_build_type">选择构建类型</string>
<string name="switch_side_panel">选择侧栏</string>
@@ -632,21 +630,21 @@ file in the directory tree.</string>
<string name="type">Type</string>
<string name="type_to_locate">Type to Locate</string>
<string name="ui_font_size">Ui字体大小</string>
<string name="ui_language">UI语言 Language</string>
<string name="ui_multisamples_level">Multisample Anti-Aliasing Level</string>
<string name="ui_panel_font_size">Ui板字体大小</string>
<string name="ui_prefes_color_scheme">UI配色方案</string>
<string name="ui_language">界面语言</string>
<string name="ui_multisamples_level">多重采样抗锯齿级别</string>
<string name="ui_panel_font_size">界面面板字体大小</string>
<string name="ui_prefes_color_scheme">界面偏好配色方案</string>
<string name="ui_renderer">渲染器</string>
<string name="ui_renderer_version">渲染器版本</string>
<string name="ui_scale_factor">Ui缩放</string>
<string name="ui_thene">UI主题</string>
<string name="uicodeeditor_copy">Copy</string>
<string name="uicodeeditor_copy_containing_folder_path_ellipsis">Copy Containing Folder Path...</string>
<string name="uicodeeditor_copy_file_path">Copy File Path</string>
<string name="uicodeeditor_copy_file_path_and_position">Copy File Path and Position</string>
<string name="uicodeeditor_cut">Paste</string>
<string name="uicodeeditor_delete">Delete</string>
<string name="uicodeeditor_open_containing_folder_in_fm">Open Containing Folder in File Manager</string>
<string name="ui_scale_factor">界面缩放比例</string>
<string name="ui_thene">界面主题</string>
<string name="uicodeeditor_copy">复制</string>
<string name="uicodeeditor_copy_containing_folder_path_ellipsis">复制所在文件夹路径...</string>
<string name="uicodeeditor_copy_file_path">复制文件路径</string>
<string name="uicodeeditor_copy_file_path_and_position">复制文件路径和位置</string>
<string name="uicodeeditor_cut">剪切</string>
<string name="uicodeeditor_delete">删除</string>
<string name="uicodeeditor_open_containing_folder_in_fm">在文件管理器中打开所在文件夹</string>
<string name="uicodeeditor_paste">粘贴</string>
<string name="uicodeeditor_redo">重做</string>
<string name="uicodeeditor_select_all">全选</string>

5
src/tools/ecode/projectbuild.cpp
View File

@@ -29,6 +29,7 @@ static const char* VAR_NPROC = "${nproc}";
static const char* VAR_CURRENT_DOC = "${current_doc}";
static const char* VAR_CURRENT_DOC_NAME = "${current_doc_name}";
static const char* VAR_CURRENT_DOC_DIR = "${current_doc_dir}";
static const char* VAR_RELATIVE_DIR = "${relative_dir}";
static void replaceVar( ProjectBuildStep& s, const std::string& var, const std::string& val ) {
static std::string slashDup = FileSystem::getOSSlash() + FileSystem::getOSSlash();
@@ -398,12 +399,16 @@ void ProjectBuildManager::replaceDynamicVars( ProjectBuildCommand& cmd ) {
std::string curDocName =
FileSystem::fileRemoveExtension( FileSystem::fileNameFromPath( curDoc ) );
std::string curDocDir = FileSystem::fileRemoveFileName( curDoc );
std::string relativeDir = curDocDir;
FileSystem::filePathRemoveBasePath( mProjectRoot, relativeDir );
FileSystem::dirAddSlashAtEnd( relativeDir );
replaceVar( cmd, VAR_OS, currentOS );
replaceVar( cmd, VAR_ARCH, Sys::getOSArchitecture() );
replaceVar( cmd, VAR_NPROC, nproc );
replaceVar( cmd, VAR_CURRENT_DOC, curDoc );
replaceVar( cmd, VAR_CURRENT_DOC_NAME, curDocName );
replaceVar( cmd, VAR_CURRENT_DOC_DIR, curDocDir );
replaceVar( cmd, VAR_RELATIVE_DIR, relativeDir );
if ( cmd.workingDir.empty() )
cmd.workingDir = mProjectRoot;
}

27
src/tools/ecode/uibuildsettings.cpp
View File

@@ -242,8 +242,8 @@ class UIBuildStep : public UILinearLayout {
findByClass( "reuse_previous_terminal" ) );
mDataBindHolder += UIDataBindBool::New( &mStep->useStatusBarTerminal,
findByClass( "use_statusbar_terminal" ) );
mDataBindHolder += UIDataBindBool::New( &mStep->stripAnsiCodes,
findByClass( "strip_ansi_codes" ) );
mDataBindHolder +=
UIDataBindBool::New( &mStep->stripAnsiCodes, findByClass( "strip_ansi_codes" ) );
}
protected:
@@ -305,16 +305,17 @@ class UIBuildStep : public UILinearLayout {
runInTerminal->setVisible( true );
runInTerminal->setChecked( buildStep->runInTerminal );
runInTerminal->on( Event::OnValueChange, [reusePreviousTerminal, runInTerminal,
useStatusBarTerminal, stripAnsiCodes]( auto ) {
reusePreviousTerminal->setEnabled( runInTerminal->isChecked() );
useStatusBarTerminal->setEnabled( runInTerminal->isChecked() );
stripAnsiCodes->setEnabled( !runInTerminal->isChecked() );
if ( !runInTerminal->isChecked() ) {
reusePreviousTerminal->setChecked( false );
useStatusBarTerminal->setChecked( false );
}
} );
runInTerminal->on( Event::OnValueChange,
[reusePreviousTerminal, runInTerminal, useStatusBarTerminal,
stripAnsiCodes]( auto ) {
reusePreviousTerminal->setEnabled( runInTerminal->isChecked() );
useStatusBarTerminal->setEnabled( runInTerminal->isChecked() );
stripAnsiCodes->setEnabled( !runInTerminal->isChecked() );
if ( !runInTerminal->isChecked() ) {
reusePreviousTerminal->setChecked( false );
useStatusBarTerminal->setChecked( false );
}
} );
reusePreviousTerminal->setVisible( true );
reusePreviousTerminal->setEnabled( buildStep->runInTerminal );
@@ -451,7 +452,7 @@ static const auto SETTINGS_PANEL_XML = R"xml(
<PushButton id="custom_var_del" icon="icon(delete-bin, 12dp)" min-width="20dp" tooltip="@string(del_custom_variable, Delete Selected Variable)" lg="center" />
</vbox>
</hbox>
<TextView class="span" lw="mp" lh="wc" word-wrap="true" text='@string(custom_variables_desc_3, "There are predefined custom variables available to use:&#10;${project_root}: The folder / project root directory.&#10;${build_type}: The build type selected to build the project.&#10;${os}: The current operating system name.&#10;${arch}: The current operating architecture.&#10;${nproc}: The number of logical processing units.&#10;${current_doc}: The last or current focused document path.&#10;${current_doc_name}: The last or current focused document name without extension.&#10;${current_doc_dir}: The last or current focused document directory.")' />
<TextView class="span" lw="mp" lh="wc" word-wrap="true" text='@string(custom_variables_desc_3, "There are predefined custom variables available to use:&#10;${project_root}: The folder / project root directory.&#10;${build_type}: The build type selected to build the project.&#10;${os}: The current operating system name.&#10;${arch}: The current operating architecture.&#10;${nproc}: The number of logical processing units.&#10;${current_doc}: The last or current focused document path.&#10;${current_doc_name}: The last or current focused document name without extension.&#10;${current_doc_dir}: The last or current focused document directory.&#10;${relative_dir}: The relative directory path between ${project_root} and ${current_doc_dir}.")' />
</vbox>
<vbox lw="mp" lh="wc" class="build_environment">