Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #696 from Cocoanetics/od/test_doc_build

Also test documentation comments for completeness
  • Loading branch information...
commit 2a469b97b9fb12a1916b70ae9321bb5e5dc8fb5e 2 parents 3bd5bae + 1d1f2fb
@Cocoanetics authored
View
4 .travis.yml
@@ -5,9 +5,7 @@ before_script:
- sudo easy_install cpp-coveralls
script:
- - xctool project DTCoreText.xcodeproj -scheme DemoApp build test -sdk iphonesimulator6.1 -arch i386 ONLY_ACTIVE_ARCH=NO
- - xctool project DTCoreText.xcodeproj -scheme "Mac Framework" test -arch x86_64 ONLY_ACTIVE_ARCH=NO
- - appledoc -o /tmp .
+ - ./build.sh
after_success:
- ./coveralls.rb --extension m --exclude-folder Demo --exclude-folder Test --exclude-folder Externals
View
2  Core/Source/DTCoreTextGlyphRun.h
@@ -36,7 +36,7 @@
@param run The Core Text glyph run to wrap
@param layoutLine The layout line that this glyph run belongs to
@param offset The offset from the left line origin to place the glyph run at
- @retuns An initialized DTCoreTextGlyphRun
+ @returns An initialized DTCoreTextGlyphRun
*/
- (id)initWithRun:(CTRunRef)run layoutLine:(DTCoreTextLayoutLine *)layoutLine offset:(CGFloat)offset;
View
1  Core/Source/DTCoreTextLayoutFrame.h
@@ -144,7 +144,6 @@ typedef NS_ENUM(NSUInteger, DTCoreTextLayoutFrameDrawingOptions)
@param context A graphics context to draw into
@param drawImages Whether images should be drawn together with the text. If you specify `NO` then space is left blank where images would go and you have to add your own views to display these images.
@param drawLinks Whether hyperlinks should be drawn together with the text. If you specify `NO` then space is left blank where links would go and you have to add your own views to display these images.
- @param drawImages Whether hyperlinks should be drawn together with the text. If you specify `NO` then space is left blank where links would go and you have to add your own views to display these links.
*/
- (void)drawInContext:(CGContextRef)context drawImages:(BOOL)drawImages drawLinks:(BOOL)drawLinks __attribute__((deprecated("use -[DTCoreTextLayoutFrame drawInContext:options:] instead")));
View
2  Core/Source/DTTextAttachment.m
@@ -176,7 +176,7 @@ + (Class)registeredClassForTagName:(NSString *)tagName
#pragma mark Properties
/** Mutator for originalSize. Sets displaySize to the same value as originalSize.
- @param The CGSize to store in originalSize. */
+ @param originalSize The CGSize to store in originalSize. */
- (void)setOriginalSize:(CGSize)originalSize
{
if (!CGSizeEqualToSize(originalSize, _originalSize))
View
8 DTCoreText.xcodeproj/project.pbxproj
@@ -2581,7 +2581,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "/usr/local/bin/appledoc --print-settings --output \"${BUILD_DIR}/Documentation/\" \"${PROJECT_DIR}\"\necho \"Documentation Output directory: ${BUILD_DIR}/Documentation/\"";
+ shellScript = "echo \"Documentation Output directory: ${BUILD_DIR}/Documentation/\"\n/usr/local/bin/appledoc --print-settings --output \"${BUILD_DIR}/Documentation/\" \"${PROJECT_DIR}\"\nexit $?";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@@ -3064,6 +3064,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
+ CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
COPY_PHASE_STRIP = NO;
DSTROOT = /tmp/DTCoreText.dst;
@@ -3073,6 +3074,7 @@
GCC_PREFIX_HEADER = "Core/DTCoreText-Prefix.pch";
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_THUMB_SUPPORT = NO;
+ GCC_TREAT_WARNINGS_AS_ERRORS = YES;
PRODUCT_NAME = DTCoreText;
PUBLIC_HEADERS_FOLDER_PATH = ../../DTCoreText;
SDKROOT = iphoneos;
@@ -3085,12 +3087,14 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
+ CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
COPY_PHASE_STRIP = YES;
DSTROOT = /tmp/DTCoreText.dst;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_PREFIX_HEADER = "Core/DTCoreText-Prefix.pch";
GCC_THUMB_SUPPORT = NO;
+ GCC_TREAT_WARNINGS_AS_ERRORS = YES;
PRODUCT_NAME = DTCoreText;
PUBLIC_HEADERS_FOLDER_PATH = ../../DTCoreText;
SDKROOT = iphoneos;
@@ -3368,6 +3372,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
+ CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
COPY_PHASE_STRIP = NO;
DSTROOT = /tmp/DTCoreText.dst;
@@ -3379,6 +3384,7 @@
GCC_PREFIX_HEADER = "Core/DTCoreText-Prefix.pch";
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_THUMB_SUPPORT = NO;
+ GCC_TREAT_WARNINGS_AS_ERRORS = YES;
PRODUCT_NAME = DTCoreText;
PUBLIC_HEADERS_FOLDER_PATH = ../../DTCoreText;
SDKROOT = iphoneos;
View
59 DTCoreText.xcodeproj/xcshareddata/xcschemes/Documentation.xcscheme
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "0500"
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "A7174BC414F288F900C57464"
+ BuildableName = "Documentation"
+ BlueprintName = "Documentation"
+ ReferencedContainer = "container:DTCoreText.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ buildConfiguration = "Debug">
+ <Testables>
+ </Testables>
+ </TestAction>
+ <LaunchAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Debug"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
+ <AdditionalOptions>
+ </AdditionalOptions>
+ </LaunchAction>
+ <ProfileAction
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>
2  Externals/DTFoundation
@@ -1 +1 @@
-Subproject commit 5595cc49f0e2be2386c9dd201354b3e4ea8cbfe1
+Subproject commit ce56730c56f7efe0ff9c675ead6145edd2d0e819
View
5 build.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+xctool -project DTCoreText.xcodeproj -scheme DemoApp build test -sdk iphonesimulator6.1 -arch i386 ONLY_ACTIVE_ARCH=NO
+xctool -project DTCoreText.xcodeproj -scheme "Mac Framework" test -arch x86_64 ONLY_ACTIVE_ARCH=NO
+xctool -project DTCoreText.xcodeproj -scheme "Documentation"
Please sign in to comment.
Something went wrong with that request. Please try again.