]> granicus.if.org Git - nethack/commitdiff
xcode cleanup:
authornhkeni <keni@his.com>
Sun, 20 Feb 2022 01:50:10 +0000 (20:50 -0500)
committernhkeni <keni@his.com>
Wed, 16 Mar 2022 21:03:54 +0000 (17:03 -0400)
 don't use git (so tarball distribution should work)
 name the build shell scripts

sys/unix/NetHack.xcodeproj/project.pbxproj

index 41d7ea42332145e2ead07853afcf997bb5eeeecc..626bc0efa6e4d6e6c4ce01d592b9aea655bcc5e5 100644 (file)
                544768AE23994A17004B9739 /* nhlsel.c in Sources */ = {isa = PBXBuildFile; fileRef = 544768AC23994A17004B9739 /* nhlsel.c */; };
                544768AF23994A17004B9739 /* nhlua.c in Sources */ = {isa = PBXBuildFile; fileRef = 544768AD23994A17004B9739 /* nhlua.c */; };
                544768B123994A2C004B9739 /* mdlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 544768B023994A2C004B9739 /* mdlib.c */; };
-               544768BA23995BB7004B9739 /* liblua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 544768B923995BB7004B9739 /* liblua.a */; };
                544A5CF0277B40CF00734B53 /* panic.c in Sources */ = {isa = PBXBuildFile; fileRef = 31B8A42721A267E60055BD01 /* panic.c */; };
                5462D14823E7B19200969423 /* insight.c in Sources */ = {isa = PBXBuildFile; fileRef = 5462D14723E7B19200969423 /* insight.c */; };
                5493735A277AAE830031FE02 /* alloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 31B8A36521A238040055BD01 /* alloc.c */; };
                54FB2B4B246310A600397C0E /* symbols.c in Sources */ = {isa = PBXBuildFile; fileRef = 54FB2B4A246310A600397C0E /* symbols.c */; };
                54FCE8292223261F00F393C8 /* isaac64.c in Sources */ = {isa = PBXBuildFile; fileRef = 54FCE8282223261F00F393C8 /* isaac64.c */; };
+               BAB57DB527C1C3E200FCF150 /* libnhlua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BAE8010A27B97760002B3786 /* libnhlua.a */; };
                BAE8013627B99CAD002B3786 /* lopcodes.c in Sources */ = {isa = PBXBuildFile; fileRef = BAE8011427B99CAB002B3786 /* lopcodes.c */; };
                BAE8013727B99CAD002B3786 /* linit.c in Sources */ = {isa = PBXBuildFile; fileRef = BAE8011527B99CAB002B3786 /* linit.c */; };
                BAE8013827B99CAD002B3786 /* lobject.c in Sources */ = {isa = PBXBuildFile; fileRef = BAE8011627B99CAB002B3786 /* lobject.c */; settings = {COMPILER_FLAGS = "-Wno-conditional-uninitialized"; }; };
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               BAB57DB527C1C3E200FCF150 /* libnhlua.a in Frameworks */,
                                31B8A41721A243E80055BD01 /* libncurses.tbd in Frameworks */,
-                               544768BA23995BB7004B9739 /* liblua.a in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXGroup;
                        children = (
                                BAE8015827B99D44002B3786 /* nhlualib */,
-                               5439B3BB275AADC600B8FB2F /* date.c */,
                                2A953FB221A3F404007906E5 /* XCode.xcconfig */,
                                31B8A3F821A23E490055BD01 /* win */,
                                31B8A3E921A23CC40055BD01 /* sys */,
                                544768AC23994A17004B9739 /* nhlsel.c */,
                                544768AD23994A17004B9739 /* nhlua.c */,
                                544768A8239949FA004B9739 /* sfstruct.c */,
