Move wmlxgettext to the data/tools directory so that it's automatical…

…ly included in official packages
wesnoth · Sep 8, 2018 · 59e78e5 · 59e78e5
1 parent cc98bcd
commit 59e78e5
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 4 deletions.
diff --git a/data/tools/GUI.pyw b/data/tools/GUI.pyw
@@ -40,7 +40,6 @@ APP_DIR,APP_NAME=os.path.split(os.path.realpath(sys.argv[0]))
 WESNOTH_ROOT_DIR=os.sep.join(APP_DIR.split(os.sep)[:-2])  # pop out "data" and "tools"
 WESNOTH_DATA_DIR=os.path.join(WESNOTH_ROOT_DIR,"data")
 WESNOTH_CORE_DIR=os.path.normpath(os.path.join(WESNOTH_DATA_DIR,"core"))
-WMLXGETTEXT_DIR=os.path.normpath(os.path.join(WESNOTH_ROOT_DIR,"utils"))
 
 def wrap_elem(line):
     """If the supplied line contains spaces, return it wrapped between double quotes"""
@@ -1294,7 +1293,7 @@ wmlindent will be run on the Wesnoth core directory""")
     def on_run_wmlxgettext(self):
         # build the command line and add the path of the Python interpreter
         wmlxgettext_command_string=[sys.executable]
-        wmlxgettext_command_string.append(os.path.join(WMLXGETTEXT_DIR,"wmlxgettext"))
+        wmlxgettext_command_string.append(os.path.join(APP_DIR,"wmlxgettext"))
         textdomain=self.wmlxgettext_tab.domain_variable.get()
         if textdomain:
             wmlxgettext_command_string.extend(["--domain",textdomain])

diff --git a/utils/pywmlx/__init__.py → data/tools/pywmlx/__init__.py b/utils/pywmlx/__init__.py → data/tools/pywmlx/__init__.py
diff --git a/utils/pywmlx/autof.py → data/tools/pywmlx/autof.py b/utils/pywmlx/autof.py → data/tools/pywmlx/autof.py
diff --git a/utils/pywmlx/nodemanip.py → data/tools/pywmlx/nodemanip.py b/utils/pywmlx/nodemanip.py → data/tools/pywmlx/nodemanip.py
diff --git a/utils/pywmlx/postring.py → data/tools/pywmlx/postring.py b/utils/pywmlx/postring.py → data/tools/pywmlx/postring.py
diff --git a/utils/pywmlx/state/__init__.py → data/tools/pywmlx/state/__init__.py b/utils/pywmlx/state/__init__.py → data/tools/pywmlx/state/__init__.py
diff --git a/utils/pywmlx/state/lua_states.py → data/tools/pywmlx/state/lua_states.py b/utils/pywmlx/state/lua_states.py → data/tools/pywmlx/state/lua_states.py
diff --git a/utils/pywmlx/state/machine.py → data/tools/pywmlx/state/machine.py b/utils/pywmlx/state/machine.py → data/tools/pywmlx/state/machine.py
diff --git a/utils/pywmlx/state/state.py → data/tools/pywmlx/state/state.py b/utils/pywmlx/state/state.py → data/tools/pywmlx/state/state.py
diff --git a/utils/pywmlx/state/wml_states.py → data/tools/pywmlx/state/wml_states.py b/utils/pywmlx/state/wml_states.py → data/tools/pywmlx/state/wml_states.py
diff --git a/utils/pywmlx/wmlerr.py → data/tools/pywmlx/wmlerr.py b/utils/pywmlx/wmlerr.py → data/tools/pywmlx/wmlerr.py
diff --git a/utils/wmlxgettext → data/tools/wmlxgettext b/utils/wmlxgettext → data/tools/wmlxgettext
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
@@ -42,7 +42,7 @@ set(DOMAINS
 # If a source file has not GETTEXT_DOMAIN it belongs to this domain.
 set(DEFAULT_DOMAIN wesnoth)
 
-set(WMLXGETTEXT ${PROJECT_SOURCE_DIR}/utils/wmlxgettext)
+set(WMLXGETTEXT ${PROJECT_SOURCE_DIR}/data/tools/wmlxgettext)
 
 ############ pot update. ###########
 

diff --git a/po/SConscript b/po/SConscript
@@ -73,7 +73,7 @@ if "pot-update" in COMMAND_LINE_TARGETS:
             wml_pot = env.Command(
                 join(domain, domain + ".wml.pot"),
                 cfgs,
-                "utils/wmlxgettext --directory=. --domain=%s $SOURCES -o $TARGET" % domain
+                "data/tools/wmlxgettext --directory=. --domain=%s $SOURCES -o $TARGET" % domain
                 )
 
         new_pot = str(pot) + ".new"