From e96b82e8da0cac34290d98e9172db2dce90b5ed0 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 27 Jul 2009 12:09:36 +0000 Subject: * Apply patch by kotk to fix the Alt-Tab bug (BR 2805959). * Apply patch by trentbuck to allow packaging with tar (BR 2827595). * Fix 2827342: Consider weapons "too large to wield" as useless. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10424 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/AppHdr.h | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) (limited to 'crawl-ref/source/AppHdr.h') diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h index e1cbba9582..840480b808 100644 --- a/crawl-ref/source/AppHdr.h +++ b/crawl-ref/source/AppHdr.h @@ -410,29 +410,25 @@ FIXME: replace system(3) with fork(2) and execve(2). */ - // Comment these lines out if you want to leave the save files uncompressed. - #define SAVE_PACKAGE_ZIP -// #define SAVE_PACKAGE_TAR - -#ifdef SAVE_PACKAGE_ZIP - #define PACKAGE_SUFFIX ".zip" - #define SAVE_PACKAGE_CMD "/usr/bin/zip -m -q -j -1 %s.zip %s.*" - #define LOAD_UNPACKAGE_CMD "/usr/bin/unzip -q -o %s.zip -d %s" -#else -#ifdef SAVE_PACKAGE_TAR - #define PACKAGE_SUFFIX ".tgz" - - // The --absolute-names switch is only there to suppress noise on - // stdout. All the paths are removed later by --transform. - #define SAVE_PACKAGE_CMD "tar -zcf %s.tgz --remove-files --absolute-names --transform=s:.*/:: %s.*" - #define LOAD_UNPACKAGE_CMD "tar -zxf %s.tgz -C %s" -#endif -#endif + // The default behaviour is to compress with zip. + // To use GNU tar instead, define SAVE_PACKAGE_TAR. + // To avoid compression entirely, define SAVE_PACKAGE_NONE. + #ifndef SAVE_PACKAGE_NONE + #ifdef SAVE_PACKAGE_TAR + // The --absolute-names switch is only there to suppress noise on stdout. + // All the paths are removed later by --transform. + #define PACKAGE_SUFFIX ".tgz" + #define SAVE_PACKAGE_CMD "tar -zcf %s.tgz --remove-files --absolute-names --transform=s:.*/:: %s.*" + #define LOAD_UNPACKAGE_CMD "tar -zxf %s.tgz -C %s" + #else + #define PACKAGE_SUFFIX ".zip" + #define SAVE_PACKAGE_CMD "/usr/bin/zip -m -q -j -1 %s.zip %s.*" + #define LOAD_UNPACKAGE_CMD "/usr/bin/unzip -q -o %s.zip -d %s" + #endif -#ifdef SAVE_PACKAGE_CMD - // This is used to unpack specific files from the archive. + // This is used to unpack a specific file from the archive. #define UNPACK_SPECIFIC_FILE_CMD LOAD_UNPACKAGE_CMD " %s" -#endif + #endif // This defines the chmod permissions for score and bones files. #define SHARED_FILES_CHMOD_PRIVATE 0664 -- cgit v1.2.3-54-g00ecf