Commit 5fbe35e0 authored by Andreas Traczyk's avatar Andreas Traczyk Committed by Kateryna Kostiuk

project: add daemon src and target to xcode project

- Adds a group that points to the daemon src.

- Adds a dummy target that runs makes the daemon and copies the
  output libs for consumption by the client. The client target
  can be set to depend on the daemon build.

Change-Id: Iffdcfa4657fa244bb09c809f8bd0c8b08b0eed05
Reviewed-by: Kateryna Kostiuk's avatarKateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
parent 47c38f37
......@@ -6,6 +6,20 @@
objectVersion = 46;
objects = {
/* Begin PBXAggregateTarget section */
62366028200914C1002598C1 /* libring */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 62366029200914C1002598C1 /* Build configuration list for PBXAggregateTarget "libring" */;
buildPhases = (
6236602D200914C9002598C1 /* ShellScript */,
);
dependencies = (
);
name = libring;
productName = libring;
};
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
024B612C1DF7654F00C4F9DE /* DaemonServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 024B612B1DF7654F00C4F9DE /* DaemonServiceTests.swift */; };
024B61311DF7656A00C4F9DE /* FixtureFailInitDRingAdapter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 024B612E1DF7656A00C4F9DE /* FixtureFailInitDRingAdapter.mm */; };
......@@ -209,11 +223,11 @@
56BBC9DF1EDDC9D300CDAF8B /* LookupNameResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 56BBC9DE1EDDC9D300CDAF8B /* LookupNameResponse.m */; };
56C715FF1F0D36C600770048 /* ContactsAdapter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 56C715FE1F0D36C600770048 /* ContactsAdapter.mm */; };
5C093F011FB495830011D90E /* Differentiator.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C093F001FB495830011D90E /* Differentiator.framework */; };
5C0FACC51FBE2B3F007B8032 /* NewAccountsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C0FACC41FBE2B3F007B8032 /* NewAccountsService.swift */; };
5CE66F751FBF769B00EE9291 /* InitialLoadingViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5CE66F731FBF769B00EE9291 /* InitialLoadingViewController.storyboard */; };
5CE66F761FBF769B00EE9291 /* InitialLoadingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CE66F741FBF769B00EE9291 /* InitialLoadingViewController.swift */; };
621231F91F880EDF009B86F0 /* UILabel+Ring.swift in Sources */ = {isa = PBXBuildFile; fileRef = 621231F81F880EDF009B86F0 /* UILabel+Ring.swift */; };
621231FB1F8D6FEE009B86F0 /* MessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 621231FA1F8D6FEE009B86F0 /* MessageCell.swift */; };
623660AA20092081002598C1 /* src in Resources */ = {isa = PBXBuildFile; fileRef = 623660A920092081002598C1 /* src */; };
62A88D371F6C2ED400F8AB18 /* PresenceAdapterDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62A88D361F6C2ED400F8AB18 /* PresenceAdapterDelegate.swift */; };
62A88D391F6C323500F8AB18 /* PresenceAdapter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 62A88D381F6C323500F8AB18 /* PresenceAdapter.mm */; };
62A88D3B1F6C3ACC00F8AB18 /* PresenceService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62A88D3A1F6C3ACC00F8AB18 /* PresenceService.swift */; };
......@@ -470,11 +484,11 @@
56C716001F0D36D900770048 /* ContactsAdapterDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContactsAdapterDelegate.swift; sourceTree = "<group>"; };
56C716021F0D466100770048 /* ContactsService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContactsService.swift; sourceTree = "<group>"; };
5C093F001FB495830011D90E /* Differentiator.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Differentiator.framework; path = Carthage/Build/iOS/Differentiator.framework; sourceTree = "<group>"; };
5C0FACC41FBE2B3F007B8032 /* NewAccountsService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewAccountsService.swift; sourceTree = "<group>"; };
5CE66F731FBF769B00EE9291 /* InitialLoadingViewController.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = InitialLoadingViewController.storyboard; sourceTree = "<group>"; };
5CE66F741FBF769B00EE9291 /* InitialLoadingViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InitialLoadingViewController.swift; sourceTree = "<group>"; };
621231F81F880EDF009B86F0 /* UILabel+Ring.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UILabel+Ring.swift"; sourceTree = "<group>"; };
621231FA1F8D6FEE009B86F0 /* MessageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageCell.swift; sourceTree = "<group>"; };
623660A920092081002598C1 /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = ../../daemon/src; sourceTree = "<group>"; };
62A88D351F6C2E5F00F8AB18 /* PresenceAdapter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PresenceAdapter.h; sourceTree = "<group>"; };
62A88D361F6C2ED400F8AB18 /* PresenceAdapterDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PresenceAdapterDelegate.swift; sourceTree = "<group>"; };
62A88D381F6C323500F8AB18 /* PresenceAdapter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PresenceAdapter.mm; sourceTree = "<group>"; };
......@@ -762,6 +776,7 @@
043999EA1D1C2D9D00E99CD9 = {
isa = PBXGroup;
children = (
6236602520091425002598C1 /* daemon */,
0273C3001E0C445200CF00BA /* RingPrefixHeader.pch */,
04399A991D1C2F6400E99CD9 /* SYS_DEPS */,
04399A921D1C2E3600E99CD9 /* RING_DEPS */,
......@@ -1247,6 +1262,14 @@
path = Features/InitialLoading;
sourceTree = "<group>";
};
6236602520091425002598C1 /* daemon */ = {
isa = PBXGroup;
children = (
623660A920092081002598C1 /* src */,
);
name = daemon;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
......@@ -1339,6 +1362,10 @@
ProvisioningStyle = Automatic;
TestTargetID = 043999F21D1C2D9D00E99CD9;
};
62366028200914C1002598C1 = {
CreatedOnToolsVersion = 9.2;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = 043999EE1D1C2D9D00E99CD9 /* Build configuration list for PBXProject "Ring" */;
......@@ -1402,6 +1429,7 @@
043999F21D1C2D9D00E99CD9 /* Ring */,
04399A0B1D1C2D9D00E99CD9 /* RingTests */,
04399A161D1C2D9D00E99CD9 /* RingUITests */,
62366028200914C1002598C1 /* libring */,
);
};
/* End PBXProject section */
......@@ -1418,6 +1446,7 @@
1A2D18F61F292D7200B2C785 /* MessageCellReceived.xib in Resources */,
0ED2B6FA1F96A075001572F0 /* LinkNewDeviceViewController.storyboard in Resources */,
1A2D18EF1F291A0100B2C785 /* MeDetailViewController.storyboard in Resources */,
623660AA20092081002598C1 /* src in Resources */,
1A2D18B11F2915B600B2C785 /* SmartlistViewController.storyboard in Resources */,
0E403F831F7D79B000C80BC2 /* MessageCellGenerated.xib in Resources */,
04399A031D1C2D9D00E99CD9 /* Images.xcassets in Resources */,
......@@ -1524,6 +1553,19 @@
shellPath = /bin/sh;
shellScript = "${PROJECT_DIR}/swiftgen/swiftgen.sh";
};
6236602D200914C9002598C1 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cd ../../daemon/build-ios-arm64\nmake -j4\ncd ../../client-ios\ncp -r ../daemon/src/dring fat/include/\nfind ../daemon/build-ios-arm64/ -name '*.a' -exec cp '{}' fat/lib \\;";
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
......@@ -2110,6 +2152,30 @@
};
name = Development;
};
6236602A200914C1002598C1 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
6236602B200914C1002598C1 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Development;
};
6236602C200914C1002598C1 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
......@@ -2153,6 +2219,16 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
62366029200914C1002598C1 /* Build configuration list for PBXAggregateTarget "libring" */ = {
isa = XCConfigurationList;
buildConfigurations = (
6236602A200914C1002598C1 /* Debug */,
6236602B200914C1002598C1 /* Development */,
6236602C200914C1002598C1 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 043999EB1D1C2D9D00E99CD9 /* Project object */;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment