Refactor publishing rules

This commit is contained in:
Ehmry - 2019-03-04 19:58:42 +01:00
parent d4b1b28087
commit 990901e3c4
20 changed files with 76 additions and 89 deletions

View File

@ -36,14 +36,31 @@ ERRATA_DIR = $(TUP_CWD)/errata
!raw_to_depot = |> ^ raw/%d/%b^ cp -r %f %o |> $(DEPOT_RAW_DIR)/%d/@(DEPOT_VERSION)/%b
ifdef DEPOT_KEY
ifndef DEPOT_KEY
!depot_bin_tarball = |> ^o archive %d binary^ tar cfJ %o -C $(DEPOT_BIN_DIR)/%d . |> $(PUBLIC_BIN_DIR)/%d/@(DEPOT_VERSION).tar.xz
!publish_bin = |> |>
!publish_raw = |> |>
!publish_pkg = |> |>
!depot_pkg_tarball = |> ^o archive %d package^ tar cfJ %o -C $(DEPOT_PKG_DIR)/%d . |> $(PUBLIC_PKG_DIR)/%d/@(DEPOT_VERSION).tar.xz
else
!depot_raw_tarball = |> ^o archive %d raw^ tar cfJ %o -C $(DEPOT_RAW_DIR)/%d . |> $(PUBLIC_RAW_DIR)/%d/@(DEPOT_VERSION).tar.xz
SIGN_CMD = gpg --detach-sign --digest-algo SHA256 --no-tty --local-user @(DEPOT_KEY)
!public_signature = |> ^ sign %b^ gpg --detach-sign --digest-algo SHA256 --no-tty --local-user @(DEPOT_KEY) - < %f > %o |> %f.sig
!publish_bin = |> ^o publish %d binary^ \
tar cfJ %o -C $(DEPOT_BIN_DIR)/%d . ; $(SIGN_CMD) < %o > %o.sig \
|> $(PUBLIC_BIN_DIR)/%d/@(DEPOT_VERSION).tar.xz \
| $(PUBLIC_BIN_DIR)/%d/@(DEPOT_VERSION).tar.xz.sig
!publish_raw = |> ^o publish %d raw^ \
tar cfJ %o -C $(DEPOT_RAW_DIR)/%d . ; $(SIGN_CMD) < %o > %o.sig \
|> $(PUBLIC_RAW_DIR)/%d/@(DEPOT_VERSION).tar.xz \
| $(PUBLIC_RAW_DIR)/%d/@(DEPOT_VERSION).tar.xz.sig
!publish_pkg = |> ^o publish %d package^ \
tar cfJ %o -C $(DEPOT_PKG_DIR)/%d . ; $(SIGN_CMD) < %o > %o.sig \
|> $(PUBLIC_PKG_DIR)/%d/@(DEPOT_VERSION).tar.xz \
| $(PUBLIC_PKG_DIR)/%d/@(DEPOT_VERSION).tar.xz.sig
!public_signature = |> ^ sign %b^ $(SIGN_CMD) < %f > %o |> %f.sig
endif

View File

@ -41,6 +41,5 @@ LDFLAGS += `pkg-config --libs $(PKG_CONFIGS)`
: libflif.lib.so |> strip -o %o %f |> $(DEPOT_BIN_DIR)/%d/@(DEPOT_VERSION)/%b {binary}
ifdef DEPOT_KEY
: {binary} |> !depot_bin_tarball |> {tarballs}
: foreach {tarballs} |> !public_signature |>
: {binary} |> !publish_bin |>
endif

View File

@ -12,8 +12,5 @@ include upstream/Makefile.common
: $(TUP_CWD)/archives |> !publish_core_archives |> {package}
: $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
ifdef DEPOT_KEY
: {binary} |> !core_bin_tarball |> {tarballs}
: {package} |> !core_pkg_tarball |> {tarballs}
: foreach {tarballs} |> !public_signature |>
endif
: {binary} |> !core_publish_bin |>
: {package} |> !core_publish_pkg |>

View File

@ -25,8 +25,5 @@ CFLAGS += $(FLAGS)
: $(TUP_CWD)/archives |> !publish_core_archives |> {package}
: $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
ifdef DEPOT_KEY
: {binary} |> !core_bin_tarball |> {tarballs}
: {package} |> !core_pkg_tarball |> {tarballs}
: foreach {tarballs} |> !public_signature |>
endif
: {binary} |> !core_publish_bin |>
: {package} |> !core_publish_pkg |>

View File

