Finalize raw packages using "include $(RAW_RULES)"

See 'Finalize binary packages using "include $(BIN_RULES)"'.

Tuprules.tup

@@ -42,14 +42,16 @@ PKG_DIR = $(DEPOT_BIN_DIR)/$(BIN_NAME)/current
 	echo local/raw/$(RAW_NAME)/$(RAW_VERSION) > %o \
 |> $(RAW_DIR)/.ARCHIVES $(DEPOT_DIR)/<raw-archives>
 
-BIN_RULES = $(TUP_CWD)/errata/bin.tup
-	# Rules for finalizing a locally defined binary package
-
 !bin = |> ^ COLLECT %o^ \
 	echo $(BIN_DEPENDS) local/src/$(BIN_NAME)/$(BIN_VERSION) | tr ' ' '\n' > %o; \
 |> $(BIN_DIR)/.ARCHIVES $(DEPOT_DIR)/<bin-archives>
 	# Macro invoked in BIN_RULES
 
+RAW_RULES = $(TUP_CWD)/errata/raw.tup
+	# Rules for finalizing a locally defined raw package
+BIN_RULES = $(TUP_CWD)/errata/bin.tup
+	# Rules for finalizing a locally defined binary package
+
 AWK_LOCAL_ARCHIVES = awk -F '/' \
 	'{if ($1 != "local") {print $0} \
 		else {print $1"/"$2"/"$3"/current"}}'

errata/raw.tup

@@ -0,0 +1,14 @@
+ifeq ($(RAW_NAME),)
+error RAW_NAME is empty
+endif
+
+ifeq ($(RAW_VERSION),)
+error RAW_VERSION is empty
+endif
+
+: |> !raw |>
+	# Finalize the metadata with the macro defined in the
+	# ../Tuprules.tup. The macro cannot be defined here
+	# because the "include" directive is not available for
+	# relative paths during "include_rules" so this file
+	# cannot be included by intermediate Tuprules.tup.

libretro/games/streemerz/Tupfile

@@ -11,12 +11,12 @@ include_rules
 		README.txt streemerz-v02.nes -d $(RAW_DIR) \
 	|> $(RAW_DIR)/README.txt $(RAW_DIR)/streemerz-v02.nes {unzipped}
 
-: |> !raw |>
-
 PKG_DEPENDS += \
 	_/pkg/fceumm \
 	_/raw/$(TARGET_NAME) \
 
 : runtime |> !collect_pkg_runtime |>
 
+include $(RAW_RULES)
+
 endif

libretro/tests/240pSuite-SNES/Tupfile

@@ -8,10 +8,9 @@ include_rules
 		-d $(RAW_DIR) \
 	|> $(RAW_DIR)/240pSuite.sfc $(RAW_DIR)/README.TXT {unzipped}
 
-: |> !raw |>
-
 PKG_DEPENDS += \
 	_/pkg/snes9x \
 	_/raw/$(TARGET_NAME) \
 
 : runtime |> !collect_pkg_runtime |>
+include $(RAW_RULES)

libretro/tests/240pee-NES/Tupfile

@@ -8,10 +8,9 @@ include_rules
 		-d $(RAW_DIR) \
 	|> $(RAW_DIR)/240pee.nes $(RAW_DIR)/240pee-bnrom.nes $(RAW_DIR)/README.md {unzipped}
 
-: |> !raw |>
-
 PKG_DEPENDS += \
 	_/pkg/fceumm \
 	_/raw/$(TARGET_NAME) \
 
 : runtime |> !collect_pkg_runtime |>
+include $(RAW_RULES)

libretro/topbench/Tupfile

@@ -11,6 +11,6 @@ include_rules
 
 RAW_VERSION = 0.38.h
 : {tar} |> !collect_raw |>
-: |> !raw |>
+include $(RAW_RULES)
 
 endif

runtimes/alpine/alpine_seoul_nova/Tupfile

