[build] Update the i18n processing to fit the out-of-tree build

2026-01-18 16:27:34 +01:00 · 2019-03-05 17:14:34 +01:00
parent 4f1d74f44b
commit 4f2c7a3763
59 changed files with 78 additions and 67 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,3 @@
-# No i18n headers
-apps/i18n.h
-apps/i18n.cpp
-
 # Quiz output
 quiz/src/symbols.c

--- a/apps/Makefile
+++ b/apps/Makefile
@@ -43,6 +43,12 @@ epsilon_app_names = '$(foreach i,${EPSILON_APPS},"$(i)", )'
 $(call object_for,apps/apps_container_storage.cpp apps/main.cpp): CXXFLAGS += $(snapshot_includes) -DAPPS_CONTAINER_APPS_DECLARATION="$(apps_declaration)" -DAPPS_CONTAINER_SNAPSHOT_DECLARATIONS="$(snapshots_declaration)" -DAPPS_CONTAINER_SNAPSHOT_CONSTRUCTORS="$(snapshots_construction)" -DAPPS_CONTAINER_SNAPSHOT_LIST="$(snapshots_list)" -DAPPS_CONTAINER_SNAPSHOT_COUNT=$(snapshots_count) -DEPSILON_APPS_NAMES=$(epsilon_app_names)


