Skip to content

Commit 1c93d42

Browse files
emsquaredemsquared
committed
Modify build system
Libraries are no longer built every time framework is. Libraries are now stored in a seperate repository which is linked as a submodule.
1 parent 7c512fe commit 1c93d42

File tree

9 files changed

+9
-255
lines changed

9 files changed

+9
-255
lines changed

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "Libraries"]
2+
path = Libraries
3+
url = https://github.com/Codeux-Software/Static-Libraries.git

‎Build Dependencies/Libraries/build_libgcrypt.sh

-28
This file was deleted.

‎Build Dependencies/Libraries/build_libgpg-error.sh

-26
This file was deleted.

‎Build Dependencies/Libraries/build_libotr.sh

-27
This file was deleted.

‎Build Dependencies/Libraries/build_libressl.sh

-29
This file was deleted.

‎Build Dependencies/buildDependencies.sh

-71
This file was deleted.

‎Encryption Kit.xcodeproj/project.pbxproj

+3-72
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,6 @@
66
objectVersion = 46;
77
objects = {
88

9-
/* Begin PBXAggregateTarget section */
10-
4C0FC2FD1AC98F1A00881CE5 /* Build OSS Libraries */ = {
11-
isa = PBXAggregateTarget;
12-
buildConfigurationList = 4C0FC2FE1AC98F1A00881CE5 /* Build configuration list for PBXAggregateTarget "Build OSS Libraries" */;
13-
buildPhases = (
14-
4C0FC3001AC98F3000881CE5 /* ShellScript */,
15-
);
16-
dependencies = (
17-
);
18-
name = "Build OSS Libraries";
19-
productName = "Build OSS Libraries";
20-
};
21-
/* End PBXAggregateTarget section */
22-
239
/* Begin PBXBuildFile section */
2410
4C006C5B1AB84DA2004BE3C6 /* libgcrypt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C006C571AB84DA2004BE3C6 /* libgcrypt.a */; };
2511
4C006C5C1AB84DA2004BE3C6 /* libgpg-error.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C006C581AB84DA2004BE3C6 /* libgpg-error.a */; };
@@ -61,20 +47,10 @@
6147
4CF40F751AC1A65F00A26BE0 /* OTRKitFingerprintManagerDialog.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4CF40F731AC1A65F00A26BE0 /* OTRKitFingerprintManagerDialog.strings */; };
6248
/* End PBXBuildFile section */
6349

64-
/* Begin PBXContainerItemProxy section */
65-
4C0FC3011AC9908B00881CE5 /* PBXContainerItemProxy */ = {
66-
isa = PBXContainerItemProxy;
67-
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
68-
proxyType = 1;
69-
remoteGlobalIDString = 4C0FC2FD1AC98F1A00881CE5;
70-
remoteInfo = "Build OSS Libraries";
71-
};
72-
/* End PBXContainerItemProxy section */
73-
7450
/* Begin PBXFileReference section */
75-
4C006C571AB84DA2004BE3C6 /* libgcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgcrypt.a; path = "/private/tmp/com.codeux.frameworks.encryptionKit/Library-Build-Results/lib-static/libgcrypt.a"; sourceTree = "<absolute>"; };
76-
4C006C581AB84DA2004BE3C6 /* libgpg-error.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libgpg-error.a"; path = "/private/tmp/com.codeux.frameworks.encryptionKit/Library-Build-Results/lib-static/libgpg-error.a"; sourceTree = "<absolute>"; };
77-
4C006C591AB84DA2004BE3C6 /* libotr.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libotr.a; path = "/private/tmp/com.codeux.frameworks.encryptionKit/Library-Build-Results/lib-static/libotr.a"; sourceTree = "<absolute>"; };
51+
4C006C571AB84DA2004BE3C6 /* libgcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgcrypt.a; path = "/Users/michael/Projects/Textual/Frameworks/Encryption Kit/Libraries/Libraries/libgcrypt.a"; sourceTree = "<absolute>"; };
52+
4C006C581AB84DA2004BE3C6 /* libgpg-error.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libgpg-error.a"; path = "/Users/michael/Projects/Textual/Frameworks/Encryption Kit/Libraries/Libraries/libgpg-error.a"; sourceTree = "<absolute>"; };
53+
4C006C591AB84DA2004BE3C6 /* libotr.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libotr.a; path = "/Users/michael/Projects/Textual/Frameworks/Encryption Kit/Libraries/Libraries/libotr.a"; sourceTree = "<absolute>"; };
7854
4C006C5E1AB84E19004BE3C6 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
7955
4C006C601AB84E22004BE3C6 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
8056
4C050D7C1AB919CA00A75CBC /* ACKNOWLEDGEMENT.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ACKNOWLEDGEMENT.txt; sourceTree = "<group>"; };
@@ -359,7 +335,6 @@
359335
buildRules = (
360336
);
361337
dependencies = (
362-
4C0FC3021AC9908B00881CE5 /* PBXTargetDependency */,
363338
);
364339
name = EncryptionKit;
365340
productInstallPath = "$(HOME)/Library/Frameworks";
@@ -375,9 +350,6 @@
375350
attributes = {
376351
LastUpgradeCheck = 0900;
377352
TargetAttributes = {
378-
4C0FC2FD1AC98F1A00881CE5 = {
379-
CreatedOnToolsVersion = 6.2;
380-
};
381353
8DC2EF4F0486A6940098B216 = {
382354
ProvisioningStyle = Manual;
383355
};
@@ -399,7 +371,6 @@
399371
projectRoot = "";
400372
targets = (
401373
8DC2EF4F0486A6940098B216 /* EncryptionKit */,
402-
4C0FC2FD1AC98F1A00881CE5 /* Build OSS Libraries */,
403374
);
404375
};
405376
/* End PBXProject section */
@@ -423,22 +394,6 @@
423394
};
424395
/* End PBXResourcesBuildPhase section */
425396

