Skip to content

Commit

Permalink
Maintenance/macOS: Updated Xcode projects rules to have proper depend…
Browse files Browse the repository at this point in the history 
…encies
  • Loading branch information
@Shchvova
Shchvova committed Jun 4, 2020
1 parent e365728 commit ef6303e
Show file tree
Hide file tree
Showing 4 changed files with 93 additions and 26 deletions.
10 changes: 7 additions & 3 deletions external/lpeg/lpeg.xcodeproj/project.pbxproj
View file
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 52;
objects = {

/* Begin PBXBuildFile section */
Expand All @@ -18,11 +18,14 @@
compilerSpec = com.apple.compilers.proxy.script;
filePatterns = "*.lua";
fileType = pattern.proxy;
inputFiles = (
"$(BUILT_PRODUCTS_DIR)/lua",
);
isEditable = 1;
outputFiles = (
"$TARGET_TEMP_DIR/$(INPUT_FILE_BASE).c",
"$(TARGET_TEMP_DIR)/$(INPUT_FILE_BASE).c",
);
script = "LUA_EXE_DIR=\"$BUILT_PRODUCTS_DIR\"\nif [ ! -e \"$LUA_EXE_DIR/lua\" ]\nthen\n # TODO: Figure out why we have to use this backup location for Jenkins Simulator builds\n LUA_EXE_DIR=\"$SRCROOT/../../platform/mac/build/Release\"\n if [ ! -e \"$LUA_EXE_DIR/lua\" ]\n then\n echo \"Could not find proper 32-bit lua build: $BUILT_PRODUCTS_DIR/lua to compile '$INPUT_FILE_PATH'\"\n exit 1\n fi\nfi\n\necho Building: $SRCROOT/../../bin/mac/lua2c.sh $INPUT_FILE_PATH $TARGET_TEMP_DIR $CONFIGURATION $LUA_EXE_DIR\n\n$SRCROOT/../../bin/mac/lua2c.sh $INPUT_FILE_PATH $TARGET_TEMP_DIR $CONFIGURATION $LUA_EXE_DIR";
script = "LUA_EXE_DIR=\"$BUILT_PRODUCTS_DIR\"\nif [ ! -e \"$LUA_EXE_DIR/lua\" ]\nthen\n # TODO: Figure out why we have to use this backup location for Jenkins Simulator builds\n LUA_EXE_DIR=\"$SRCROOT/../../platform/mac/build/Release\"\n if [ ! -e \"$LUA_EXE_DIR/lua\" ]\n then\n echo \"Could not find proper 32-bit lua build: $BUILT_PRODUCTS_DIR/lua to compile '$INPUT_FILE_PATH'\"\n exit 1\n fi\nfi\n\necho Building: $SRCROOT/../../bin/mac/lua2c.sh $INPUT_FILE_PATH $TARGET_TEMP_DIR $CONFIGURATION $LUA_EXE_DIR\n\n$SRCROOT/../../bin/mac/lua2c.sh $INPUT_FILE_PATH $TARGET_TEMP_DIR $CONFIGURATION $LUA_EXE_DIR\n";
};
/* End PBXBuildRule section */

