From 94a46bb7332cbc76cd263125ec017fbd3ad6a4b9 Mon Sep 17 00:00:00 2001 From: SilverNexus Date: Thu, 14 Jan 2021 19:28:19 -0500 Subject: [PATCH] Update to reflect new no-collect framework in trunk server. --- ChangeLog.rtro | 5 +++++ Makefile.server.lib.am.patch | 22 ---------------------- README.rtro | 7 ++----- image_info.patch | 10 +++++----- 4 files changed, 12 insertions(+), 32 deletions(-) delete mode 100644 Makefile.server.lib.am.patch diff --git a/ChangeLog.rtro b/ChangeLog.rtro index d901cf9..7e35496 100644 --- a/ChangeLog.rtro +++ b/ChangeLog.rtro @@ -1,6 +1,11 @@ ------------------------ Changes for top of trunk ------------------------ +2021-01-14 Daniel Hawkins + * image_info.patch: Update to match new file format + * Makefile.server.lib.am.patch: Removed. New no-collect patch in server makes this obsolete. + * README.rtro: Update installation instructions + 2021-01-13 Daniel Hawkins * crafting/Materials/leather*.rtro.111.png: Reduce to XPM palette and drop alpha layer. * shop/store_food.rtro.x11.png: Resurrect old food shop face from monochrome era, and colorize it. diff --git a/Makefile.server.lib.am.patch b/Makefile.server.lib.am.patch deleted file mode 100644 index 1cd6d9c..0000000 --- a/Makefile.server.lib.am.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: lib/Makefile.am -=================================================================== ---- lib/Makefile.am (revision 21494) -+++ lib/Makefile.am (working copy) -@@ -11,7 +11,7 @@ - arch/messages \ - arch/races \ - def_help \ -- animations archetypes bmaps.paths crossfire.0 crossfire.1 faces smooth treasures -+ animations archetypes bmaps.paths crossfire.0 crossfire.1 crossfire.2 faces smooth treasures - - CONF_FILES = \ - config/ban_file \ -@@ -42,7 +42,7 @@ - i18n/messages.fr - - MAINTAINERCLEANFILES = archetypes faces .collect-stamp \ -- animations smooth treasures bmaps.paths crossfire.0 crossfire.1 -+ animations smooth treasures bmaps.paths crossfire.0 crossfire.1 crossfire.2 - - PERL = @PERL@ - diff --git a/README.rtro b/README.rtro index 6d08a9b..fc5fb99 100644 --- a/README.rtro +++ b/README.rtro @@ -1,11 +1,8 @@ How to install the retro image set into an existing server: 1. Apply image_info.patch and merge the folders of images into an existing arch directory. -2. Apply Makefile.server.lib.am.patch to lib/Makefile.am in the server code. -3. Run autogen.sh at the top level of the server to regenerate the Makefiles. -4. Ensure that there is a link to arch (or your arch folder is directly stored) in the lib folder. -5. Run `make do-collect` from the lib folder of the server. -6. Run `make` and `make install` with appropriate permissions at the top level of the server. +2. Ensure that there is a link to arch (or your arch folder is directly stored) in the lib folder. +3. Run `make` and `make install` with appropriate permissions at the top level of the server. This will copy the compiled image file to the installed data directory. diff --git a/image_info.patch b/image_info.patch index 4b2462c..aa73b0d 100644 --- a/image_info.patch +++ b/image_info.patch @@ -1,9 +1,9 @@ Index: image_info =================================================================== ---- image_info (revision 21435) +--- image_info (revision 21770) +++ image_info (working copy) -@@ -28,3 +28,4 @@ +@@ -27,3 +27,4 @@ # Lines that start with # are obviously ignored. - 0:base:standard:0:32x32:none:The standard image set. - 1:clsc:classic:0:32x32:none:Classic and new styling. -+2:rtro:retro:1:24x24:none:XPM-era nostalgia + base:standard::32x32:none:The standard image set. + clsc:classic:base:32x32:none:Classic and new styling. ++rtro:retro:clsc:24x24:none:XPM-era nostalgia