426-
/* Begin PBXShellScriptBuildPhase section */
427-
4C0FC3001AC98F3000881CE5 /* ShellScript */ = {
428-
isa = PBXShellScriptBuildPhase;
429-
buildActionMask = 2147483647;
430-
files = (
431-
);
432-
inputPaths = (
433-
);
434-
outputPaths = (
435-
);
436-
runOnlyForDeploymentPostprocessing = 0;
437-
shellPath = /bin/bash;
438-
shellScript = "env -i \"${PROJECT_DIR}/Build Dependencies/buildDependencies.sh\"";
439-
};
440-
/* End PBXShellScriptBuildPhase section */
441-
442397
/* Begin PBXSourcesBuildPhase section */
443398
8DC2EF540486A6940098B216 /* Sources */ = {
444399
isa = PBXSourcesBuildPhase;
@@ -459,14 +414,6 @@
459414
};
460415
/* End PBXSourcesBuildPhase section */
461416

462-
/* Begin PBXTargetDependency section */
463-
4C0FC3021AC9908B00881CE5 /* PBXTargetDependency */ = {
464-
isa = PBXTargetDependency;
465-
target = 4C0FC2FD1AC98F1A00881CE5 /* Build OSS Libraries */;
466-
targetProxy = 4C0FC3011AC9908B00881CE5 /* PBXContainerItemProxy */;
467-
};
468-
/* End PBXTargetDependency section */
469-
470417
/* Begin XCBuildConfiguration section */
471418
1DEB91AF08733DA50010E9CD /* Release */ = {
472419
isa = XCBuildConfiguration;
@@ -488,14 +435,6 @@
488435
};
489436
name = Release;
490437
};
491-
4C0FC2FF1AC98F1A00881CE5 /* Release */ = {
492-
isa = XCBuildConfiguration;
493-
buildSettings = {
494-
PRODUCT_BUNDLE_IDENTIFIER = com.codeux.frameworks.encryptionKit;
495-
PRODUCT_NAME = "$(TARGET_NAME)";
496-
};
497-
name = Release;
498-
};
499438
/* End XCBuildConfiguration section */
500439

501440
/* Begin XCConfigurationList section */
@@ -515,14 +454,6 @@
515454
defaultConfigurationIsVisible = 0;
516455
defaultConfigurationName = Release;
517456
};
518-
4C0FC2FE1AC98F1A00881CE5 /* Build configuration list for PBXAggregateTarget "Build OSS Libraries" */ = {
519-
isa = XCConfigurationList;
520-
buildConfigurations = (
521-
4C0FC2FF1AC98F1A00881CE5 /* Release */,
522-
);
523-
defaultConfigurationIsVisible = 0;
524-
defaultConfigurationName = Release;
525-
};
526457
/* End XCConfigurationList section */
527458
};
528459
rootObject = 0867D690FE84028FC02AAC07 /* Project object */;

‎Libraries

Submodule Libraries added at 4de81e8

‎Resources/Build Configuration/Build Configuration.xcconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES
4646
GCC_WARN_UNUSED_FUNCTION = YES
4747
GCC_WARN_UNUSED_LABEL = YES
4848
GCC_WARN_UNUSED_VARIABLE = YES
49-
HEADER_SEARCH_PATHS = /private/tmp/com.codeux.frameworks.encryptionKit/Library-Build-Results/include
49+
HEADER_SEARCH_PATHS = Libraries/Headers/**
5050
INFOPLIST_OUTPUT_FORMAT = binary
5151
INSTALL_PATH = @rpath
5252
LD_NO_PIE = YES
5353
LD_RUNPATH_SEARCH_PATHS = @loader_path/../Frameworks
54-
LIBRARY_SEARCH_PATHS = /private/tmp/com.codeux.frameworks.encryptionKit/Library-Build-Results/lib-static
54+
LIBRARY_SEARCH_PATHS = Libraries/Libraries
5555
MACOSX_DEPLOYMENT_TARGET = 10.8
5656
OBJROOT = ${SRCROOT}/.tmp/SharedBuildResults
5757
ONLY_ACTIVE_ARCH = NO

0 commit comments

Comments
 (0)