From 2841227ce2132f9c4285c2f6b1fcba7cc3606492 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 27 Jun 2019 11:48:26 +0200 Subject: [PATCH] Change *_rules variable type --- Tuprules.tup | 6 +++--- libretro/games/quake_dopa/Tupfile | 4 ++-- libretro/games/streemerz/Tupfile | 2 +- libretro/tests/240pSuite-SNES/Tupfile | 2 +- libretro/tests/240pee-NES/Tupfile | 4 ++-- libretro/topbench/Tupfile | 2 +- runtimes/arora/Tupfile | 2 +- runtimes/audio_player/Tupfile | 2 +- runtimes/avplay/Tupfile | 2 +- runtimes/backdrop/Tupfile | 4 ++-- runtimes/cave_story/cave_story-en/Tupfile | 4 ++-- runtimes/soyuz/Tupfile | 4 ++-- src/server/fs_block/Tupfile | 2 +- upstream | 2 +- vm/openbsd_seoul_installer/Tupfile | 2 +- vm/seoul-nova/Tupfile | 2 +- vm/seoul_alpine_test/Tupfile | 2 +- vm/seoul_openbsd_test/Tupfile | 2 +- vm/vbox5-nova/Tupfile | 2 +- vm/vbox_install_x86_64/Tupfile | 2 +- 20 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Tuprules.tup b/Tuprules.tup index ee0ffc1b3..3e51e4f83 100644 --- a/Tuprules.tup +++ b/Tuprules.tup @@ -61,11 +61,11 @@ PKG_DIR = $(DEPOT_BIN_DIR)/$(BIN_NAME)/current |> $(BIN_DIR)/.ARCHIVES $(DEPOT_DIR)/ # Macro invoked in BIN_RULES -RAW_RULES = $(TUP_CWD)/errata/raw.tup +&RAW_RULES = errata/raw.tup # Rules for finalizing a locally defined raw package -BIN_RULES = $(TUP_CWD)/errata/bin.tup +&BIN_RULES = errata/bin.tup # Rules for finalizing a locally defined binary package -PKG_RULES = $(TUP_CWD)/errata/pkg.tup +&PKG_RULES = errata/pkg.tup # Rules for finalizing a locally defined runtime package AWK_LOCAL_ARCHIVES = awk -F '/' \ diff --git a/libretro/games/quake_dopa/Tupfile b/libretro/games/quake_dopa/Tupfile index 285b61009..4321bcead 100644 --- a/libretro/games/quake_dopa/Tupfile +++ b/libretro/games/quake_dopa/Tupfile @@ -12,7 +12,7 @@ DOPA_FILES = \ pak0.pak \ : dopa.rar |> unrar x %f $(DOPA_FILES); tar cf %o $(DOPA_FILES); rm $(DOPA_FILES) |> $(RAW_DIR)/quake_dopa.tar -include $(RAW_RULES) +include &(RAW_RULES) PKG_DEPENDS += \ @(PUBLIC_SRC_VFS) \ @@ -23,6 +23,6 @@ PKG_DEPENDS += \ _/raw/$(RAW_NAME) \ : runtime |> !collect_pkg_runtime |> -include $(PKG_RULES) +include &(PKG_RULES) endif diff --git a/libretro/games/streemerz/Tupfile b/libretro/games/streemerz/Tupfile index 5be6f612e..199824dfb 100644 --- a/libretro/games/streemerz/Tupfile +++ b/libretro/games/streemerz/Tupfile @@ -20,6 +20,6 @@ PKG_DEPENDS += \ : runtime |> !collect_pkg_runtime |> -include $(RAW_RULES) +include &RAW_RULES) endif diff --git a/libretro/tests/240pSuite-SNES/Tupfile b/libretro/tests/240pSuite-SNES/Tupfile index dae793ca6..57f1a18fd 100644 --- a/libretro/tests/240pSuite-SNES/Tupfile +++ b/libretro/tests/240pSuite-SNES/Tupfile @@ -17,4 +17,4 @@ PKG_DEPENDS += \ _/raw/$(TARGET_NAME) \ : runtime |> !collect_pkg_runtime |> -include $(RAW_RULES) +include &(RAW_RULES) diff --git a/libretro/tests/240pee-NES/Tupfile b/libretro/tests/240pee-NES/Tupfile index 261368082..eed3a0d71 100644 --- a/libretro/tests/240pee-NES/Tupfile +++ b/libretro/tests/240pee-NES/Tupfile @@ -17,5 +17,5 @@ PKG_DEPENDS += \ : runtime |> !collect_pkg_runtime |> -include $(RAW_RULES) -include $(PKG_RULES) +include &(RAW_RULES) +include &(PKG_RULES) diff --git a/libretro/topbench/Tupfile b/libretro/topbench/Tupfile index 19a5ac55a..d4c790f58 100644 --- a/libretro/topbench/Tupfile +++ b/libretro/topbench/Tupfile @@ -11,6 +11,6 @@ include_rules RAW_VERSION = 0.38.h : {tar} |> !collect_raw |> -include $(RAW_RULES) +include &(RAW_RULES) endif diff --git a/runtimes/arora/Tupfile b/runtimes/arora/Tupfile index bf81b2b00..de654c860 100644 --- a/runtimes/arora/Tupfile +++ b/runtimes/arora/Tupfile @@ -37,4 +37,4 @@ PKG_DEPENDS += \ include_rules : runtime |> !collect_pkg_runtime |> -include $(PKG_RULES) +include &(PKG_RULES) diff --git a/runtimes/audio_player/Tupfile b/runtimes/audio_player/Tupfile index fb58cf0c3..8a92ea52a 100644 --- a/runtimes/audio_player/Tupfile +++ b/runtimes/audio_player/Tupfile @@ -6,4 +6,4 @@ PKG_DEPENDS += \ include_rules : runtime |> !collect_pkg_runtime |> -include $(PKG_RULES) +include &(PKG_RULES) diff --git a/runtimes/avplay/Tupfile b/runtimes/avplay/Tupfile index ea97a6ef1..59c41d070 100644 --- a/runtimes/avplay/Tupfile +++ b/runtimes/avplay/Tupfile @@ -6,4 +6,4 @@ PKG_DEPENDS += \ include_rules : runtime |> !collect_pkg_runtime |> -include $(PKG_RULES) +include &(PKG_RULES) diff --git a/runtimes/backdrop/Tupfile b/runtimes/backdrop/Tupfile index 28badb31f..e5bd769c3 100644 --- a/runtimes/backdrop/Tupfile +++ b/runtimes/backdrop/Tupfile @@ -9,5 +9,5 @@ include_rules : backdrop.png |> !collect_raw |> : runtime |> !collect_pkg_runtime |> -include $(RAW_RULES) -include $(PKG_RULES) +include &(RAW_RULES) +include &(PKG_RULES) diff --git a/runtimes/cave_story/cave_story-en/Tupfile b/runtimes/cave_story/cave_story-en/Tupfile index c99c0db4e..1e0761e44 100644 --- a/runtimes/cave_story/cave_story-en/Tupfile +++ b/runtimes/cave_story/cave_story-en/Tupfile @@ -1,4 +1,4 @@ -ifndef CONFIG_NO_NETWORK +ifndef CONFIG_OFFLINE TARGET_NAME = cave_story-en @@ -14,6 +14,6 @@ include_rules RAW_VERSION = 2004.12 : {tar} |> !collect_raw |> -include $(RAW_RULES) +include &(RAW_RULES) endif diff --git a/runtimes/soyuz/Tupfile b/runtimes/soyuz/Tupfile index 2bd93b999..6da722ef3 100644 --- a/runtimes/soyuz/Tupfile +++ b/runtimes/soyuz/Tupfile @@ -1,4 +1,4 @@ -ifndef CONFIG_NO_NETWORK +ifndef CONFIG_OFFLINE TARGET_NAME = soyuz @@ -22,6 +22,6 @@ include_rules : runtime |> !collect_pkg_runtime |> : |> !pkg |> -include $(RAW_RULES) +include &(RAW_RULES) endif diff --git a/src/server/fs_block/Tupfile b/src/server/fs_block/Tupfile index 2a0fa7e41..500b8cdd5 100644 --- a/src/server/fs_block/Tupfile +++ b/src/server/fs_block/Tupfile @@ -12,6 +12,6 @@ CXXFLAGS += `$(PKG_CONFIG) --cflags $(PKGS)` $(LD) `$(PKG_CONFIG) --libs $(PKGS)` %f -o %o |> %d {binary} : {binary} |> !collect_bin |> -include $(BIN_RULES) +include &(BIN_RULES) endif diff --git a/upstream b/upstream index 49098b9af..a7c2ad872 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit 49098b9af3d089ca4a367d8e12c95d7b792460df +Subproject commit a7c2ad872dd1f58377d667a37bc85893fab7bdf4 diff --git a/vm/openbsd_seoul_installer/Tupfile b/vm/openbsd_seoul_installer/Tupfile index fe4316783..f72733453 100644 --- a/vm/openbsd_seoul_installer/Tupfile +++ b/vm/openbsd_seoul_installer/Tupfile @@ -15,4 +15,4 @@ PKG_DEPENDS += \ : ../seoul_installer_runtime.in |> sed 's/@IMAGE_NAME@/$(IMAGE_NAME)/' %f > %o |> runtime : runtime |> !collect_pkg_runtime |> -include $(PKG_RULES) +include &(PKG_RULES) diff --git a/vm/seoul-nova/Tupfile b/vm/seoul-nova/Tupfile index 98bdb23a3..56d876459 100644 --- a/vm/seoul-nova/Tupfile +++ b/vm/seoul-nova/Tupfile @@ -12,4 +12,4 @@ PKG_DEPENDS += \ : runtime |> !collect_pkg_runtime |> -include $(RAW_RULES) +include &(RAW_RULES) diff --git a/vm/seoul_alpine_test/Tupfile b/vm/seoul_alpine_test/Tupfile index aceb39247..becbea0d2 100644 --- a/vm/seoul_alpine_test/Tupfile +++ b/vm/seoul_alpine_test/Tupfile @@ -14,4 +14,4 @@ PKG_DEPENDS += \ : ../seoul_test_runtime.in |> sed 's/@IMAGE_NAME@/$(IMAGE_NAME)/' %f > %o |> runtime : runtime |> !collect_pkg_runtime |> -include $(PKG_RULES) +include &(PKG_RULES) diff --git a/vm/seoul_openbsd_test/Tupfile b/vm/seoul_openbsd_test/Tupfile index 4f59e8b01..543e68d2c 100644 --- a/vm/seoul_openbsd_test/Tupfile +++ b/vm/seoul_openbsd_test/Tupfile @@ -16,4 +16,4 @@ PKG_DEPENDS += \ : ../seoul_test_runtime.in |> sed 's/@IMAGE_NAME@/$(IMAGE_NAME)/' %f > %o |> runtime : runtime |> !collect_pkg_runtime |> -include $(PKG_RULES) +include &(PKG_RULES) diff --git a/vm/vbox5-nova/Tupfile b/vm/vbox5-nova/Tupfile index eb4819726..574367e6f 100644 --- a/vm/vbox5-nova/Tupfile +++ b/vm/vbox5-nova/Tupfile @@ -18,4 +18,4 @@ PKG_DEPENDS += \ : runtime |> !collect_pkg_runtime |> -include $(RAW_RULES) +include &(RAW_RULES) diff --git a/vm/vbox_install_x86_64/Tupfile b/vm/vbox_install_x86_64/Tupfile index 9a8ba1952..aeb670d00 100644 --- a/vm/vbox_install_x86_64/Tupfile +++ b/vm/vbox_install_x86_64/Tupfile @@ -2,4 +2,4 @@ RAW_NAME = vbox_install_x86_64 include_rules : machine.vbox |> !collect_raw |> : machine.vdi |> !collect_raw |> -include $(RAW_RULES) +include &(RAW_RULES)