Expand Down Expand Up @@ -201,6 +204,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = 00D5A5C61566DF6200718681;
Expand Down
28 changes: 24 additions & 4 deletions platform/mac/lua.xcodeproj/project.pbxproj
View file
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 52;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -170,9 +170,12 @@
compilerSpec = com.apple.compilers.proxy.script;
filePatterns = "*.lua";
fileType = pattern.proxy;
inputFiles = (
"$(BUILT_PRODUCTS_DIR)/lua",
);
isEditable = 1;
outputFiles = (
"$TARGET_TEMP_DIR/$(INPUT_FILE_BASE).cpp",
"$(TARGET_TEMP_DIR)/$(INPUT_FILE_BASE).cpp",
);
script = "set -o errexit\n# set -x\necho \"Compiling Lua to CPP: $INPUT_FILE_PATH -> $TARGET_TEMP_DIR/$INPUT_FILE_BASE.cpp\"\n\"$BUILT_PRODUCTS_DIR/lua\" \"$SRCROOT/../../bin/rcc.lua\" -c \"$BUILT_PRODUCTS_DIR\" -O\"$CONFIGURATION\" -o \"$TARGET_TEMP_DIR/$INPUT_FILE_BASE.lu\" \"$INPUT_FILE_PATH\"\n\"$BUILT_PRODUCTS_DIR/lua\" -epackage.path=\"[[$SRCROOT/../../external/loop-2.3-beta/lua/?.lua]]\" \"$SRCROOT/../../external/loop-2.3-beta/lua/precompiler.constant.lua\" -d \"$TARGET_TEMP_DIR\" -o \"$INPUT_FILE_BASE\" -l \"$TARGET_TEMP_DIR/?.lu\" -n \"$INPUT_FILE_BASE\"\n";
};
Expand All @@ -181,11 +184,14 @@
compilerSpec = com.apple.compilers.proxy.script;
filePatterns = "*.lua";
fileType = pattern.proxy;
inputFiles = (
"$(BUILT_PRODUCTS_DIR)/lua",
);
isEditable = 1;
outputFiles = (
"$TARGET_TEMP_DIR/$(INPUT_FILE_BASE).cpp",
"$(TARGET_TEMP_DIR)/$(INPUT_FILE_BASE).cpp",
);
script = "set -o errexit\n# set -x\necho \"Compiling Lua to CPP: $INPUT_FILE_PATH -> $TARGET_TEMP_DIR/$INPUT_FILE_BASE.cpp\"\n\"$BUILT_PRODUCTS_DIR/lua\" \"$SRCROOT/../../bin/rcc.lua\" -c \"$BUILT_PRODUCTS_DIR\" -O\"$CONFIGURATION\" -o \"$TARGET_TEMP_DIR/$INPUT_FILE_BASE.lu\" \"$INPUT_FILE_PATH\"\n\"$BUILT_PRODUCTS_DIR/lua\" -epackage.path=\"[[$SRCROOT/../../external/loop-2.3-beta/lua/?.lua]]\" \"$SRCROOT/../../external/loop-2.3-beta/lua/precompiler.constant.lua\" -d \"$TARGET_TEMP_DIR\" -o \"$INPUT_FILE_BASE\" -l \"$TARGET_TEMP_DIR/?.lu\" -n -m luasocket \"$INPUT_FILE_BASE\"";
script = "set -o errexit\n# set -x\necho \"Compiling Lua to CPP: $INPUT_FILE_PATH -> $TARGET_TEMP_DIR/$INPUT_FILE_BASE.cpp\"\n\"$BUILT_PRODUCTS_DIR/lua\" \"$SRCROOT/../../bin/rcc.lua\" -c \"$BUILT_PRODUCTS_DIR\" -O\"$CONFIGURATION\" -o \"$TARGET_TEMP_DIR/$INPUT_FILE_BASE.lu\" \"$INPUT_FILE_PATH\"\n\"$BUILT_PRODUCTS_DIR/lua\" -epackage.path=\"[[$SRCROOT/../../external/loop-2.3-beta/lua/?.lua]]\" \"$SRCROOT/../../external/loop-2.3-beta/lua/precompiler.constant.lua\" -d \"$TARGET_TEMP_DIR\" -o \"$INPUT_FILE_BASE\" -l \"$TARGET_TEMP_DIR/?.lu\" -n -m luasocket \"$INPUT_FILE_BASE\"\n";
};
/* End PBXBuildRule section */