+                               5439B3BB275AADC600B8FB2F /* date.c */,
                                31B8A35521A238030055BD01 /* allmain.c */,
                                31B8A36521A238040055BD01 /* alloc.c */,
                                31B8A35E21A238040055BD01 /* apply.c */,
                        isa = PBXNativeTarget;
                        buildConfigurationList = 3189578321A1FDA400FB2ABE /* Build configuration list for PBXNativeTarget "makedefs" */;
                        buildPhases = (
-                               544768B223995106004B9739 /* Build nhlua header */,
                                3189577B21A1FDA400FB2ABE /* Sources */,
                                3189577C21A1FDA400FB2ABE /* Frameworks */,
                                3189577D21A1FDA400FB2ABE /* CopyFiles */,
                                319CBA3821A3458100150830 /* Build data */,
                                317E7C4521A3548F00F6E4E5 /* Build rumors */,
                                317E7C4E21A3697300F6E4E5 /* Build options */,
-                               544768B8239954B9004B9739 /* Build Lua library */,
                                317E7C4F21A36A5700F6E4E5 /* Build engrave, epitaph and bogusmon */,
                                3192867F21A3AF8000325BEB /* Build oracles */,
                        );
                        isa = PBXNativeTarget;
                        buildConfigurationList = BAE8010B27B97760002B3786 /* Build configuration list for PBXNativeTarget "nhlua" */;
                        buildPhases = (
-                               BAE8010E27B977F7002B3786 /* ShellScript */,
+                               BAE8010E27B977F7002B3786 /* Fetch Lua */,
                                BAE8010627B97760002B3786 /* Headers */,
                                BAE8010727B97760002B3786 /* Sources */,
                                BAE8010827B97760002B3786 /* Frameworks */,
-                               BAE8010F27B9825E002B3786 /* ShellScript */,
+                               BAE8010F27B9825E002B3786 /* Build nhlua.h */,
                        );
                        buildRules = (
                        );
                        shellPath = /bin/sh;
                        shellScript = "# make data from data.base\ncd \"${NH_DAT_DIR}\"\n\"${NH_UTIL_DIR}\"/makedefs -d\n";
                };
-               544768B223995106004B9739 /* Build nhlua header */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       inputFileListPaths = (
-                       );
-                       inputPaths = (
-                       );
-                       name = "Build nhlua header";
-                       outputFileListPaths = (
-                       );
-                       outputPaths = (
-                               "${NH_INC_DIR}/nhlua.h",
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-                       shellPath = /bin/sh;
-                       shellScript = "# Type a script or drag a script file from your workspace to insert its path.\ncd \"${NH_INC_DIR}\"\necho '/* nhlua.h - generated by Xcode script */' > nhlua.h\necho '#include \"../lib/lua-5.4.4/src/lua.h\"' >> nhlua.h\nsed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < \"${NH_LIB_DIR}\"/lua-5.4.4/src/lua.h >> nhlua.h\necho '#include \"../lib/lua-5.4.4/src/lualib.h\"' >> nhlua.h\necho '#include \"../lib/lua-5.4.4/src/lauxlib.h\"' >> nhlua.h\necho '/*nhlua.h*/' >> nhlua.h\n";
-               };
-               544768B8239954B9004B9739 /* Build Lua library */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       inputFileListPaths = (
-                       );
-                       inputPaths = (
-                       );
-                       name = "Build Lua library";
-                       outputFileListPaths = (
-                       );
-                       outputPaths = (
-                               "${NH_LIB_DIR}/lua/liblua.a",
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-                       shellPath = /bin/sh;
-                       shellScript = "# Type a script or drag a script file from your workspace to insert its path.\ncd \"${NH_LIB_DIR}\"\nmkdir -p lua\ncd \"${NH_LIB_DIR}\"/lua-5.4.4/src\nmake a\ncp liblua.a ../../lua\ncd ../../..\n\n";
-               };
-               BAE8010E27B977F7002B3786 /* ShellScript */ = {
+               BAE8010E27B977F7002B3786 /* Fetch Lua */ = {
                        isa = PBXShellScriptBuildPhase;
                        alwaysOutOfDate = 1;
                        buildActionMask = 2147483647;
                        );
                        inputPaths = (
                        );
+                       name = "Fetch Lua";
                        outputFileListPaths = (
                        );
                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "cd `git rev-parse --show-toplevel`\necho LUA VERSION: $LUA_VERSION\nif test ! -d lib/lua-$LUA_VERSION ; then ( echo \"Fetching $LUA_VERSION\" && \\\n          mkdir -p lib && cd lib && \\\n          curl -R -O http://www.lua.org/ftp/lua-$LUA_VERSION.tar.gz && \\\n          tar zxf lua-$LUA_VERSION.tar.gz && \\\n          rm -f lua-$LUA_VERSION.tar.gz ) ; fi\n# remove include/nhlua.h in case it was created for some other Lua version\nif test -f include/nhlua.h ; then ( \\\n             rm -f include/nhlua.h && echo 'rm include/nhlua.h' ) ; fi\n";
+                       shellScript = "cd $NH_ROOT_DIR\necho LUA VERSION: $LUA_VERSION\nif test ! -d lib/lua-$LUA_VERSION ; then ( echo \"Fetching $LUA_VERSION\" && \\\n          mkdir -p lib && cd lib && \\\n          curl -s -S -R -O http://www.lua.org/ftp/lua-$LUA_VERSION.tar.gz && \\\n          tar zxf lua-$LUA_VERSION.tar.gz && \\\n          rm -f lua-$LUA_VERSION.tar.gz ) ; fi\n";
                };
