From dcf824c6fe30f6d94b1f9c4ca1ab3091f295589a Mon Sep 17 00:00:00 2001
From: Ahmed Siam <aahs.coder@gmail.com>
Date: Sun, 3 Sep 2023 09:09:13 +0300
Subject: [PATCH] Change icuformat to formatmsg & update build.yml

---
 .github/workflows/build.yaml             | 4 ++--
 .gitignore                               | 2 +-
 lttoolbox/Makefile.am                    | 4 ++--
 lttoolbox/{icuformat.cc => formatmsg.cc} | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename lttoolbox/{icuformat.cc => formatmsg.cc} (88%)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 24399e06..9739672d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -17,7 +17,7 @@ jobs:
       run: ./configure --disable-static --enable-python-bindings
     - name: build
       run: make -j4 V=1 VERBOSE=1
-    - name: tests
-      run: make test
     - name: make install
       run: sudo make install
+    - name: tests
+      run: make test
diff --git a/.gitignore b/.gitignore
index b1e7137a..3b17de9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,7 +80,7 @@
 /lttoolbox/lt-invert
 /lttoolbox/lt-restrict
 /lttoolbox/lt-apply-acx
-/lttoolbox/icuformat
+/lttoolbox/formatmsg
 /python/Makefile
 /python/Makefile.in
 /python/lttoolbox.i
diff --git a/lttoolbox/Makefile.am b/lttoolbox/Makefile.am
index 0c7f7452..000dbce2 100644
--- a/lttoolbox/Makefile.am
+++ b/lttoolbox/Makefile.am
@@ -14,7 +14,7 @@ cc_sources = acx.cc alphabet.cc att_compiler.cc cli.cc compiler.cc compression.c
 library_includedir = $(includedir)/$(PACKAGE_NAME)
 library_include_HEADERS = $(h_sources)
 
-bin_PROGRAMS = lt-comp lt-proc lt-expand lt-paradigm lt-tmxcomp lt-tmxproc lt-print lt-trim lt-compose lt-append lsx-comp lt-invert lt-restrict lt-apply-acx icuformat
+bin_PROGRAMS = lt-comp lt-proc lt-expand lt-paradigm lt-tmxcomp lt-tmxproc lt-print lt-trim lt-compose lt-append lsx-comp lt-invert lt-restrict lt-apply-acx formatmsg
 instdir = lttoolbox
 
 lib_LTLIBRARIES= liblttoolbox.la
@@ -46,7 +46,7 @@ lsx_comp_SOURCES = lt_comp.cc
 lt_invert_SOURCES = lt_invert.cc
 lt_restrict_SOURCES = lt_restrict.cc
 lt_apply_acx_SOURCES = lt_apply_acx.cc
-icuformat_SOURCES = icuformat.cc
+formatmsg_SOURCES = formatmsg.cc
 
 #lt-validate-dictionary: Makefile.am validate-header.sh
 #	@echo "Creating lt-validate-dictionary script"
diff --git a/lttoolbox/icuformat.cc b/lttoolbox/formatmsg.cc
similarity index 88%
rename from lttoolbox/icuformat.cc
rename to lttoolbox/formatmsg.cc
index 5fe81b25..74b58e8a 100644
--- a/lttoolbox/icuformat.cc
+++ b/lttoolbox/formatmsg.cc
@@ -1,10 +1,10 @@
 #include <iostream>
-#include "lttoolbox/i18n.h"
+#include <lttoolbox/i18n.h>
 
 int main(int argc, char* argv[])
 {
     if (argc < 4 || argc % 2 != 0) {
-        std::cout << "USAGE: icuformat <data-path> <package-name> <key> <arg-names> <arg-values>\n";
+        std::cout << "USAGE: formatmsg <data-path> <package-name> <key> <arg-names> <arg-values>\n";
         return 0;
     }