Expand Down Expand Up @@ -253,6 +259,13 @@
remoteGlobalIDString = C24216D61CCACB6600D8E4BE;
remoteInfo = libluasocket;
};
F5EDABDA2488EA5C00D7413F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 004CEC261339724E006ACF35 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 004CED2913397858006ACF35;
remoteInfo = luac;
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
Expand Down Expand Up @@ -791,6 +804,7 @@
buildRules = (
);
dependencies = (
F5EDABDB2488EA5C00D7413F /* PBXTargetDependency */,
004CED9613397B44006ACF35 /* PBXTargetDependency */,
);
name = lua;
Expand Down Expand Up @@ -912,6 +926,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = 004CEC241339724E006ACF35;
Expand Down Expand Up @@ -1122,6 +1137,11 @@
target = C24216D61CCACB6600D8E4BE /* libluasocket */;
targetProxy = C24217231CCACC9A00D8E4BE /* PBXContainerItemProxy */;
};
F5EDABDB2488EA5C00D7413F /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 004CED2913397858006ACF35 /* luac */;
targetProxy = F5EDABDA2488EA5C00D7413F /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
Expand Down
24 changes: 17 additions & 7 deletions platform/mac/plugins.xcodeproj/project.pbxproj
View file
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 52;
objects = {

/* Begin PBXBuildFile section */
Expand All @@ -30,33 +30,42 @@
compilerSpec = com.apple.compilers.proxy.script;
filePatterns = "*.lua";
fileType = pattern.proxy;
inputFiles = (
"$(BUILT_PRODUCTS_DIR)/lua",
);
isEditable = 1;
outputFiles = (
"$TARGET_TEMP_DIR/$(INPUT_FILE_BASE).c",
"$(TARGET_TEMP_DIR)/$(INPUT_FILE_BASE).c",
);
script = "if [ -e $BUILT_PRODUCTS_DIR/lua ]; then\n LUA_DIR=\"$BUILT_PRODUCTS_DIR\"\nelse\n echo \"Could not find proper 32-bit lua build\"\n exit 1\nfi\n\necho $SRCROOT/../../bin/mac/lua2c.sh $INPUT_FILE_PATH $TARGET_TEMP_DIR $CONFIGURATION\n$SRCROOT/../../bin/mac/lua2c.sh $INPUT_FILE_PATH $TARGET_TEMP_DIR $CONFIGURATION $BUILT_PRODUCTS_DIR";
script = "if [ -e $BUILT_PRODUCTS_DIR/lua ]; then\n LUA_DIR=\"$BUILT_PRODUCTS_DIR\"\nelse\n echo \"Could not find proper 32-bit lua build\"\n exit 1\nfi\n\necho $SRCROOT/../../bin/mac/lua2c.sh $INPUT_FILE_PATH $TARGET_TEMP_DIR $CONFIGURATION\n$SRCROOT/../../bin/mac/lua2c.sh $INPUT_FILE_PATH $TARGET_TEMP_DIR $CONFIGURATION $BUILT_PRODUCTS_DIR\n";
};
A47B5BA315F9BE38001D60AB /* PBXBuildRule */ = {
isa = PBXBuildRule;
compilerSpec = com.apple.compilers.proxy.script;
filePatterns = "*.lua";
fileType = pattern.proxy;
inputFiles = (
"$(BUILT_PRODUCTS_DIR)/lua",
);
isEditable = 1;
outputFiles = (
"$TARGET_TEMP_DIR/$(INPUT_FILE_BASE).c",
"$(TARGET_TEMP_DIR)/$(INPUT_FILE_BASE).c",
);
script = "if [ -e $BUILT_PRODUCTS_DIR/lua ]; then\n LUA_DIR=\"$BUILT_PRODUCTS_DIR\"\nelse\n echo \"Could not find proper 32-bit lua build\"\n exit 1\nfi\n\necho $SRCROOT/../../bin/mac/lua2c.sh $INPUT_FILE_PATH $TARGET_TEMP_DIR $CONFIGURATION\n$SRCROOT/../../bin/mac/lua2c.sh $INPUT_FILE_PATH $TARGET_TEMP_DIR $CONFIGURATION";
script = "if [ -e $BUILT_PRODUCTS_DIR/lua ]; then\n LUA_DIR=\"$BUILT_PRODUCTS_DIR\"\nelse\n echo \"Could not find proper 32-bit lua build\"\n exit 1\nfi\n\necho $SRCROOT/../../bin/mac/lua2c.sh $INPUT_FILE_PATH $TARGET_TEMP_DIR $CONFIGURATION\n$SRCROOT/../../bin/mac/lua2c.sh $INPUT_FILE_PATH $TARGET_TEMP_DIR $CONFIGURATION\n";
};
A491863C1641DDB800A39286 /* PBXBuildRule */ = {
isa = PBXBuildRule;
compilerSpec = com.apple.compilers.proxy.script;
filePatterns = "*.lua";
fileType = pattern.proxy;
inputFiles = (
"$(BUILT_PRODUCTS_DIR)/lua",
);
isEditable = 1;
outputFiles = (
"$TARGET_TEMP_DIR/$(INPUT_FILE_BASE).c",
"$(TARGET_TEMP_DIR)/$(INPUT_FILE_BASE).c",
);
script = "if [ -e $BUILT_PRODUCTS_DIR/lua ]; then\n LUA_DIR=\"$BUILT_PRODUCTS_DIR\"\nelse\n echo \"Could not find proper 32-bit lua build\"\n exit 1\nfi\n\necho $SRCROOT/../../bin/mac/lua2c.sh $INPUT_FILE_PATH $TARGET_TEMP_DIR $CONFIGURATION\n$SRCROOT/../../bin/mac/lua2c.sh $INPUT_FILE_PATH $TARGET_TEMP_DIR $CONFIGURATION $BUILT_PRODUCTS_DIR";
script = "if [ -e $BUILT_PRODUCTS_DIR/lua ]; then\n LUA_DIR=\"$BUILT_PRODUCTS_DIR\"\nelse\n echo \"Could not find proper 32-bit lua build\"\n exit 1\nfi\n\necho $SRCROOT/../../bin/mac/lua2c.sh $INPUT_FILE_PATH $TARGET_TEMP_DIR $CONFIGURATION\n$SRCROOT/../../bin/mac/lua2c.sh $INPUT_FILE_PATH $TARGET_TEMP_DIR $CONFIGURATION $BUILT_PRODUCTS_DIR\n";
};
/* End PBXBuildRule section */

