Permalink
Browse files

Fixed project setup

  • Loading branch information...
1 parent 7701493 commit 729df32992fe7817b66eec16bca155f0aac92006 Roman Priebe committed Feb 6, 2016
View
@@ -4,15 +4,17 @@ xcode_project: HTMLPurifier.xcodeproj
xcode_scheme: HTMLPurifier
# xcode_sdk: iphonesimulator8.1
-# before_install:
-# - sudo easy_install cpp-coveralls
-# - gem install slather
- # - brew uninstall xctool
- # - brew update
- # - brew install xctool --HEAD
+before_install:
+ - sudo easy_install cpp-coveralls
+ - gem install slather
-# script:
-# - xctool -project HTMLPurifier.xcodeproj -scheme HTMLPurifieriOS -sdk iphonesimulator8.1 clean test ONLY_ACTIVE_ARCH=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES
+install:
+- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
+script:
+# - set -o pipefail && xcodebuild test -workspace Example/MProtoBuf.xcworkspace -scheme MProtoBufiOS -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty -c
+- pod lib lint --quick
+- xctool -project Example/MProtoBuf.xcodeproj -scheme MProtoBufiOS -sdk iphonesimulator8.1 clean test ONLY_ACTIVE_ARCH=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES
-# after_success:
-# - slather
+
+after_success:
+ - slather
Binary file not shown.
Binary file not shown.
@@ -1,14 +1,14 @@
Pod::Spec.new do |s|
s.name = "HTMLPurifier"
- s.version = "1.0.8"
+ s.version = "1.0.9"
s.summary = "HTMLPurifier for Objective-C is a framework for standards-compliant HTML filtering."
s.description = "HTMLPurifier for Objective-C is a framework for standards-compliant HTML filtering. Its main purpose is sanitisation of untrusted HTML such as incoming emails or user-supplied markup."
s.homepage = "https://mynigma.org"
s.license = { :type => 'GPL with libgit2-style exception' }
s.author = { 'Edward Z. Yang' => 'ezyang@cs.stanford.edu',
'Roman Priebe' => 'roman@mynigma.org',
'Lukas Neumann' => 'lukas@mynigma.org' }
- s.source = { :git => 'https://github.com/Mynigma/HTMLPurifier.git', :tag => '1.0.8' }
+ s.source = { :git => 'https://github.com/Mynigma/HTMLPurifier.git', :tag => '1.0.9' }
s.social_media_url = 'https://www.facebook.com/mynigma'
s.ios.deployment_target = '7.0'
@@ -17,7 +17,8 @@ Pod::Spec.new do |s|
s.source_files = 'HTMLPurifier/**/*.{h,m}'
s.public_header_files = 'HTMLPurifier/**/*.h'
-
+ s.resource = 'HTMLPurifier/Supporting Files/HTMLPurifierConfig.plist'
+
s.library = 'xml2'
s.xcconfig = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' }
end
@@ -885,7 +885,6 @@
80E5A89218929F2E008A093D /* HTMLPurifier_ChildDef_CustomTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTMLPurifier_ChildDef_CustomTest.m; sourceTree = "<group>"; };
80EDF9BB18803B3200EB1E89 /* HTMLPurifier.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HTMLPurifier.framework; sourceTree = BUILT_PRODUCTS_DIR; };
80EDF9BE18803B3200EB1E89 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
- 80EDF9C118803B3200EB1E89 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
80EDF9C218803B3200EB1E89 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
80EDF9C318803B3200EB1E89 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
80EDF9D218803B3200EB1E89 /* HTMLPurifierTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = HTMLPurifierTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1506,9 +1505,7 @@
1EEE87AE188EC7AA00BDA422 /* OCMock.framework */,
1E5FAAC71885A2640073CA79 /* libiconv.2.dylib */,
1EBB81D91882C94D008B7FA4 /* libxml2.dylib */,
- 80EDF9BE18803B3200EB1E89 /* Cocoa.framework */,
80EDF9D318803B3200EB1E89 /* XCTest.framework */,
- 802AC8DF18DC8FFD00C2BA85 /* Foundation.framework */,
802AC8EF18DC8FFD00C2BA85 /* UIKit.framework */,
80EDF9C018803B3200EB1E89 /* Other Frameworks */,
);
@@ -1518,7 +1515,8 @@
80EDF9C018803B3200EB1E89 /* Other Frameworks */ = {
isa = PBXGroup;
children = (
- 80EDF9C118803B3200EB1E89 /* Foundation.framework */,
+ 80EDF9BE18803B3200EB1E89 /* Cocoa.framework */,
+ 802AC8DF18DC8FFD00C2BA85 /* Foundation.framework */,
80EDF9C218803B3200EB1E89 /* CoreData.framework */,
80EDF9C318803B3200EB1E89 /* AppKit.framework */,
);
@@ -3080,6 +3078,7 @@
PUBLIC_HEADERS_FOLDER_PATH = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
+ STRIP_STYLE = "non-global";
SYMROOT = build;
};
name = Debug;
@@ -3110,6 +3109,7 @@
PUBLIC_HEADERS_FOLDER_PATH = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
+ STRIP_STYLE = "non-global";
SYMROOT = build;
VALIDATE_PRODUCT = YES;
};
@@ -3119,14 +3119,15 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ENABLE_CODE_COVERAGE = NO;
CLANG_ENABLE_MODULES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(DEVELOPER_FRAMEWORKS_DIR)",
);
- GCC_GENERATE_TEST_COVERAGE_FILES = YES;
- GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
+ GCC_GENERATE_TEST_COVERAGE_FILES = NO;
+ GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "HTMLPurifieriOS/HTMLPurifieriOS-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -3161,14 +3162,15 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ENABLE_CODE_COVERAGE = NO;
CLANG_ENABLE_MODULES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(DEVELOPER_FRAMEWORKS_DIR)",
);
- GCC_GENERATE_TEST_COVERAGE_FILES = YES;
- GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
+ GCC_GENERATE_TEST_COVERAGE_FILES = NO;
+ GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "HTMLPurifieriOS/HTMLPurifieriOS-Prefix.pch";
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
@@ -3337,8 +3339,8 @@
"$(PROJECT_DIR)",
);
FRAMEWORK_VERSION = A;
- GCC_GENERATE_TEST_COVERAGE_FILES = YES;
- GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
+ GCC_GENERATE_TEST_COVERAGE_FILES = NO;
+ GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Supporting Files/HTMLPurifier-Prefix.pch";
HEADER_SEARCH_PATHS = (
@@ -3363,6 +3365,7 @@
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/HTMLPurifier.framework/Versions/A/HTMLPurifier";
+ CLANG_ENABLE_CODE_COVERAGE = NO;
CLANG_ENABLE_OBJC_ARC = YES;
COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
@@ -3371,8 +3374,8 @@
"$(PROJECT_DIR)",
"$(SRCROOT)",
);
- GCC_GENERATE_TEST_COVERAGE_FILES = YES;
- GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
+ GCC_GENERATE_TEST_COVERAGE_FILES = NO;
+ GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Supporting Files/HTMLPurifier-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -3395,6 +3398,7 @@
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/HTMLPurifier.framework/Versions/A/HTMLPurifier";
+ CLANG_ENABLE_CODE_COVERAGE = NO;
CLANG_ENABLE_OBJC_ARC = YES;
COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
@@ -3403,8 +3407,8 @@
"$(PROJECT_DIR)",
"$(SRCROOT)",
);
- GCC_GENERATE_TEST_COVERAGE_FILES = YES;
- GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
+ GCC_GENERATE_TEST_COVERAGE_FILES = NO;
+ GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Supporting Files/HTMLPurifier-Prefix.pch";
INFOPLIST_FILE = "HTMLPurifierTests/HTMLPurifierTests-Info.plist";
@@ -23,10 +23,11 @@
</BuildActionEntries>
</BuildAction>
<TestAction
+ buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
- buildConfiguration = "Debug">
+ codeCoverageEnabled = "YES">
<Testables>
<TestableReference
skipped = "NO">
@@ -39,15 +40,18 @@
</BuildableReference>
</TestableReference>
</Testables>
+ <AdditionalOptions>
+ </AdditionalOptions>
</TestAction>
<LaunchAction
+ buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
+ debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
@@ -62,10 +66,10 @@
</AdditionalOptions>
</LaunchAction>
<ProfileAction
+ buildConfiguration = "Debug"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
@@ -23,10 +23,11 @@
</BuildActionEntries>
</BuildAction>
<TestAction
+ buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
- buildConfiguration = "Debug">
+ codeCoverageEnabled = "YES">
<Testables>
<TestableReference
skipped = "NO">
@@ -39,15 +40,18 @@
</BuildableReference>
</TestableReference>
</Testables>
+ <AdditionalOptions>
+ </AdditionalOptions>
</TestAction>
<LaunchAction
+ buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
+ debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
@@ -62,10 +66,10 @@
</AdditionalOptions>
</LaunchAction>
<ProfileAction
+ buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
@@ -44,10 +44,14 @@ - (id)initWithParent:(HTMLPurifier_PropertyList*)parentPlist
- (void)actuallyReadPlist
{
- NSURL* configPlistPath = [BUNDLE URLForResource:@"config" withExtension:@"plist"];
+ //check for a user-defined config first
+ NSURL* configPlistPath = [[NSBundle mainBundle] URLForResource:@"HTMLPurifierCustomConfig" withExtension:@"plist"];
+ if(!configPlistPath)
+ configPlistPath = [BUNDLE URLForResource:@"HTMLPurifierConfig" withExtension:@"plist"];
+
if(!configPlistPath)
{
- NSLog(@"Error opening config plist file!! Please include the config.plist in bundle: %@", BUNDLE);
+ NSLog(@"Error opening config plist file!!! Please include either 'HTMLPurifierCustomConfig.plist' in main bundle or 'HTMLPurifierConfig.plist' in bundle: %@", [NSBundle bundleForClass:[self class]]);
return;
}
View
Binary file not shown.
View
Binary file not shown.

0 comments on commit 729df32

Please sign in to comment.