@ -43,17 +43,30 @@ DEPOT_NAME = libretro-$(TARGET_NAME)
!publish_core_metadata = |> ^ copy %b^ cp %f %o \
|> $(DEPOT_PKG_DIR)/$(TARGET_NAME)/@(DEPOT_VERSION)/%b
!core_bin_tarball = |> ^o archive binaries^ \
tar cfJ %o -C $(DEPOT_BIN_DIR)/$(DEPOT_NAME) . \
|> $(PUBLIC_BIN_DIR)/$(DEPOT_NAME)/@(DEPOT_VERSION).tar.xz
ifndef DEPOT_KEY
!core_pkg_tarball = |> ^o archive package metadata^ \
tar cfJ %o -C $(DEPOT_PKG_DIR)/$(TARGET_NAME) . \
|> $(PUBLIC_PKG_DIR)/$(TARGET_NAME)/@(DEPOT_VERSION).tar.xz
!core_publish_bin = |> |>
!core_publish_pkg = |> |>
!core_publish_raw = |> |>
!core_raw_tarball = |> ^o archive raw files^ \
tar cfJ %o -C $(DEPOT_RAW_DIR)/$(DEPOT_NAME) . \
|> $(PUBLIC_RAW_DIR)/$(DEPOT_NAME)/@(DEPOT_VERSION).tar.xz
else
!core_publish_bin = |> ^o archive binaries^ \
tar cfJ %o -C $(DEPOT_BIN_DIR)/$(DEPOT_NAME) . ; $(SIGN_CMD) < %o > %o.sig \
|> $(PUBLIC_BIN_DIR)/$(DEPOT_NAME)/@(DEPOT_VERSION).tar.xz \
| $(PUBLIC_BIN_DIR)/$(DEPOT_NAME)/@(DEPOT_VERSION).tar.xz.sig
!core_publish_pkg = |> ^o archive package metadata^ \
tar cfJ %o -C $(DEPOT_PKG_DIR)/$(TARGET_NAME) . ; $(SIGN_CMD) < %o > %o.sig \
|> $(PUBLIC_PKG_DIR)/$(TARGET_NAME)/@(DEPOT_VERSION).tar.xz \
| $(PUBLIC_PKG_DIR)/$(TARGET_NAME)/@(DEPOT_VERSION).tar.xz.sig
!core_publish_raw = |> ^o archive raw files^ \
tar cfJ %o -C $(DEPOT_RAW_DIR)/$(DEPOT_NAME) . ; $(SIGN_CMD) < %o > %o.sig \
|> $(PUBLIC_RAW_DIR)/$(DEPOT_NAME)/@(DEPOT_VERSION).tar.xz \
| $(PUBLIC_RAW_DIR)/$(DEPOT_NAME)/@(DEPOT_VERSION).tar.xz.sig
endif
LINK_T = $(TUP_CWD)/link.T
CFLAGS += -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565

View File

@ -26,8 +26,5 @@ CXXFLAGS += -DHAVE_MMAP
: $(TUP_CWD)/archives | {core} |> !publish_core_archives |> {package}
: $(TUP_CWD)/runtime | {core} |> !publish_core_runtime |> {package}
ifdef DEPOT_KEY
: {binary} |> !core_bin_tarball |> {tarballs}
: {package} |> !core_pkg_tarball |> {tarballs}
: foreach {tarballs} |> !public_signature |>
endif
: {binary} |> !core_publish_bin |>
: {package} |> !core_publish_pkg |>

View File

@ -21,8 +21,5 @@ CFLAGS += $(INCFLAGS)
: $(TUP_CWD)/archives |> !publish_core_archives |> {package}
: $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
ifdef DEPOT_KEY
: {binary} |> !core_bin_tarball |> {tarballs}
: {package} |> !core_pkg_tarball |> {tarballs}
: foreach {tarballs} |> !public_signature |>
endif
: {binary} |> !core_publish_bin |>
: {package} |> !core_publish_pkg |>

View File

@ -18,8 +18,5 @@ include upstream/Makefile.common
: $(TUP_CWD)/archives |> !publish_core_archives |> {package}
: $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
ifdef DEPOT_KEY
: {binary} |> !core_bin_tarball |> {tarballs}
: {package} |> !core_pkg_tarball |> {tarballs}
: foreach {tarballs} |> !public_signature |>
endif
: {binary} |> !core_publish_bin |>
: {package} |> !core_publish_pkg |>

View File

@ -19,8 +19,5 @@ CFLAGS += $(INCLUDES)
: $(TUP_CWD)/archives |> !publish_core_archives |> {package}
: $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
ifdef DEPOT_KEY
: {binary} |> !core_bin_tarball |> {tarballs}
: {package} |> !core_pkg_tarball |> {tarballs}
: foreach {tarballs} |> !public_signature |>
endif
: {binary} |> !core_publish_bin |>
: {package} |> !core_publish_pkg |>

View File

@ -21,8 +21,5 @@ include upstream/Makefile.common
: $(TUP_CWD)/archives |> !publish_core_archives |> {package}
: $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
ifdef DEPOT_KEY
: {binary} |> !core_bin_tarball |> {tarballs}
: {package} |> !core_pkg_tarball |> {tarballs}
: foreach {tarballs} |> !public_signature |>
endif
: {binary} |> !core_publish_bin |>
: {package} |> !core_publish_pkg |>