-               BAE8010F27B9825E002B3786 /* ShellScript */ = {
+               BAE8010F27B9825E002B3786 /* Build nhlua.h */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        inputFileListPaths = (
                        );
                        inputPaths = (
-                               "$(SRCROOT)/lib/lua/liblua.a",
+                               "$(BUILT_PRODUCTS_DIR)/libnhlua.a",
                        );
+                       name = "Build nhlua.h";
                        outputFileListPaths = (
                        );
                        outputPaths = (
-                               "$(SRCROOT)/include/nhlua.h",
+                               "$(NH_INC_DIR)/nhlua.h",
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "echo '/* nhlua.h - generated by top Makefile */' > $SCRIPT_OUTPUT_FILE_0\necho '#include \"../$LUAHEADERS/lua.h\"' >> $SCRIPT_OUTPUT_FILE_0\nsed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' \\\n                < $LUAHEADERS/lua.h >> $SCRIPT_OUTPUT_FILE_0\necho '#include \"../$LUAHEADERS/lualib.h\"' >> $SCRIPT_OUTPUT_FILE_0\necho '#include \"../$LUAHEADERS/lauxlib.h\"' >> $SCRIPT_OUTPUT_FILE_0\necho '/*nhlua.h*/' >> $SCRIPT_OUTPUT_FILE_0\n";
+                       shellScript = "LUAHEADERS=$NH_ROOT_DIR/lib/lua-$LUA_VERSION/src\nQ='\"'\necho '/* nhlua.h - generated by Xcode nhlua build phase */' > $SCRIPT_OUTPUT_FILE_0\necho \"#include $Q$LUAHEADERS/lua.h$Q\" >> $SCRIPT_OUTPUT_FILE_0\nsed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' \\\n                < $LUAHEADERS/lua.h >> $SCRIPT_OUTPUT_FILE_0\necho \"#include $Q$LUAHEADERS/lualib.h$Q\" >> $SCRIPT_OUTPUT_FILE_0\necho \"#include $Q$LUAHEADERS/lauxlib.h$Q\" >> $SCRIPT_OUTPUT_FILE_0\necho '/*nhlua.h*/' >> $SCRIPT_OUTPUT_FILE_0\n";
                };
 /* End PBXShellScriptBuildPhase section */
 
                                GCC_C_LANGUAGE_STANDARD = gnu11;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-                               MACOSX_DEPLOYMENT_TARGET = 11.6;
                                OTHER_CFLAGS = (
                                        "-DNOMAIL",
                                        "-DNOTPARMDECL",
                                GCC_C_LANGUAGE_STANDARD = gnu11;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-                               MACOSX_DEPLOYMENT_TARGET = 11.6;
                                OTHER_CFLAGS = (
                                        "-DNOMAIL",
                                        "-DNOTPARMDECL",