diff options
| author | Choe Hwanjin <choe.hwanjin@gmail.com> | 2022-08-20 14:32:22 +0900 |
|---|---|---|
| committer | Choe Hwanjin <choe.hwanjin@gmail.com> | 2022-08-20 15:01:04 +0900 |
| commit | 576469d6ce1363032af80f25375d8bac7f0abc04 (patch) | |
| tree | e6bd5aaa00cf92b68ad5645478582adda60a7e69 | |
| parent | 313b888f1df00f8e476c3ba25a8ce619baaefc91 (diff) | |
| download | libhangul-576469d6ce1363032af80f25375d8bac7f0abc04.tar.gz | |
keyboard: Always specify SUFFIX on sed -i option
On macOS, `sed -i` without SUFFIX option reports an error:
```
sed: -e: No such file or directory
```
hangul-keyboard-*.name.xml.tmp are intermediate files.
They should be cleaned.
BYPRODUCTS option is simpler to use than ADDITIONAL_MAKE_CLEAN_FILES.
It is available from 3.2.
https://github.com/libhangul/libhangul/issues/63
| -rw-r--r-- | data/keyboards/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | data/keyboards/Makefile.am | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/data/keyboards/CMakeLists.txt b/data/keyboards/CMakeLists.txt index fea4951..0b572bb 100644 --- a/data/keyboards/CMakeLists.txt +++ b/data/keyboards/CMakeLists.txt @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.2) #include(GNUInstallDirs) find_package(Gettext) @@ -72,7 +72,7 @@ foreach(i ${keyboard_file_list}) OUTPUT "${keyboard_name}.xml" COMMAND - sed -i -e '1 D' + sed -i.tmp -e '1 D' -e '/^<hangul-keyboard/D' -e '/^<\\/hangul-keyboard/D' -e 's/^ *<name/ <name/' "${keyboard_name}.name.xml" @@ -81,6 +81,8 @@ foreach(i ${keyboard_file_list}) -e '/<name>/r ${keyboard_name}.name.xml' -e '/<name>/D' "${CMAKE_CURRENT_SOURCE_DIR}/${keyboard_name}.xml.template" > "${keyboard_name}.xml" + BYPRODUCTS + "${keyboard_name}.name.xml.tmp" DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${keyboard_name}.name.xml" "${keyboard_name}.xml.template" diff --git a/data/keyboards/Makefile.am b/data/keyboards/Makefile.am index 15db898..fafb870 100644 --- a/data/keyboards/Makefile.am +++ b/data/keyboards/Makefile.am @@ -38,7 +38,7 @@ MSGFMT_COMMAND = env GETTEXTDATADIRS=$(srcdir) $(MSGFMT) # name.xml로 만들어 (msgfmt 입출력은 valid XML만 가능하므로 root node도 포함.) # 번역한후 template과 name.xml을 병합하여 키보드 xml 파일을 생성한다. hangul-keyboard-%.xml: hangul-keyboard-%.name.xml hangul-keyboard-%.xml.template - sed -i -e '1 D' \ + sed -i.tmp -e '1 D' \ -e '/^<hangul-keyboard/D' \ -e '/^<\/hangul-keyboard/D' \ -e 's/^ *<name/ <name/' $< @@ -66,4 +66,13 @@ CLEANFILES = \ hangul-keyboard-3y.xml \ hangul-keyboard-ro.xml \ hangul-keyboard-ahn.xml \ + hangul-keyboard-2.name.xml.tmp \ + hangul-keyboard-2y.name.xml.tmp \ + hangul-keyboard-39.name.xml.tmp \ + hangul-keyboard-3f.name.xml.tmp \ + hangul-keyboard-32.name.xml.tmp \ + hangul-keyboard-3s.name.xml.tmp \ + hangul-keyboard-3y.name.xml.tmp \ + hangul-keyboard-ro.name.xml.tmp \ + hangul-keyboard-ahn.name.xml.tmp \ $(NULL) |