Skip to content
This repository has been archived by the owner on Nov 16, 2023. It is now read-only.

Commit

Permalink
Merged PR 269480: Rename static library target
Browse files Browse the repository at this point in the history 
Rename static library target

We initially wanted to keep the static library name the same as the framework, but this causes an issue where both the static library and framework produce identically named modules. This causes a conflict in building the test app where it compiles against the static library module but links in the framework.

Let's uniquely name the static library to OfficeUIFabricLib to avoid any ambiguity.
  • Loading branch information
@markavitale
markavitale committed May 15, 2019
1 parent 00f1f7e commit 0744b31
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
22 changes: 11 additions & 11 deletions OfficeUIFabric.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
8FD01166228A820600D25925 /* libOfficeUIFabric.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libOfficeUIFabric.a; sourceTree = BUILT_PRODUCTS_DIR; };
8FD01166228A820600D25925 /* libOfficeUIFabricLib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libOfficeUIFabricLib.a; sourceTree = BUILT_PRODUCTS_DIR; };
A5237ACA21DED7030040BF27 /* MSResizingHandleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSResizingHandleView.swift; sourceTree = "<group>"; };
A5237ACC21ED6CA70040BF27 /* DrawerShadowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DrawerShadowView.swift; sourceTree = "<group>"; };
A54D97D9217A5FC10072681A /* CALayer+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CALayer+Extensions.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -468,7 +468,7 @@
A5CEC15120D980B20016922A /* OfficeUIFabric.framework */,
A5CEC15A20D980B30016922A /* OfficeUIFabricTests.xctest */,
A5DA88FC226FAA01000A8EA8 /* OfficeUIFabricResources.bundle */,
8FD01166228A820600D25925 /* libOfficeUIFabric.a */,
8FD01166228A820600D25925 /* libOfficeUIFabricLib.a */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -715,9 +715,9 @@
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
8FD01165228A820600D25925 /* OfficeUIFabricStaticLib */ = {
8FD01165228A820600D25925 /* OfficeUIFabricLib */ = {
isa = PBXNativeTarget;
buildConfigurationList = 8FD0116A228A820600D25925 /* Build configuration list for PBXNativeTarget "OfficeUIFabricStaticLib" */;
buildConfigurationList = 8FD0116A228A820600D25925 /* Build configuration list for PBXNativeTarget "OfficeUIFabricLib" */;
buildPhases = (
8FD01162228A820600D25925 /* Sources */,
);
Expand All @@ -726,9 +726,9 @@
dependencies = (
8FD011C8228A831700D25925 /* PBXTargetDependency */,
);
name = OfficeUIFabricStaticLib;
name = OfficeUIFabricLib;
productName = OfficeUIFabricStaticLib;
productReference = 8FD01166228A820600D25925 /* libOfficeUIFabric.a */;
productReference = 8FD01166228A820600D25925 /* libOfficeUIFabricLib.a */;
productType = "com.apple.product-type.library.static";
};
A5CEC15020D980B20016922A /* OfficeUIFabric */ = {
Expand Down Expand Up @@ -860,7 +860,7 @@
targets = (
A5CEC15020D980B20016922A /* OfficeUIFabric */,
A5DA88FB226FAA01000A8EA8 /* OfficeUIFabricResources */,
8FD01165228A820600D25925 /* OfficeUIFabricStaticLib */,
8FD01165228A820600D25925 /* OfficeUIFabricLib */,
A5CEC15920D980B30016922A /* OfficeUIFabricTests */,
);
};
Expand Down Expand Up @@ -1223,7 +1223,7 @@
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = OfficeUIFabric;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
};
Expand All @@ -1235,7 +1235,7 @@
CODE_SIGN_STYLE = Automatic;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = OfficeUIFabric;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
};
Expand All @@ -1247,7 +1247,7 @@
CODE_SIGN_STYLE = Automatic;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = OfficeUIFabric;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
};
Expand Down Expand Up @@ -1611,7 +1611,7 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
8FD0116A228A820600D25925 /* Build configuration list for PBXNativeTarget "OfficeUIFabricStaticLib" */ = {
8FD0116A228A820600D25925 /* Build configuration list for PBXNativeTarget "OfficeUIFabricLib" */ = {
isa = XCConfigurationList;
buildConfigurations = (
8FD0116B228A820600D25925 /* Debug */,
Expand Down
12 changes: 6 additions & 6 deletions ...cschemes/OfficeUIFabricStaticLib.xcscheme → ...data/xcschemes/OfficeUIFabricLib.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8FD01165228A820600D25925"
BuildableName = "libOfficeUIFabric.a"
BlueprintName = "OfficeUIFabricStaticLib"
BuildableName = "libOfficeUIFabricLib.a"
BlueprintName = "OfficeUIFabricLib"
ReferencedContainer = "container:OfficeUIFabric.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand Down Expand Up @@ -46,8 +46,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8FD01165228A820600D25925"
BuildableName = "libOfficeUIFabric.a"
BlueprintName = "OfficeUIFabricStaticLib"
BuildableName = "libOfficeUIFabricLib.a"
BlueprintName = "OfficeUIFabricLib"
ReferencedContainer = "container:OfficeUIFabric.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand All @@ -64,8 +64,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8FD01165228A820600D25925"
BuildableName = "libOfficeUIFabric.a"
BlueprintName = "OfficeUIFabricStaticLib"
BuildableName = "libOfficeUIFabricLib.a"
BlueprintName = "OfficeUIFabricLib"
ReferencedContainer = "container:OfficeUIFabric.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down

0 comments on commit 0744b31

Please sign in to comment.