diff --git a/Makefile b/Makefile index fd2f8a0..03f9b18 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,7 @@ MB_I18N_ASSERT_SUCCESS = アサート成功 MB_I18N_AUTOEXEC_WRITE = 自動実行の書き込み MB_I18N_CONV_UNIX2DOS = ディスクシステムの行末に変換 MB_I18N_CONV_DOS2UNIX = メインフレームラインエンドに変換 +MB_I18N_PACKAGE_CREATE_ARCHIVE = ビルド配布アーカイブ MB_I18N_MAKE_CHECK_ARG1 = 引数 一 がありません MB_I18N_MAKE_CHECK_ARG2 = 引数 二 がありません MB_I18N_MAKE_CHECK_ARG3 = 引数 三 がありません diff --git a/lib/make/mb_i18n.mk b/lib/make/mb_i18n.mk index 25629b1..2e376b2 100644 --- a/lib/make/mb_i18n.mk +++ b/lib/make/mb_i18n.mk @@ -11,6 +11,9 @@ $(call mb_make_call,mb_doc_variable_i18n,MB_I18N_CONV_UNIX2DOS,"Message for when MB_I18N_CONV_DOS2UNIX ?= Convert to nix-EOL $(call mb_make_call,mb_doc_variable_i18n,MB_I18N_CONV_DOS2UNIX,"Message for when converting a file to unix.") +MB_I18N_PACKAGE_CREATE_ARCHIVE ?= Build distribution archive +$(call mb_make_call,mb_doc_variable_i18n,MB_I18N_PACKAGE_CREATE_ARCHIVE,"Message for when creating a archive.") + MB_I18N_MAKE_CHECK_ARG1 ?= Argument 1 is missing $(call mb_make_call,mb_doc_variable_i18n,MB_I18N_MAKE_CHECK_ARG1,"Error message when argument 1 is missing.") diff --git a/lib/make/msxbuild.mk b/lib/make/msxbuild.mk index e5f20bf..3c236eb 100644 --- a/lib/make/msxbuild.mk +++ b/lib/make/msxbuild.mk @@ -18,6 +18,7 @@ include $(MB__BASEPATH)/lib/make/प्रणाली/mb_make.mk include $(MB__BASEPATH)/lib/make/ᐊᑐᕐᓗᒍ/mb_os.mk include $(MB__BASEPATH)/lib/make/ᐊᑐᕐᓗᒍ/mb_conv.mk include $(MB__BASEPATH)/lib/make/ᐊᑐᕐᓗᒍ/mb_sdcc.mk +include $(MB__BASEPATH)/lib/make/ᐊᑐᕐᓗᒍ/mb_package.mk include $(MB__BASEPATH)/lib/make/麥加系統擴大/mb_msxrom.mk include $(MB__BASEPATH)/lib/make/麥加系統擴大/mb_msxhub.mk include $(MB__BASEPATH)/lib/make/麥加系統擴大/mb_msxpipe.mk @@ -34,11 +35,3 @@ $(call mb_make_call,mb_doc_variable_rock,MB__RECIPEPREFIX,"Recipe prefix to rest $(call mb_make_call,mb_doc_variable_rock,MB__BASEPATH,"Path where msxbuild lib folder is located.") $(call mb_make_call,mb_doc_variable_rock,MB__BASEPATH_REAL,"Resolved real path of msxbuild.") - -# TODO: move to mb_package.mk -define mb_create_dist -$(MB__    )$(call mb_make_call,mb_os_echo_command,Creating distribution archive $(2)) -$(MB__    )tar -czf $(2) -C $(1) `ls $(1)` -endef -$(call mb_make_call,mb_doc_function,mb_create_dist,"Create an distribution archive."," ") - diff --git a/lib/make/ᐊᑐᕐᓗᒍ/mb_package.mk b/lib/make/ᐊᑐᕐᓗᒍ/mb_package.mk new file mode 100644 index 0000000..e900a0c --- /dev/null +++ b/lib/make/ᐊᑐᕐᓗᒍ/mb_package.mk @@ -0,0 +1,7 @@ + +define mb_package_create_archive +$(MB__    )$(call mb_make_call,mb_os_echo_command,$(MB_I18N_PACKAGE_CREATE_ARCHIVE) $(2)) +$(MB__    )tar -czf $(2) -C $(1) `ls $(1)` +endef +$(call mb_make_call,mb_doc_function,mb_package_create_archive,"Create an distribution archive."," ") + diff --git a/src/dist/0module.mk b/src/dist/0module.mk index 8492d0a..2503ce7 100644 --- a/src/dist/0module.mk +++ b/src/dist/0module.mk @@ -23,7 +23,7 @@ $(call mb_make_call,mb_doc_target,$(DIST_BIN)/@prepare,"Prepare folder with bina $(call mb_make_call,mb_make_flag_phony,$(DIST_BIN)/@prepare) $(DIST_OUT): | $(DIST_BIN)/@prepare - $(call mb_make_call,mb_create_dist,$(DIST_BIN),$@) + $(call mb_make_call,mb_package_create_archive,$(DIST_BIN),$@) $(call mb_make_call,mb_doc_target,$(DIST_OUT),"Build archive distribution artifact.") $(call mb_make_call,mb_proj_grow_deps_phase_package,$(DIST_OUT))