@@ -2,7 +2,6 @@ TARGET_NAME = alpine_seoul_nova
 include_rules
 
 : vm_seoul.cfg |> !collect_raw |>
-: |> !raw |>
 
 PKG_DEPENDS += \
 	@(PUBLIC_SRC_BASE_NOVA) \
@@ -13,3 +12,5 @@ PKG_DEPENDS += \
 	_/raw/$(TARGET_NAME) \
 
 : runtime |> !collect_pkg_runtime |>
+
+include $(RAW_RULES)

runtimes/alpine/alpine_seoul_nova/installer/Tupfile

@@ -3,7 +3,7 @@ include ../../../../vm/alpine/version.tup
 include_rules
 
 : vm_seoul.cfg |> !collect_raw |>
-: |> !raw |>
+
 
 PKG_DEPENDS += \
 	@(PUBLIC_SRC_BASE_NOVA) \
@@ -19,3 +19,5 @@ ISO_NAME = alpine-standard-$(ALPINE_VERSION)-x86.iso
 
 : runtime.in |> sed 's/@ISO_NAME@/$(ISO_NAME)/' %f > %o |> runtime
 : runtime |> !collect_pkg_runtime |>
+
+include $(RAW_RULES)

runtimes/backdrop/Tupfile

@@ -9,5 +9,4 @@ include_rules
 : backdrop.png |> !collect_raw |>
 : runtime |> !collect_pkg_runtime |>
 
-: |> !raw |>
-: |> !pkg |>
+include $(RAW_RULES)

runtimes/cave_story/cave_story-en/Tupfile

@@ -13,6 +13,7 @@ include_rules
 
 RAW_VERSION = 2004.12
 : {tar} |> !collect_raw |>
-: |> !raw |>
+
+include $(RAW_RULES)
 
 endif

runtimes/soyuz/Tupfile

@@ -19,9 +19,9 @@ include_rules
 	|> soyuz.tar {tar}
 
 : {tar} |> !collect_raw |>
-: |> !raw |>
-
 : runtime |> !collect_pkg_runtime |>
 : |> !pkg |>
 
+include $(RAW_RULES)
+
 endif

vm/reactos/Tupfile

@@ -12,8 +12,6 @@ ISO_NAME = ReactOS-$(RAW_VERSION)-Live.iso
 	unzip %o.zip -d $(RAW_DIR); rm %o.zip; \
 |> $(RAW_DIR)/$(ISO_NAME) {iso}
 
-: |> !raw |>
-
 PKG_DEPENDS += \
 	@(PUBLIC_SRC_ROM_BLOCK) \
 	_/raw/$(TARGET_NAME) \
@@ -21,4 +19,6 @@ PKG_DEPENDS += \
 : runtime.in |> sed 's/@ISO_NAME@/$(ISO_NAME)/' %f > %o |> runtime
 : runtime |> !collect_pkg_runtime |>
 
+include $(RAW_RULES)
+
 endif

vm/seoul-nova/Tupfile

@@ -2,7 +2,7 @@ TARGET_NAME = seoul_nova
 include_rules
 
 : vm_seoul.cfg |> !collect_raw |>
-: |> !raw |>
+
 
 PKG_DEPENDS += \
 	@(PUBLIC_SRC_BASE_NOVA) \
@@ -12,3 +12,5 @@ PKG_DEPENDS += \
 	_/raw/$(TARGET_NAME) \
 
 : runtime |> !collect_pkg_runtime |>
+
+include $(RAW_RULES)

vm/vbox5-nova/Tupfile

@@ -2,7 +2,6 @@ TARGET_NAME = vbox5-nova
 include_rules
 
 : foreach machine.vbox primary.vmdk secondary.vmdk |> !collect_raw |>
-: |> !raw |>
 
 PKG_DEPENDS += \
 	@(PUBLIC_SRC_INIT) \
@@ -18,3 +17,5 @@ PKG_DEPENDS += \
 	_/raw/$(TARGET_NAME) \
 
 : runtime |> !collect_pkg_runtime |>
+
+include $(RAW_RULES)