From 43a065bdc41d801052a2624c511d9edd3d955d72 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 14 Aug 2016 23:40:35 +0300 Subject: [PATCH] Fixed build dependencies in Telegram/MetaLang/codegen Xcode projects. --- Telegram/MetaLang.xcodeproj/project.pbxproj | 6 +- Telegram/Telegram.xcodeproj/project.pbxproj | 166 +++++++++++++------- 2 files changed, 113 insertions(+), 59 deletions(-) diff --git a/Telegram/MetaLang.xcodeproj/project.pbxproj b/Telegram/MetaLang.xcodeproj/project.pbxproj index b44e51e16..d36ec46e9 100644 --- a/Telegram/MetaLang.xcodeproj/project.pbxproj +++ b/Telegram/MetaLang.xcodeproj/project.pbxproj @@ -11,8 +11,8 @@ isa = PBXAggregateTarget; buildConfigurationList = 6CC3B5D2136C7CD6A5CF5A59 /* Build configuration list for PBXNativeTarget "MetaLang" */; buildPhases = ( - 7EF0942E79C014DCEC8976BC /* Qt Preprocessors */, 07C3AF44194CCD360016CFF1 /* ShellScript */, + 7EF0942E79C014DCEC8976BC /* Qt Preprocessors */, ); dependencies = ( ); @@ -22,8 +22,8 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 07D7954A1B5544B200DE9598 /* qtpcre in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 07D795491B5544B200DE9598 /* qtpcre */; }; 0785004D1CCA847400168DBB /* libqtfreetype.a in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 0785004C1CCA847400168DBB /* libqtfreetype.a */; }; + 07D7954A1B5544B200DE9598 /* qtpcre in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 07D795491B5544B200DE9598 /* qtpcre */; }; 0E4EEB1BFC9FA7662AD934C6 /* moc_genlang.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 680437016D61255E7F889A94 /* moc_genlang.cpp */; settings = {ATTRIBUTES = (); }; }; 1A681B886F50EE30FBE62B4B /* Qt5PrintSupport in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = DBF506D10449BFABD45B82DA /* Qt5PrintSupport */; }; 1BB705CDB741E2B7450201A5 /* Cocoa.framework in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = AEA456A2F75ED9F5CDA7BCBE /* Cocoa.framework */; }; @@ -64,8 +64,8 @@ /* Begin PBXFileReference section */ 04391BE7A8B9D811E255100A /* Qt5Gui */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Gui; path = "$(QT_PATH)/lib/libQt5Gui$(QT_LIBRARY_SUFFIX).a"; sourceTree = ""; }; - 07D795491B5544B200DE9598 /* qtpcre */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtpcre; path = "$(QT_PATH)/lib/libqtpcre$(QT_LIBRARY_SUFFIX).a"; sourceTree = ""; }; 0785004C1CCA847400168DBB /* libqtfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libqtfreetype.a; path = "$(QT_PATH)/lib/libqtfreetype$(QT_LIBRARY_SUFFIX).a"; sourceTree = ""; }; + 07D795491B5544B200DE9598 /* qtpcre */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtpcre; path = "$(QT_PATH)/lib/libqtpcre$(QT_LIBRARY_SUFFIX).a"; sourceTree = ""; }; 31120EDB269DFF13E1D49847 /* qicns */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qicns; path = "$(QT_PATH)/plugins/imageformats/libqicns$(QT_LIBRARY_SUFFIX).a"; sourceTree = ""; }; 4689C06178B60B84E7F3A3B7 /* Qt5Widgets */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Widgets; path = "$(QT_PATH)/lib/libQt5Widgets$(QT_LIBRARY_SUFFIX).a"; sourceTree = ""; }; 4D765E1B1EA6C757220C63E7 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; }; diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index 2b81157ab..8fce51523 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -24,8 +24,14 @@ buildConfigurationList = 07C3AF3D194CCC310016CFF1 /* Build configuration list for PBXAggregateTarget "Meta Compile" */; buildPhases = ( 07C3AF3B194CCC310016CFF1 /* Meta Lang */, + 07D1ED8F1D60E15800980D3B /* Generate styles */, + 07D1ED901D60E16A00980D3B /* Generate numbers */, ); dependencies = ( + 07D1ED921D60E22A00980D3B /* PBXTargetDependency */, + 07D1ED8A1D60E13300980D3B /* PBXTargetDependency */, + 07D1ED8E1D60E13A00980D3B /* PBXTargetDependency */, + 07D1ED8C1D60E13600980D3B /* PBXTargetDependency */, ); name = "Meta Compile"; productName = "Qt Preprocess"; @@ -368,20 +374,6 @@ remoteGlobalIDString = 0747FEE61CC63AD900096FC3; remoteInfo = codegen_numbers; }; - 0747FF701CC63FF300096FC3 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0747FF1B1CC63E7E00096FC3 /* codegen_style.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 0747FE591CC62B8500096FC3; - remoteInfo = codegen_style; - }; - 0747FF721CC63FFD00096FC3 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0747FF271CC63E9900096FC3 /* codegen_numbers.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 0747FEE51CC63AD900096FC3; - remoteInfo = codegen_numbers; - }; 07C3AF22194335970016CFF1 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 6DB9C3763D02B1415CD9D565 /* Project object */; @@ -396,6 +388,41 @@ remoteGlobalIDString = 07C3AF39194CCC310016CFF1; remoteInfo = "Meta Compile"; }; + 07D1ED861D60E11D00980D3B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 07D1ED811D60E11D00980D3B /* MetaLang.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 83FFCB79DDEB015B4A5CB301; + remoteInfo = MetaLang; + }; + 07D1ED891D60E13300980D3B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 07D1ED811D60E11D00980D3B /* MetaLang.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 6FFA5F0FB08CCD004808E1F3; + remoteInfo = MetaLang; + }; + 07D1ED8B1D60E13600980D3B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0747FF271CC63E9900096FC3 /* codegen_numbers.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 0747FEE51CC63AD900096FC3; + remoteInfo = codegen_numbers; + }; + 07D1ED8D1D60E13A00980D3B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0747FF1B1CC63E7E00096FC3 /* codegen_style.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 0747FE591CC62B8500096FC3; + remoteInfo = codegen_style; + }; + 07D1ED911D60E22A00980D3B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 07D1ED811D60E11D00980D3B /* MetaLang.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 9BBFDCA776106924C40572AD; + remoteInfo = Preprocess; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -639,6 +666,7 @@ 07C8FE0D1CB80890007A8702 /* toast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = toast.h; path = SourceFiles/ui/toast/toast.h; sourceTree = SOURCE_ROOT; }; 07C8FE111CB80915007A8702 /* moc_toast_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_toast_manager.cpp; path = GeneratedFiles/Debug/moc_toast_manager.cpp; sourceTree = SOURCE_ROOT; }; 07CAACD71AEA64F00058E508 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; + 07D1ED811D60E11D00980D3B /* MetaLang.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = MetaLang.xcodeproj; sourceTree = SOURCE_ROOT; }; 07D518D41CD0E27600F5FF59 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = version.h; path = SourceFiles/core/version.h; sourceTree = SOURCE_ROOT; }; 07D7034919B8755A00C4EED2 /* media_audio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = media_audio.cpp; path = SourceFiles/media/media_audio.cpp; sourceTree = SOURCE_ROOT; }; 07D7034A19B8755A00C4EED2 /* media_audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = media_audio.h; path = SourceFiles/media/media_audio.h; sourceTree = SOURCE_ROOT; }; @@ -1077,6 +1105,7 @@ 0747FE4F1CC62AE400096FC3 /* codegen */ = { isa = PBXGroup; children = ( + 07D1ED811D60E11D00980D3B /* MetaLang.xcodeproj */, 0747FF271CC63E9900096FC3 /* codegen_numbers.xcodeproj */, 0747FF1B1CC63E7E00096FC3 /* codegen_style.xcodeproj */, ); @@ -1289,6 +1318,14 @@ name = toast; sourceTree = ""; }; + 07D1ED821D60E11D00980D3B /* Products */ = { + isa = PBXGroup; + children = ( + 07D1ED871D60E11D00980D3B /* MetaLang.app */, + ); + name = Products; + sourceTree = ""; + }; 07E102B91D3E4B4900BD33B1 /* media */ = { isa = PBXGroup; children = ( @@ -1861,8 +1898,6 @@ isa = PBXNativeTarget; buildConfigurationList = 6CC3B5D2136C7CD6A5CF5A59 /* Build configuration list for PBXNativeTarget "Telegram" */; buildPhases = ( - 0747FF741CC6408600096FC3 /* Generate styles */, - 0747FF801CC6437300096FC3 /* Generate numbers */, F7E50F631C51CD5B5DC0BC43 /* Compile Sources */, D1C883685E82D5676953459A /* Link Binary With Libraries */, 07C3AF341948FC3B0016CFF1 /* Force Resources Directory */, @@ -1873,8 +1908,6 @@ buildRules = ( ); dependencies = ( - 0747FF731CC63FFD00096FC3 /* PBXTargetDependency */, - 0747FF711CC63FF300096FC3 /* PBXTargetDependency */, 69BB0D15D494AAF597C8D2CF /* PBXTargetDependency */, ); name = Telegram; @@ -1920,6 +1953,10 @@ ProductGroup = 0747FF1C1CC63E7E00096FC3 /* Products */; ProjectRef = 0747FF1B1CC63E7E00096FC3 /* codegen_style.xcodeproj */; }, + { + ProductGroup = 07D1ED821D60E11D00980D3B /* Products */; + ProjectRef = 07D1ED811D60E11D00980D3B /* MetaLang.xcodeproj */; + }, { ProductGroup = 07084685195445A600B5AE3A /* Products */; ProjectRef = 07084684195445A600B5AE3A /* Updater.xcodeproj */; @@ -1956,6 +1993,13 @@ remoteRef = 0747FF2B1CC63E9900096FC3 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 07D1ED871D60E11D00980D3B /* MetaLang.app */ = { + isa = PBXReferenceProxy; + fileType = wrapper.application; + path = MetaLang.app; + remoteRef = 07D1ED861D60E11D00980D3B /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -1995,34 +2039,6 @@ shellPath = /bin/sh; shellScript = "mkdir -p \"$CONFIGURATION_BUILD_DIR/$PRODUCT_NAME.app/Contents/Helpers\" && cp \"$CRASHPAD_PATH/out/Release/crashpad_handler\" \"$CONFIGURATION_BUILD_DIR/$PRODUCT_NAME.app/Contents/Helpers/\""; }; - 0747FF741CC6408600096FC3 /* Generate styles */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Generate styles"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "./../Mac/codegen/$CONFIGURATION/codegen_style \"-I./Resources\" \"-I./SourceFiles\" \"-o./GeneratedFiles/styles\" ./Resources/all_files.style --rebuild"; - }; - 0747FF801CC6437300096FC3 /* Generate numbers */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Generate numbers"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "./../Mac/codegen/$CONFIGURATION/codegen_numbers \"-o./GeneratedFiles\" ./Resources/numbers.txt"; - }; 07489B6B1A28949600348CD9 /* Build Updater */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -2065,6 +2081,34 @@ shellPath = /bin/sh; shellScript = "open ../Mac/DebugLang/MetaLang.app --args -lang_in \"../../Telegram/Resources/langs/lang.strings\" -lang_out \"../../Telegram/GeneratedFiles/lang_auto\""; }; + 07D1ED8F1D60E15800980D3B /* Generate styles */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Generate styles"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "./../Mac/codegen/$CONFIGURATION/codegen_style \"-I./Resources\" \"-I./SourceFiles\" \"-o./GeneratedFiles/styles\" ./Resources/all_files.style --rebuild"; + }; + 07D1ED901D60E16A00980D3B /* Generate numbers */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Generate numbers"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "./../Mac/codegen/$CONFIGURATION/codegen_numbers \"-o./GeneratedFiles\" ./Resources/numbers.txt"; + }; 7EF0942E79C014DCEC8976BC /* Qt Preprocessors */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -2349,21 +2393,31 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 0747FF711CC63FF300096FC3 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = codegen_style; - targetProxy = 0747FF701CC63FF300096FC3 /* PBXContainerItemProxy */; - }; - 0747FF731CC63FFD00096FC3 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = codegen_numbers; - targetProxy = 0747FF721CC63FFD00096FC3 /* PBXContainerItemProxy */; - }; 07C3AF42194CCC510016CFF1 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 07C3AF39194CCC310016CFF1 /* Meta Compile */; targetProxy = 07C3AF41194CCC510016CFF1 /* PBXContainerItemProxy */; }; + 07D1ED8A1D60E13300980D3B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = MetaLang; + targetProxy = 07D1ED891D60E13300980D3B /* PBXContainerItemProxy */; + }; + 07D1ED8C1D60E13600980D3B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = codegen_numbers; + targetProxy = 07D1ED8B1D60E13600980D3B /* PBXContainerItemProxy */; + }; + 07D1ED8E1D60E13A00980D3B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = codegen_style; + targetProxy = 07D1ED8D1D60E13A00980D3B /* PBXContainerItemProxy */; + }; + 07D1ED921D60E22A00980D3B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Preprocess; + targetProxy = 07D1ED911D60E22A00980D3B /* PBXContainerItemProxy */; + }; 69BB0D15D494AAF597C8D2CF /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 07AA07135D01069052F55A12 /* Preprocess */;