Expand Down Expand Up @@ -460,6 +469,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = A482DA7815F9B7E70084DC42;
Expand Down
57 changes: 45 additions & 12 deletions platform/mac/ratatouille.xcodeproj/project.pbxproj
View file
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 52;
objects = {

/* Begin PBXAggregateTarget section */
Expand Down Expand Up @@ -1714,6 +1714,7 @@
filePatterns = "*.lua";
fileType = pattern.proxy;
inputFiles = (
"$(BUILT_PRODUCTS_DIR)/lua",
);
isEditable = 1;
outputFiles = (
Expand All @@ -1727,10 +1728,11 @@
filePatterns = "*.lua";
fileType = pattern.proxy;
inputFiles = (
"$(BUILT_PRODUCTS_DIR)/lua",
);
isEditable = 1;
outputFiles = (
"$TARGET_TEMP_DIR/$(INPUT_FILE_BASE).cpp",
"$(TARGET_TEMP_DIR)/$(INPUT_FILE_BASE).cpp",
);
script = "# This option is used to exit the script as\n# soon as a command returns a non-zero value.\nset -o errexit\n\n$BUILT_PRODUCTS_DIR/lua $SRCROOT/../../bin/rcc.lua -c $BUILT_PRODUCTS_DIR -O$CONFIGURATION -o $TARGET_TEMP_DIR/$INPUT_FILE_BASE.lu $INPUT_FILE_PATH\n$BUILT_PRODUCTS_DIR/lua -epackage.path=[[$SRCROOT/../../external/loop-2.3-beta/lua/?.lua]] $SRCROOT/../../external/loop-2.3-beta/lua/precompiler.constant.lua -d $TARGET_TEMP_DIR -o $INPUT_FILE_BASE -l $TARGET_TEMP_DIR/?.lu -n $INPUT_FILE_BASE\n";
};
Expand All @@ -1740,10 +1742,11 @@
filePatterns = "*.lua";
fileType = pattern.proxy;
inputFiles = (
"$(BUILT_PRODUCTS_DIR)/lua",
);
isEditable = 1;
outputFiles = (
"$TARGET_TEMP_DIR/$(INPUT_FILE_BASE).cpp",
"$(TARGET_TEMP_DIR)/$(INPUT_FILE_BASE).cpp",
);
script = "# This option is used to exit the script as\n# soon as a command returns a non-zero value.\nset -o errexit\n\n$BUILT_PRODUCTS_DIR/lua $SRCROOT/../../bin/rcc.lua -c $BUILT_PRODUCTS_DIR -g -o $TARGET_TEMP_DIR/$INPUT_FILE_BASE.lu $INPUT_FILE_PATH\n$BUILT_PRODUCTS_DIR/lua -epackage.path=[[$SRCROOT/../../external/loop-2.3-beta/lua/?.lua]] $SRCROOT/../../external/loop-2.3-beta/lua/precompiler.constant.lua -d $TARGET_TEMP_DIR -o $INPUT_FILE_BASE -l $TARGET_TEMP_DIR/?.lu -n $INPUT_FILE_BASE\n";
};
Expand Down Expand Up @@ -8150,7 +8153,10 @@
GCC_WARN_UNUSED_FUNCTION = NO;
INSTALL_PATH = /usr/local/lib;
PRODUCT_NAME = lua;
USER_HEADER_SEARCH_PATHS = "../../librtt .";
USER_HEADER_SEARCH_PATHS = (
../../librtt,
.,
);
};
name = Debug;
};
Expand All @@ -8167,7 +8173,10 @@
GCC_WARN_UNUSED_FUNCTION = NO;
INSTALL_PATH = /usr/local/lib;
PRODUCT_NAME = lua;
USER_HEADER_SEARCH_PATHS = "../../librtt .";
USER_HEADER_SEARCH_PATHS = (
../../librtt,
.,
);
ZERO_LINK = NO;
};
name = Release;
Expand Down Expand Up @@ -8286,7 +8295,11 @@
SDKROOT = macosx;
SEPARATE_STRIP = NO;
STRIP_INSTALLED_PRODUCT = NO;
USER_HEADER_SEARCH_PATHS = "../../librtt ../../platform/apple .";
USER_HEADER_SEARCH_PATHS = (
../../librtt,
../../platform/apple,
.,
);
VALID_ARCHS = "i386 x86_64";
};
name = "Release-template";
Expand Down Expand Up @@ -8375,7 +8388,10 @@
GCC_WARN_UNUSED_FUNCTION = NO;
INSTALL_PATH = /usr/local/lib;
PRODUCT_NAME = lua;
USER_HEADER_SEARCH_PATHS = "../../librtt .";
USER_HEADER_SEARCH_PATHS = (
../../librtt,
.,
);
ZERO_LINK = NO;
};
name = "Release-template";
Expand Down Expand Up @@ -8819,7 +8835,11 @@
SDKROOT = macosx;
SEPARATE_STRIP = NO;
STRIP_INSTALLED_PRODUCT = NO;
USER_HEADER_SEARCH_PATHS = "../../librtt ../../platform/apple .";
USER_HEADER_SEARCH_PATHS = (
../../librtt,
../../platform/apple,
.,
);
VALID_ARCHS = "i386 x86_64";
WARNING_CFLAGS = (
"-Wno-inconsistent-missing-override",
Expand Down Expand Up @@ -8891,7 +8911,11 @@
SDKROOT = macosx;
SEPARATE_STRIP = NO;
STRIP_INSTALLED_PRODUCT = NO;
USER_HEADER_SEARCH_PATHS = "../../librtt ../../platform/apple .";
USER_HEADER_SEARCH_PATHS = (
../../librtt,
../../platform/apple,
.,
);
VALID_ARCHS = "i386 x86_64";
WARNING_CFLAGS = "-Wno-inconsistent-missing-override";
};
Expand Down Expand Up @@ -8985,7 +9009,10 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = CoronaCards/Info.plist;
INSTALL_PATH = "@executable_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@loader_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
Expand Down Expand Up @@ -9035,7 +9062,10 @@
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = CoronaCards/Info.plist;
INSTALL_PATH = "@executable_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@loader_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
Expand Down Expand Up @@ -9085,7 +9115,10 @@
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = CoronaCards/Info.plist;
INSTALL_PATH = "@executable_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@loader_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
Expand Down

0 comments on commit ef6303e

Please sign in to comment.