View File

@ -21,8 +21,5 @@ CXXFLAGS += -fno-rtti -fno-exceptions -std=gnu++11
: $(TUP_CWD)/archives | {core} |> !publish_core_archives |> {package}
: $(TUP_CWD)/runtime | {core} |> !publish_core_runtime |> {package}
ifdef DEPOT_KEY
: {binary} |> !core_bin_tarball |> {tarballs}
: {package} |> !core_pkg_tarball |> {tarballs}
: foreach {tarballs} |> !public_signature |>
endif
: {binary} |> !core_publish_bin |>
: {package} |> !core_publish_pkg |>

View File

@ -18,9 +18,5 @@ CFLAGS += $(INCFLAGS)
: $(TUP_CWD)/archives |> !publish_core_archives |> {package}
: $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
ifdef DEPOT_KEY
: {binary} |> !core_bin_tarball |> {tarballs}
: {package} |> !core_pkg_tarball |> {tarballs}
: {raw} |> !core_raw_tarball |> {tarballs}
: foreach {tarballs} |> !public_signature |>
endif
: {binary} |> !core_publish_bin |>
: {package} |> !core_publish_pkg |>

View File

@ -139,8 +139,5 @@ endif
: README.md |> !publish_core_metadata |> {package}
ifdef DEPOT_KEY
: {binary} |> !core_bin_tarball |> {tarballs}
: {package} |> !core_pkg_tarball |> {tarballs}
: foreach {tarballs} |> !public_signature |>
endif
: {binary} |> !core_publish_bin |>
: {package} |> !core_publish_pkg |>

View File

@ -27,7 +27,6 @@ include upstream/common/module.mk
#: $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
ifdef DEPOT_KEY
: {binary} |> !depot_bin_tarball |> {tarballs}
: {package} |> !depot_pkg_tarball |> {tarballs}
: foreach {tarballs} |> !public_signature |>
: {binary} |> !publish_bin |> {tarballs}
: {package} |> !publish_pkg |> {tarballs}
endif

View File

@ -23,8 +23,5 @@ CXXFLAGS += -DRIGHTSHIFT_IS_SAR -D__LIBRETRO__ -DALLOW_CPU_OVERCLOCK
: $(TUP_CWD)/archives |> !publish_core_archives |> {package}
: $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
ifdef DEPOT_KEY
: {binary} |> !core_bin_tarball |> {tarballs}
: {package} |> !core_pkg_tarball |> {tarballs}
: foreach {tarballs} |> !public_signature |>
endif
: {binary} |> !core_publish_bin |>
: {package} |> !core_publish_pkg |>

View File

@ -30,8 +30,5 @@ include upstream/Makefile.common
: $(TUP_CWD)/archives |> !publish_core_archives |> {package}
: $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
ifdef DEPOT_KEY
: {binary} |> !core_bin_tarball |> {tarballs}
: {package} |> !core_pkg_tarball |> {tarballs}
: foreach {tarballs} |> !public_signature |>
endif
: {binary} |> !core_publish_bin |>
: {package} |> !core_publish_pkg |>

View File

@ -7,6 +7,5 @@ NIM_RELEASE_FLAG = -d:release
: foreach {output} |> !strip_to_depot |> {binary}
ifdef DEPOT_KEY
: {binary} |> !depot_bin_tarball |> {tarballs}
: foreach {tarballs} |> !public_signature |>
: {binary} |> !publish_bin |>
endif

View File

@ -4,6 +4,5 @@ include_rules
: runtime | ./<binaries> |> !runtime_to_depot |> {package}
ifdef DEPOT_KEY
: {package} |> !depot_pkg_tarball |> {tarball}
: {tarball} |> !public_signature |>
: {package} |> !publish_pkg |>
endif

View File

@ -16,7 +16,6 @@ SHA256 = d8dcb02f96108720c451b0858dab42ac2ad6fc47442298b3a5338b14bfc76f30
: machine.vdi |> !raw_to_depot |> {raw}
ifdef DEPOT_KEY
: {package} |> !depot_pkg_tarball |> {tarballs}
: {raw} |> !depot_raw_tarball |> {tarballs}
: foreach {tarballs} |> !public_signature |>
: {package} |> !publish_pkg |>
: {raw} |> !publish_raw |>
endif

View File

@ -6,6 +6,5 @@ include_rules
: $(TUP_CWD)/archives |> !archives_to_depot |> {package}
ifdef DEPOT_KEY
: {package} |> !depot_pkg_tarball |> {tarball}
: {tarball} |> !public_signature |>
: {package} |> !publish_pkg |>
endif