+
+# I18n file generation
+
+# The header is refered to as <apps/i18n.h> so make sure it's findable this way
+SFLAGS += -I$(OUTPUT_DIRECTORY)
+
 i18n_files += $(addprefix apps/language_,$(addsuffix .universal.i18n, $(EPSILON_I18N)))
 i18n_files += $(addprefix apps/,\
  shared.de.i18n\
@@ -63,14 +69,23 @@ i18n_files += $(addprefix apps/,\
  variables.pt.i18n\
 )

-apps/i18n.h: apps/i18n.cpp
-apps/i18n.cpp: $(i18n_files)
-	@echo "I18N    $@"
-	$(Q) $(PYTHON) apps/i18n.py --header $(subst .cpp,.h,$@) --implementation $@ --locales $(EPSILON_I18N) --files $^
+$(eval $(call rule_for, \
+  I18N, \
+  apps/i18n.cpp, \
+  $(i18n_files), \
+  $$(PYTHON) apps/i18n.py --header $$(subst .cpp,.h,$$@) --implementation $$@ --locales $$(EPSILON_I18N) --files $$^ \
+))

-#$(app_objs): apps/i18n.h
+# Make sure apps/i18n.o is built
+# The extension added to app_src doesn't really matter since it'll be processed
+# by the object_for function.
+app_src += apps/i18n.py

-products += apps/i18n.h apps/i18n.cpp
+$(OUTPUT_DIRECTORY)/apps/i18n.h: $(OUTPUT_DIRECTORY)/apps/i18n.cpp
+
+$(call object_for,$(app_src)): $(OUTPUT_DIRECTORY)/apps/i18n.h
+
+# Handle PNG files

 $(eval $(call depends_on_image,apps/title_bar_view.cpp,apps/exam_icon.png))

--- a/apps/calculation/app.cpp
+++ b/apps/calculation/app.cpp
@@ -1,7 +1,7 @@
 #include "app.h"
 #include "../apps_container.h"
 #include "calculation_icon.h"
-#include "../i18n.h"
+#include <apps/i18n.h>
 #include <poincare/symbol.h>

 using namespace Poincare;
--- a/apps/code/app.cpp
+++ b/apps/code/app.cpp
@@ -1,7 +1,7 @@
 #include "app.h"
 #include "../apps_container.h"
 #include "code_icon.h"
-#include "../i18n.h"
+#include <apps/i18n.h>
 #include "helpers.h"

 namespace Code {
--- a/apps/code/menu_controller.cpp
+++ b/apps/code/menu_controller.cpp
@@ -1,6 +1,6 @@
 #include "menu_controller.h"
 #include "app.h"
-#include "../i18n.h"
+#include <apps/i18n.h>
 #include "../apps_container.h"
 #include <assert.h>
 #include <escher/metric.h>
--- a/apps/code/script_parameter_controller.h
+++ b/apps/code/script_parameter_controller.h
@@ -2,7 +2,7 @@
 #define CODE_SCRIPT_PARAMETER_CONTROLLER_H

 #include <escher.h>
-#include "../i18n.h"
+#include <apps/i18n.h>
 #include "script_store.h"

 namespace Code {
--- a/apps/empty_battery_window.cpp
+++ b/apps/empty_battery_window.cpp
@@ -1,6 +1,6 @@
 #include "empty_battery_window.h"
 #include "global_preferences.h"
-#include "i18n.h"
+#include <apps/i18n.h>
 extern "C" {
 #include <assert.h>
 }
--- a/apps/exam_pop_up_controller.cpp
+++ b/apps/exam_pop_up_controller.cpp
@@ -1,6 +1,6 @@
 #include "exam_pop_up_controller.h"
 #include "apps_container.h"
-#include "i18n.h"
+#include <apps/i18n.h>
 #include "global_preferences.h"
 #include <assert.h>

--- a/apps/global_preferences.h
+++ b/apps/global_preferences.h
@@ -1,7 +1,7 @@
 #ifndef APPS_GLOBAL_PREFERENCES_H
 #define APPS_GLOBAL_PREFERENCES_H

-#include "i18n.h"
+#include <apps/i18n.h>

 class GlobalPreferences {
 public:
--- a/apps/graph/app.cpp
+++ b/apps/graph/app.cpp
@@ -1,7 +1,7 @@
 #include "app.h"
 #include "../apps_container.h"
 #include "graph_icon.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 using namespace Poincare;
 using namespace Shared;
--- a/apps/graph/graph/banner_view.cpp
+++ b/apps/graph/graph/banner_view.cpp
@@ -1,5 +1,5 @@
 #include "banner_view.h"
-#include "../../i18n.h"
+#include <apps/i18n.h>

 namespace Graph {

--- a/apps/graph/graph/calculation_parameter_controller.h
+++ b/apps/graph/graph/calculation_parameter_controller.h
@@ -10,7 +10,7 @@
 #include "root_graph_controller.h"
 #include "graph_view.h"
 #include "banner_view.h"
-#include "../../i18n.h"
+#include <apps/i18n.h>

 namespace Graph {

--- a/apps/graph/graph/curve_parameter_controller.cpp
+++ b/apps/graph/graph/curve_parameter_controller.cpp
@@ -1,6 +1,6 @@
 #include "curve_parameter_controller.h"
 #include "graph_controller.h"
-#include "../../i18n.h"
+#include <apps/i18n.h>
 #include <assert.h>

 using namespace Shared;
--- a/apps/graph/list/storage_list_controller.cpp
+++ b/apps/graph/list/storage_list_controller.cpp
@@ -1,6 +1,6 @@
 #include "storage_list_controller.h"
 #include "../app.h"
-#include "../../i18n.h"
+#include <apps/i18n.h>
 #include <assert.h>
 #include <escher/metric.h>
 #include <apps/apps_container.h>
--- a/apps/hardware_test/pop_up_controller.cpp
+++ b/apps/hardware_test/pop_up_controller.cpp
@@ -1,5 +1,5 @@
 #include "pop_up_controller.h"
-#include "../i18n.h"
+#include <apps/i18n.h>
 #include "../apps_container.h"
 #include <assert.h>

--- a/apps/home/app.cpp
+++ b/apps/home/app.cpp
@@ -1,5 +1,5 @@
 #include "app.h"
-#include "../i18n.h"
+#include <apps/i18n.h>
 #include "../apps_container.h"

 extern "C" {
--- a/apps/i18n.py
+++ b/apps/i18n.py
@@ -116,7 +116,7 @@ def print_header(data, path, locales):
 def print_implementation(data, path, locales):
    f = open(path, 'w')
    f.write("#include \"i18n.h\"\n")
-    f.write("#include \"global_preferences.h\"\n")
+    f.write("#include <apps/global_preferences.h>\n")
    f.write("#include <assert.h>\n\n");
    f.write("namespace I18n {\n\n")

--- a/apps/on_boarding/pop_up_controller.h
+++ b/apps/on_boarding/pop_up_controller.h
@@ -2,7 +2,7 @@
 #define ON_BOARDING_POP_UP_CONTROLLER_H

 #include <escher.h>
-#include "../i18n.h"
+#include <apps/i18n.h>
 #include "../shared/message_view.h"
 #include "../shared/ok_view.h"

--- a/apps/probability/app.cpp
+++ b/apps/probability/app.cpp
@@ -1,5 +1,5 @@
 #include "app.h"
-#include "../i18n.h"
+#include <apps/i18n.h>
 #include "probability_icon.h"
 #include <new>

--- a/apps/probability/calculation_cell.cpp
+++ b/apps/probability/calculation_cell.cpp
@@ -1,6 +1,6 @@
 #include "calculation_cell.h"
 #include "responder_image_cell.h"
-#include "../i18n.h"
+#include <apps/i18n.h>
 #include <assert.h>

 namespace Probability {
--- a/apps/probability/law/law.h
+++ b/apps/probability/law/law.h
@@ -4,7 +4,7 @@
 #include <escher.h>
 #include "../../constant.h"
 #include "../../shared/curve_view_range.h"
-#include "../../i18n.h"
+#include <apps/i18n.h>

 namespace Probability {

--- a/apps/regression/app.cpp
+++ b/apps/regression/app.cpp
@@ -1,6 +1,6 @@
 #include "app.h"
 #include "regression_icon.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 using namespace Shared;

--- a/apps/regression/initialisation_parameter_controller.h
+++ b/apps/regression/initialisation_parameter_controller.h
@@ -3,7 +3,7 @@

 #include <escher.h>
 #include "store.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Regression {

--- a/apps/regression/model/model.h
+++ b/apps/regression/model/model.h
@@ -2,7 +2,7 @@
 #define REGRESSION_MODEL_H

 #include <stdint.h>
-#include "../../i18n.h"
+#include <apps/i18n.h>
 #include <poincare/context.h>
 #include <poincare/expression.h>
 #include <poincare/layout.h>
--- a/apps/regression/regression_controller.h
+++ b/apps/regression/regression_controller.h
@@ -3,7 +3,7 @@

 #include "store.h"
 #include <escher.h>
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Regression {

--- a/apps/settings/app.cpp
+++ b/apps/settings/app.cpp
@@ -1,6 +1,6 @@
 #include "app.h"
 #include "settings_icon.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Settings {

--- a/apps/settings/main_controller.cpp
+++ b/apps/settings/main_controller.cpp
@@ -1,6 +1,6 @@
 #include "main_controller.h"
 #include "../global_preferences.h"
-#include "../i18n.h"
+#include <apps/i18n.h>
 #include <assert.h>

 using namespace Poincare;
--- a/apps/shared/expression_field_delegate_app.cpp
+++ b/apps/shared/expression_field_delegate_app.cpp
@@ -1,6 +1,6 @@
 #include "expression_field_delegate_app.h"
 #include <escher.h>
-#include "../i18n.h"
+#include <apps/i18n.h>
 #include "../apps_container.h"

 using namespace Poincare;
--- a/apps/shared/expression_model_list_controller.h
+++ b/apps/shared/expression_model_list_controller.h
@@ -3,7 +3,7 @@

 #include <escher.h>
 #include "expression_model_store.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Shared {

--- a/apps/shared/function_list_controller.h
+++ b/apps/shared/function_list_controller.h
@@ -6,7 +6,7 @@
 #include "function_app.h"
 #include "list_parameter_controller.h"
 #include "expression_model_list_controller.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Shared {

--- a/apps/shared/initialisation_parameter_controller.h
+++ b/apps/shared/initialisation_parameter_controller.h
@@ -3,7 +3,7 @@

 #include <escher.h>
 #include "interactive_curve_view_range.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Shared {

--- a/apps/shared/language_controller.cpp
+++ b/apps/shared/language_controller.cpp
@@ -1,7 +1,7 @@
 #include "language_controller.h"
 #include "../global_preferences.h"
 #include "../apps_container.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Shared {

--- a/apps/shared/language_controller.h
+++ b/apps/shared/language_controller.h
@@ -2,7 +2,7 @@
 #define SHARED_LANGUAGE_CONTROLLER_H

 #include <escher.h>
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Shared {

--- a/apps/shared/list_parameter_controller.h
+++ b/apps/shared/list_parameter_controller.h
@@ -4,7 +4,7 @@
 #include <escher.h>
 #include "function.h"
 #include "function_store.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Shared {

--- a/apps/shared/scrollable_exact_approximate_expressions_view.cpp
+++ b/apps/shared/scrollable_exact_approximate_expressions_view.cpp
@@ -1,5 +1,5 @@
 #include "scrollable_exact_approximate_expressions_view.h"
-#include "../i18n.h"
+#include <apps/i18n.h>
 #include <assert.h>
 using namespace Poincare;

--- a/apps/shared/storage_expression_model_list_controller.h
+++ b/apps/shared/storage_expression_model_list_controller.h
@@ -3,7 +3,7 @@

 #include <escher.h>
 #include "storage_expression_model_store.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Shared {

--- a/apps/shared/storage_function_list_controller.h
+++ b/apps/shared/storage_function_list_controller.h
@@ -7,7 +7,7 @@
 #include "function_title_cell.h"
 #include "storage_list_parameter_controller.h"
 #include "storage_expression_model_list_controller.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Shared {

--- a/apps/shared/storage_list_parameter_controller.h
+++ b/apps/shared/storage_list_parameter_controller.h
@@ -3,7 +3,7 @@

 #include <escher.h>
 #include "storage_function_store.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Shared {

--- a/apps/shared/storage_values_controller.h
+++ b/apps/shared/storage_values_controller.h
@@ -9,7 +9,7 @@
 #include "values_parameter_controller.h"
 #include "storage_values_function_parameter_controller.h"
 #include "interval_parameter_controller.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Shared {

--- a/apps/shared/storage_values_function_parameter_controller.h
+++ b/apps/shared/storage_values_function_parameter_controller.h
@@ -3,7 +3,7 @@

 #include <escher.h>
 #include "storage_function.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Shared {

--- a/apps/shared/store_parameter_controller.h
+++ b/apps/shared/store_parameter_controller.h
@@ -3,7 +3,7 @@

 #include <escher.h>
 #include "double_pair_store.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Shared {

--- a/apps/shared/text_field_delegate_app.h
+++ b/apps/shared/text_field_delegate_app.h
@@ -4,7 +4,7 @@
 #include <poincare/context.h>
 #include <escher.h>
 #include "input_event_handler_delegate_app.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 class AppsContainer;

--- a/apps/shared/values_controller.h
+++ b/apps/shared/values_controller.h
@@ -9,7 +9,7 @@
 #include "values_parameter_controller.h"
 #include "values_function_parameter_controller.h"
 #include "interval_parameter_controller.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Shared {

--- a/apps/shared/values_function_parameter_controller.h
+++ b/apps/shared/values_function_parameter_controller.h
@@ -3,7 +3,7 @@

 #include <escher.h>
 #include "function.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Shared {

--- a/apps/shared/zoom_parameter_controller.h
+++ b/apps/shared/zoom_parameter_controller.h
@@ -4,7 +4,7 @@
 #include <escher.h>
 #include "interactive_curve_view_range.h"
 #include "curve_view.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Shared {

--- a/apps/shift_alpha_lock_view.h
+++ b/apps/shift_alpha_lock_view.h
@@ -3,7 +3,7 @@

 #include <escher.h>
 #include "lock_view.h"
-#include "i18n.h"
+#include <apps/i18n.h>

 class ShiftAlphaLockView : public View {
 public:
--- a/apps/solver/app.cpp
+++ b/apps/solver/app.cpp
@@ -1,5 +1,5 @@
 #include "app.h"
-#include "../i18n.h"
+#include <apps/i18n.h>
 #include "solver_icon.h"

 using namespace Shared;
--- a/apps/solver/equation_models_parameter_controller.cpp
+++ b/apps/solver/equation_models_parameter_controller.cpp
@@ -3,7 +3,7 @@
 #include "../constant.h"
 #include <assert.h>
 #include <poincare/layout_helper.h>
-#include "../i18n.h"
+#include <apps/i18n.h>

 using namespace Poincare;

--- a/apps/solver/interval_controller.cpp
+++ b/apps/solver/interval_controller.cpp
@@ -1,6 +1,6 @@
 #include "interval_controller.h"
 #include "app.h"
-#include "../i18n.h"
+#include <apps/i18n.h>
 #include <assert.h>
 #include <string.h>

--- a/apps/solver/list_controller.h
+++ b/apps/solver/list_controller.h
@@ -8,7 +8,7 @@
 #include "equation_store.h"
 #include "equation_list_view.h"
 #include "equation_models_parameter_controller.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Solver {

--- a/apps/solver/solutions_controller.h
+++ b/apps/solver/solutions_controller.h
@@ -4,7 +4,7 @@
 #include <escher.h>
 #include "equation_store.h"
 #include "../shared/scrollable_exact_approximate_expressions_cell.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Solver {

--- a/apps/statistics/app.cpp
+++ b/apps/statistics/app.cpp
@@ -1,6 +1,6 @@
 #include "app.h"
 #include "stat_icon.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 using namespace Shared;

--- a/apps/statistics/box_banner_view.h
+++ b/apps/statistics/box_banner_view.h
@@ -3,7 +3,7 @@

 #include <escher.h>
 #include "../shared/banner_view.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Statistics {

--- a/apps/statistics/histogram_banner_view.h
+++ b/apps/statistics/histogram_banner_view.h
@@ -3,7 +3,7 @@

 #include <escher.h>
 #include "../shared/banner_view.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace Statistics {

--- a/apps/statistics/multiple_data_view_controller.cpp
+++ b/apps/statistics/multiple_data_view_controller.cpp
@@ -1,5 +1,5 @@
 #include "multiple_data_view_controller.h"
-#include "../i18n.h"
+#include <apps/i18n.h>
 #include <assert.h>

 using namespace Shared;
--- a/apps/title_bar_view.h
+++ b/apps/title_bar_view.h
@@ -4,7 +4,7 @@
 #include <escher.h>
 #include "battery_view.h"
 #include "shift_alpha_lock_view.h"
-#include "i18n.h"
+#include <apps/i18n.h>

 class TitleBarView : public View {
 public:
--- a/apps/usb/usb_connected_controller.cpp
+++ b/apps/usb/usb_connected_controller.cpp
@@ -1,5 +1,5 @@
 #include "usb_connected_controller.h"
-#include "../i18n.h"
+#include <apps/i18n.h>

 namespace USB {

--- a/apps/variable_box_controller.h
+++ b/apps/variable_box_controller.h
@@ -6,7 +6,7 @@
 #include <escher.h>
 #include "shared/global_context.h"
 #include "variable_box_empty_controller.h"
-#include "i18n.h"
+#include <apps/i18n.h>

 class VariableBoxController : public NestedMenuController {
 public:
--- a/apps/variable_box_empty_controller.cpp
+++ b/apps/variable_box_empty_controller.cpp
@@ -1,7 +1,7 @@
 #include "variable_box_empty_controller.h"
 #include <poincare/layout_helper.h>
 #include "graph/storage_cartesian_function_store.h"
-#include "i18n.h"
+#include <apps/i18n.h>
 #include <assert.h>

 using namespace Poincare;