Sitelet https://github.com/wmfgithub/core-plot/commit/7e6c5fc017fc36f2c9b1ae0c2371eb1ceb835b0b
Skip to content

Commit 7e6c5fc

Browse files
eskrocheskroch
committed
Merge branch 'master' into release-2.0
2 parents baeea08 + 2faf9c3 commit 7e6c5fc

3 files changed

Lines changed: 3 additions & 23 deletions

File tree

‎framework/CorePlot-CocoaTouch.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,10 +1208,6 @@
12081208
GCC_PREFIX_HEADER = CorePlot_Prefix.pch;
12091209
INSTALL_PATH = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)";
12101210
OTHER_CPTLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
1211-
OTHER_LDFLAGS = (
1212-
"-all_load",
1213-
"-ObjC",
1214-
);
12151211
PRODUCT_NAME = "CorePlot-CocoaTouch";
12161212
PUBLIC_HEADERS_FOLDER_PATH = "include/$(PROJECT_NAME)";
12171213
SYMROOT = "$(PROJECT_DIR)/../build";
@@ -1229,10 +1225,6 @@
12291225
GCC_PREFIX_HEADER = CorePlot_Prefix.pch;
12301226
INSTALL_PATH = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)";
12311227
OTHER_CPTLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
1232-
OTHER_LDFLAGS = (
1233-
"-all_load",
1234-
"-ObjC",
1235-
);
12361228
PRODUCT_NAME = "CorePlot-CocoaTouch";
12371229
PUBLIC_HEADERS_FOLDER_PATH = "include/$(PROJECT_NAME)";
12381230
SYMROOT = "$(PROJECT_DIR)/../build";
@@ -1287,10 +1279,7 @@
12871279
"-Wno-pedantic",
12881280
"-Wno-documentation",
12891281
);
1290-
OTHER_LDFLAGS = (
1291-
"-all_load",
1292-
"-ObjC",
1293-
);
1282+
OTHER_LDFLAGS = "-ObjC";
12941283
SDKROOT = iphoneos;
12951284
SEPARATE_STRIP = YES;
12961285
SKIP_INSTALL = YES;
@@ -1348,10 +1337,7 @@
13481337
"-Wno-pedantic",
13491338
"-Wno-documentation",
13501339
);
1351-
OTHER_LDFLAGS = (
1352-
"-all_load",
1353-
"-ObjC",
1354-
);
1340+
OTHER_LDFLAGS = "-ObjC";
13551341
SDKROOT = iphoneos;
13561342
SEPARATE_STRIP = YES;
13571343
SKIP_INSTALL = YES;

‎framework/CorePlot.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1336,7 +1336,7 @@
13361336
isa = PBXProject;
13371337
attributes = {
13381338
BuildIndependentTargetsInParallel = YES;
1339-
LastUpgradeCheck = 0500;
1339+
LastUpgradeCheck = 0510;
13401340
};
13411341
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "CorePlot" */;
13421342
compatibilityVersion = "Xcode 3.2";

‎scripts/README Creating a release package.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,3 @@ Follow these steps to create a Core Plot release and post it to GitHub:
6161
15. Change to the HTML documentation directory cloned from [core-plot.github.io](https://github.com/core-plot/core-plot.github.io):
6262

6363
`cd ../documentation/html`
64-
65-
16. Tag the current revision with the release version:
66-
67-
`$ git tag release_<version>`
68-
69-
where **&lt;version&gt;** is the version number for this release.

0 commit comments

Comments
 (0)