Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
djinni
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
djinni
Commits
ef936c4c
Commit
ef936c4c
authored
Dec 22, 2016
by
Andrew Twyman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update ObjC build files for Xcode 8.2
parent
96d8b444
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
66 additions
and
25 deletions
+66
-25
Makefile
Makefile
+1
-2
common.gypi
common.gypi
+1
-0
example/objc/TextSort.xcodeproj/project.pbxproj
example/objc/TextSort.xcodeproj/project.pbxproj
+16
-3
example/objc/TextSort.xcodeproj/xcshareddata/xcschemes/TextSort.xcscheme
...xtSort.xcodeproj/xcshareddata/xcschemes/TextSort.xcscheme
+12
-7
example/objc/TextSort/TextSort-Info.plist
example/objc/TextSort/TextSort-Info.plist
+1
-1
test-suite/Makefile
test-suite/Makefile
+1
-1
test-suite/handwritten-src/objc/tests/DjinniObjcTestTests-Info.plist
...handwritten-src/objc/tests/DjinniObjcTestTests-Info.plist
+1
-1
test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
+16
-5
test-suite/objc/DjinniObjcTest.xcodeproj/xcshareddata/xcschemes/DjinniObjcTest.xcscheme
....xcodeproj/xcshareddata/xcschemes/DjinniObjcTest.xcscheme
+17
-5
No files found.
Makefile
View file @
ef936c4c
...
@@ -44,8 +44,7 @@ example_ios: ./build_ios/example/libtextsort.xcodeproj
...
@@ -44,8 +44,7 @@ example_ios: ./build_ios/example/libtextsort.xcodeproj
xcodebuild
-workspace
example/objc/TextSort.xcworkspace
\
xcodebuild
-workspace
example/objc/TextSort.xcworkspace
\
-scheme
TextSort
\
-scheme
TextSort
\
-configuration
'Debug'
\
-configuration
'Debug'
\
-sdk
iphonesimulator
\
-sdk
iphonesimulator
-destination
'platform=iOS Simulator,name=iPhone 6s,OS=10.1'
# this target implicitly depends on GypAndroid.mk since gradle will try to make it
# this target implicitly depends on GypAndroid.mk since gradle will try to make it
example_android
:
GypAndroid.mk
example_android
:
GypAndroid.mk
...
...
common.gypi
View file @
ef936c4c
...
@@ -13,6 +13,7 @@
...
@@ -13,6 +13,7 @@
'DEAD_CODE_STRIPPING': 'YES',
'DEAD_CODE_STRIPPING': 'YES',
'SKIP_INSTALL': 'YES',
'SKIP_INSTALL': 'YES',
'CLANG_ENABLE_OBJC_ARC': 'YES',
'CLANG_ENABLE_OBJC_ARC': 'YES',
'IPHONEOS_DEPLOYMENT_TARGET': '8.0',
},
},
"conditions": [
"conditions": [
['OS=="ios"', {
['OS=="ios"', {
...
...
example/objc/TextSort.xcodeproj/project.pbxproj
View file @
ef936c4c
...
@@ -150,7 +150,7 @@
...
@@ -150,7 +150,7 @@
isa
=
PBXProject
;
isa
=
PBXProject
;
attributes
=
{
attributes
=
{
CLASSPREFIX
=
TXS
;
CLASSPREFIX
=
TXS
;
LastUpgradeCheck
=
0
51
0
;
LastUpgradeCheck
=
0
82
0
;
ORGANIZATIONNAME
=
"Dropbox, Inc."
;
ORGANIZATIONNAME
=
"Dropbox, Inc."
;
};
};
buildConfigurationList
=
65834DD819AC599E0061AD3F
/* Build configuration list for PBXProject "TextSort" */
;
buildConfigurationList
=
65834DD819AC599E0061AD3F
/* Build configuration list for PBXProject "TextSort" */
;
...
@@ -231,13 +231,19 @@
...
@@ -231,13 +231,19 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE
=
YES_ERROR
;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE
=
YES_ERROR
;
CLANG_WARN_EMPTY_BODY
=
YES
;
CLANG_WARN_EMPTY_BODY
=
YES
;
CLANG_WARN_ENUM_CONVERSION
=
YES
;
CLANG_WARN_ENUM_CONVERSION
=
YES
;
CLANG_WARN_INFINITE_RECURSION
=
YES
;
CLANG_WARN_INT_CONVERSION
=
YES
;
CLANG_WARN_INT_CONVERSION
=
YES
;
CLANG_WARN_OBJC_ROOT_CLASS
=
YES_ERROR
;
CLANG_WARN_OBJC_ROOT_CLASS
=
YES_ERROR
;
CLANG_WARN_SUSPICIOUS_MOVE
=
YES
;
CLANG_WARN_UNREACHABLE_CODE
=
YES
;
CLANG_WARN__DUPLICATE_METHOD_MATCH
=
YES
;
CLANG_WARN__DUPLICATE_METHOD_MATCH
=
YES
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
COPY_PHASE_STRIP
=
NO
;
COPY_PHASE_STRIP
=
NO
;
ENABLE_STRICT_OBJC_MSGSEND
=
YES
;
ENABLE_TESTABILITY
=
YES
;
GCC_C_LANGUAGE_STANDARD
=
gnu99
;
GCC_C_LANGUAGE_STANDARD
=
gnu99
;
GCC_DYNAMIC_NO_PIC
=
NO
;
GCC_DYNAMIC_NO_PIC
=
NO
;
GCC_NO_COMMON_BLOCKS
=
YES
;
GCC_OPTIMIZATION_LEVEL
=
0
;
GCC_OPTIMIZATION_LEVEL
=
0
;
GCC_PREPROCESSOR_DEFINITIONS
=
(
GCC_PREPROCESSOR_DEFINITIONS
=
(
"DEBUG=1"
,
"DEBUG=1"
,
...
@@ -250,7 +256,7 @@
...
@@ -250,7 +256,7 @@
GCC_WARN_UNINITIALIZED_AUTOS
=
YES_AGGRESSIVE
;
GCC_WARN_UNINITIALIZED_AUTOS
=
YES_AGGRESSIVE
;
GCC_WARN_UNUSED_FUNCTION
=
YES
;
GCC_WARN_UNUSED_FUNCTION
=
YES
;
GCC_WARN_UNUSED_VARIABLE
=
YES
;
GCC_WARN_UNUSED_VARIABLE
=
YES
;
IPHONEOS_DEPLOYMENT_TARGET
=
7.1
;
IPHONEOS_DEPLOYMENT_TARGET
=
8.0
;
ONLY_ACTIVE_ARCH
=
YES
;
ONLY_ACTIVE_ARCH
=
YES
;
SDKROOT
=
iphoneos
;
SDKROOT
=
iphoneos
;
TARGETED_DEVICE_FAMILY
=
"1,2"
;
TARGETED_DEVICE_FAMILY
=
"1,2"
;
...
@@ -271,20 +277,25 @@
...
@@ -271,20 +277,25 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE
=
YES_ERROR
;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE
=
YES_ERROR
;
CLANG_WARN_EMPTY_BODY
=
YES
;
CLANG_WARN_EMPTY_BODY
=
YES
;
CLANG_WARN_ENUM_CONVERSION
=
YES
;
CLANG_WARN_ENUM_CONVERSION
=
YES
;
CLANG_WARN_INFINITE_RECURSION
=
YES
;
CLANG_WARN_INT_CONVERSION
=
YES
;
CLANG_WARN_INT_CONVERSION
=
YES
;
CLANG_WARN_OBJC_ROOT_CLASS
=
YES_ERROR
;
CLANG_WARN_OBJC_ROOT_CLASS
=
YES_ERROR
;
CLANG_WARN_SUSPICIOUS_MOVE
=
YES
;
CLANG_WARN_UNREACHABLE_CODE
=
YES
;
CLANG_WARN__DUPLICATE_METHOD_MATCH
=
YES
;
CLANG_WARN__DUPLICATE_METHOD_MATCH
=
YES
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
COPY_PHASE_STRIP
=
YES
;
COPY_PHASE_STRIP
=
YES
;
ENABLE_NS_ASSERTIONS
=
NO
;
ENABLE_NS_ASSERTIONS
=
NO
;
ENABLE_STRICT_OBJC_MSGSEND
=
YES
;
GCC_C_LANGUAGE_STANDARD
=
gnu99
;
GCC_C_LANGUAGE_STANDARD
=
gnu99
;
GCC_NO_COMMON_BLOCKS
=
YES
;
GCC_WARN_64_TO_32_BIT_CONVERSION
=
YES
;
GCC_WARN_64_TO_32_BIT_CONVERSION
=
YES
;
GCC_WARN_ABOUT_RETURN_TYPE
=
YES_ERROR
;
GCC_WARN_ABOUT_RETURN_TYPE
=
YES_ERROR
;
GCC_WARN_UNDECLARED_SELECTOR
=
YES
;
GCC_WARN_UNDECLARED_SELECTOR
=
YES
;
GCC_WARN_UNINITIALIZED_AUTOS
=
YES_AGGRESSIVE
;
GCC_WARN_UNINITIALIZED_AUTOS
=
YES_AGGRESSIVE
;
GCC_WARN_UNUSED_FUNCTION
=
YES
;
GCC_WARN_UNUSED_FUNCTION
=
YES
;
GCC_WARN_UNUSED_VARIABLE
=
YES
;
GCC_WARN_UNUSED_VARIABLE
=
YES
;
IPHONEOS_DEPLOYMENT_TARGET
=
7.1
;
IPHONEOS_DEPLOYMENT_TARGET
=
8.0
;
SDKROOT
=
iphoneos
;
SDKROOT
=
iphoneos
;
TARGETED_DEVICE_FAMILY
=
"1,2"
;
TARGETED_DEVICE_FAMILY
=
"1,2"
;
USER_HEADER_SEARCH_PATHS
=
"$(SRCROOT)/../../support-lib/objc $(SRCROOT)/../generated-src/objc"
;
USER_HEADER_SEARCH_PATHS
=
"$(SRCROOT)/../../support-lib/objc $(SRCROOT)/../generated-src/objc"
;
...
@@ -301,6 +312,7 @@
...
@@ -301,6 +312,7 @@
GCC_PREFIX_HEADER
=
"TextSort/TextSort-Prefix.pch"
;
GCC_PREFIX_HEADER
=
"TextSort/TextSort-Prefix.pch"
;
INFOPLIST_FILE
=
"TextSort/TextSort-Info.plist"
;
INFOPLIST_FILE
=
"TextSort/TextSort-Info.plist"
;
LIBRARY_SEARCH_PATHS
=
"$(inherited)"
;
LIBRARY_SEARCH_PATHS
=
"$(inherited)"
;
PRODUCT_BUNDLE_IDENTIFIER
=
"Dropbox.${PRODUCT_NAME:rfc1034identifier}"
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
TARGETED_DEVICE_FAMILY
=
1
;
TARGETED_DEVICE_FAMILY
=
1
;
WRAPPER_EXTENSION
=
app
;
WRAPPER_EXTENSION
=
app
;
...
@@ -316,6 +328,7 @@
...
@@ -316,6 +328,7 @@
GCC_PREFIX_HEADER
=
"TextSort/TextSort-Prefix.pch"
;
GCC_PREFIX_HEADER
=
"TextSort/TextSort-Prefix.pch"
;
INFOPLIST_FILE
=
"TextSort/TextSort-Info.plist"
;
INFOPLIST_FILE
=
"TextSort/TextSort-Info.plist"
;
LIBRARY_SEARCH_PATHS
=
"$(inherited)"
;
LIBRARY_SEARCH_PATHS
=
"$(inherited)"
;
PRODUCT_BUNDLE_IDENTIFIER
=
"Dropbox.${PRODUCT_NAME:rfc1034identifier}"
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
TARGETED_DEVICE_FAMILY
=
1
;
TARGETED_DEVICE_FAMILY
=
1
;
WRAPPER_EXTENSION
=
app
;
WRAPPER_EXTENSION
=
app
;
...
...
example/objc/TextSort.xcodeproj/xcshareddata/xcschemes/TextSort.xcscheme
View file @
ef936c4c
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
<Scheme
LastUpgradeVersion =
"0
51
0"
LastUpgradeVersion =
"0
82
0"
version =
"1.3"
>
version =
"1.3"
>
<BuildAction
<BuildAction
parallelizeBuildables =
"YES"
parallelizeBuildables =
"YES"
...
@@ -23,10 +23,10 @@
...
@@ -23,10 +23,10 @@
</BuildActionEntries>
</BuildActionEntries>
</BuildAction>
</BuildAction>
<TestAction
<TestAction
buildConfiguration =
"Debug"
selectedDebuggerIdentifier =
"Xcode.DebuggerFoundation.Debugger.LLDB"
selectedDebuggerIdentifier =
"Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier =
"Xcode.DebuggerFoundation.Launcher.LLDB"
selectedLauncherIdentifier =
"Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv =
"YES"
shouldUseLaunchSchemeArgsEnv =
"YES"
>
buildConfiguration =
"Debug"
>
<Testables>
<Testables>
</Testables>
</Testables>
<MacroExpansion>
<MacroExpansion>
...
@@ -38,17 +38,21 @@
...
@@ -38,17 +38,21 @@
ReferencedContainer =
"container:TextSort.xcodeproj"
>
ReferencedContainer =
"container:TextSort.xcodeproj"
>
</BuildableReference>
</BuildableReference>
</MacroExpansion>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
</TestAction>
<LaunchAction
<LaunchAction
buildConfiguration =
"Debug"
selectedDebuggerIdentifier =
"Xcode.DebuggerFoundation.Debugger.LLDB"
selectedDebuggerIdentifier =
"Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier =
"Xcode.DebuggerFoundation.Launcher.LLDB"
selectedLauncherIdentifier =
"Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle =
"0"
launchStyle =
"0"
useCustomWorkingDirectory =
"NO"
useCustomWorkingDirectory =
"NO"
buildConfiguration =
"Debug"
ignoresPersistentStateOnLaunch =
"NO"
ignoresPersistentStateOnLaunch =
"NO"
debugDocumentVersioning =
"YES"
debugDocumentVersioning =
"YES"
debugServiceExtension =
"internal"
allowLocationSimulation =
"YES"
>
allowLocationSimulation =
"YES"
>
<BuildableProductRunnable>
<BuildableProductRunnable
runnableDebuggingMode =
"0"
>
<BuildableReference
<BuildableReference
BuildableIdentifier =
"primary"
BuildableIdentifier =
"primary"
BlueprintIdentifier =
"65834DDC19AC599E0061AD3F"
BlueprintIdentifier =
"65834DDC19AC599E0061AD3F"
...
@@ -61,12 +65,13 @@
...
@@ -61,12 +65,13 @@
</AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
</LaunchAction>
<ProfileAction
<ProfileAction
buildConfiguration =
"Release"
shouldUseLaunchSchemeArgsEnv =
"YES"
shouldUseLaunchSchemeArgsEnv =
"YES"
savedToolIdentifier =
""
savedToolIdentifier =
""
useCustomWorkingDirectory =
"NO"
useCustomWorkingDirectory =
"NO"
buildConfiguration =
"Release"
debugDocumentVersioning =
"YES"
>
debugDocumentVersioning =
"YES"
>
<BuildableProductRunnable>
<BuildableProductRunnable
runnableDebuggingMode =
"0"
>
<BuildableReference
<BuildableReference
BuildableIdentifier =
"primary"
BuildableIdentifier =
"primary"
BlueprintIdentifier =
"65834DDC19AC599E0061AD3F"
BlueprintIdentifier =
"65834DDC19AC599E0061AD3F"
...
...
example/objc/TextSort/TextSort-Info.plist
View file @
ef936c4c
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
<key>
CFBundleExecutable
</key>
<key>
CFBundleExecutable
</key>
<string>
${EXECUTABLE_NAME}
</string>
<string>
${EXECUTABLE_NAME}
</string>
<key>
CFBundleIdentifier
</key>
<key>
CFBundleIdentifier
</key>
<string>
Dropbox.${PRODUCT_NAME:rfc1034identifier}
</string>
<string>
$(PRODUCT_BUNDLE_IDENTIFIER)
</string>
<key>
CFBundleInfoDictionaryVersion
</key>
<key>
CFBundleInfoDictionaryVersion
</key>
<string>
6.0
</string>
<string>
6.0
</string>
<key>
CFBundleName
</key>
<key>
CFBundleName
</key>
...
...
test-suite/Makefile
View file @
ef936c4c
...
@@ -6,7 +6,7 @@ djinni:
...
@@ -6,7 +6,7 @@ djinni:
./run_djinni.sh
./run_djinni.sh
objc
:
djinni
objc
:
djinni
cd
objc
;
xcodebuild
-sdk
iphonesimulator
-project
DjinniObjcTest.xcodeproj
-scheme
DjinniObjcTest
test
-destination
'platform=iOS Simulator,name=iPhone
6s,OS=10.1
'
cd
objc
;
xcodebuild
-sdk
iphonesimulator
-project
DjinniObjcTest.xcodeproj
-scheme
DjinniObjcTest
test
-destination
'platform=iOS Simulator,name=iPhone
7,OS=latest
'
java
:
djinni
java
:
djinni
cd
java
&&
ant compile
test
cd
java
&&
ant compile
test
...
...
test-suite/handwritten-src/objc/tests/DjinniObjcTestTests-Info.plist
View file @
ef936c4c
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
<key>
CFBundleExecutable
</key>
<key>
CFBundleExecutable
</key>
<string>
${EXECUTABLE_NAME}
</string>
<string>
${EXECUTABLE_NAME}
</string>
<key>
CFBundleIdentifier
</key>
<key>
CFBundleIdentifier
</key>
<string>
Dropbox.${PRODUCT_NAME:rfc1034identifier}
</string>
<string>
$(PRODUCT_BUNDLE_IDENTIFIER)
</string>
<key>
CFBundleInfoDictionaryVersion
</key>
<key>
CFBundleInfoDictionaryVersion
</key>
<string>
6.0
</string>
<string>
6.0
</string>
<key>
CFBundlePackageType
</key>
<key>
CFBundlePackageType
</key>
...
...
test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
View file @
ef936c4c
...
@@ -819,7 +819,7 @@
...
@@ -819,7 +819,7 @@
isa
=
PBXProject
;
isa
=
PBXProject
;
attributes
=
{
attributes
=
{
CLASSPREFIX
=
""
;
CLASSPREFIX
=
""
;
LastUpgradeCheck
=
0
51
0
;
LastUpgradeCheck
=
0
82
0
;
ORGANIZATIONNAME
=
"Dropbox, Inc"
;
ORGANIZATIONNAME
=
"Dropbox, Inc"
;
};
};
buildConfigurationList
=
65868B451989FE4200D60EEE
/* Build configuration list for PBXProject "DjinniObjcTest" */
;
buildConfigurationList
=
65868B451989FE4200D60EEE
/* Build configuration list for PBXProject "DjinniObjcTest" */
;
...
@@ -1022,12 +1022,18 @@
...
@@ -1022,12 +1022,18 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE
=
YES_ERROR
;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE
=
YES_ERROR
;
CLANG_WARN_EMPTY_BODY
=
YES
;
CLANG_WARN_EMPTY_BODY
=
YES
;
CLANG_WARN_ENUM_CONVERSION
=
YES
;
CLANG_WARN_ENUM_CONVERSION
=
YES
;
CLANG_WARN_INFINITE_RECURSION
=
YES
;
CLANG_WARN_INT_CONVERSION
=
YES
;
CLANG_WARN_INT_CONVERSION
=
YES
;
CLANG_WARN_OBJC_ROOT_CLASS
=
YES_ERROR
;
CLANG_WARN_OBJC_ROOT_CLASS
=
YES_ERROR
;
CLANG_WARN_SUSPICIOUS_MOVE
=
YES
;
CLANG_WARN_UNREACHABLE_CODE
=
YES
;
CLANG_WARN__DUPLICATE_METHOD_MATCH
=
YES
;
CLANG_WARN__DUPLICATE_METHOD_MATCH
=
YES
;
COPY_PHASE_STRIP
=
NO
;
COPY_PHASE_STRIP
=
NO
;
ENABLE_STRICT_OBJC_MSGSEND
=
YES
;
ENABLE_TESTABILITY
=
YES
;
GCC_C_LANGUAGE_STANDARD
=
gnu99
;
GCC_C_LANGUAGE_STANDARD
=
gnu99
;
GCC_DYNAMIC_NO_PIC
=
NO
;
GCC_DYNAMIC_NO_PIC
=
NO
;
GCC_NO_COMMON_BLOCKS
=
YES
;
GCC_OPTIMIZATION_LEVEL
=
0
;
GCC_OPTIMIZATION_LEVEL
=
0
;
GCC_PREPROCESSOR_DEFINITIONS
=
(
GCC_PREPROCESSOR_DEFINITIONS
=
(
"DEBUG=1"
,
"DEBUG=1"
,
...
@@ -1047,7 +1053,7 @@
...
@@ -1047,7 +1053,7 @@
"$(SRCROOT)/DjinniObjcTest/objc"
,
"$(SRCROOT)/DjinniObjcTest/objc"
,
"$(SRCROOT)/DjinniObjcTest/cpp"
,
"$(SRCROOT)/DjinniObjcTest/cpp"
,
);
);
IPHONEOS_DEPLOYMENT_TARGET
=
7.1
;
IPHONEOS_DEPLOYMENT_TARGET
=
8.0
;
ONLY_ACTIVE_ARCH
=
YES
;
ONLY_ACTIVE_ARCH
=
YES
;
SDKROOT
=
iphoneos
;
SDKROOT
=
iphoneos
;
};
};
...
@@ -1066,12 +1072,17 @@
...
@@ -1066,12 +1072,17 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE
=
YES_ERROR
;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE
=
YES_ERROR
;
CLANG_WARN_EMPTY_BODY
=
YES
;
CLANG_WARN_EMPTY_BODY
=
YES
;
CLANG_WARN_ENUM_CONVERSION
=
YES
;
CLANG_WARN_ENUM_CONVERSION
=
YES
;
CLANG_WARN_INFINITE_RECURSION
=
YES
;
CLANG_WARN_INT_CONVERSION
=
YES
;
CLANG_WARN_INT_CONVERSION
=
YES
;
CLANG_WARN_OBJC_ROOT_CLASS
=
YES_ERROR
;
CLANG_WARN_OBJC_ROOT_CLASS
=
YES_ERROR
;
CLANG_WARN_SUSPICIOUS_MOVE
=
YES
;
CLANG_WARN_UNREACHABLE_CODE
=
YES
;
CLANG_WARN__DUPLICATE_METHOD_MATCH
=
YES
;
CLANG_WARN__DUPLICATE_METHOD_MATCH
=
YES
;
COPY_PHASE_STRIP
=
YES
;
COPY_PHASE_STRIP
=
YES
;
ENABLE_NS_ASSERTIONS
=
NO
;
ENABLE_NS_ASSERTIONS
=
NO
;
ENABLE_STRICT_OBJC_MSGSEND
=
YES
;
GCC_C_LANGUAGE_STANDARD
=
gnu99
;
GCC_C_LANGUAGE_STANDARD
=
gnu99
;
GCC_NO_COMMON_BLOCKS
=
YES
;
GCC_TREAT_WARNINGS_AS_ERRORS
=
YES
;
GCC_TREAT_WARNINGS_AS_ERRORS
=
YES
;
GCC_WARN_64_TO_32_BIT_CONVERSION
=
YES
;
GCC_WARN_64_TO_32_BIT_CONVERSION
=
YES
;
GCC_WARN_ABOUT_RETURN_TYPE
=
YES_ERROR
;
GCC_WARN_ABOUT_RETURN_TYPE
=
YES_ERROR
;
...
@@ -1085,7 +1096,7 @@
...
@@ -1085,7 +1096,7 @@
"$(SRCROOT)/DjinniObjcTest/objc"
,
"$(SRCROOT)/DjinniObjcTest/objc"
,
"$(SRCROOT)/DjinniObjcTest/cpp"
,
"$(SRCROOT)/DjinniObjcTest/cpp"
,
);
);
IPHONEOS_DEPLOYMENT_TARGET
=
7.1
;
IPHONEOS_DEPLOYMENT_TARGET
=
8.0
;
SDKROOT
=
iphoneos
;
SDKROOT
=
iphoneos
;
VALIDATE_PRODUCT
=
YES
;
VALIDATE_PRODUCT
=
YES
;
};
};
...
@@ -1127,7 +1138,6 @@
...
@@ -1127,7 +1138,6 @@
isa
=
XCBuildConfiguration
;
isa
=
XCBuildConfiguration
;
buildSettings
=
{
buildSettings
=
{
FRAMEWORK_SEARCH_PATHS
=
(
FRAMEWORK_SEARCH_PATHS
=
(
"$(SDKROOT)/Developer/Library/Frameworks"
,
"$(inherited)"
,
"$(inherited)"
,
"$(DEVELOPER_FRAMEWORKS_DIR)"
,
"$(DEVELOPER_FRAMEWORKS_DIR)"
,
);
);
...
@@ -1138,6 +1148,7 @@
...
@@ -1138,6 +1148,7 @@
"$(inherited)"
,
"$(inherited)"
,
);
);
INFOPLIST_FILE
=
"../handwritten-src/objc/tests/DjinniObjcTestTests-Info.plist"
;
INFOPLIST_FILE
=
"../handwritten-src/objc/tests/DjinniObjcTestTests-Info.plist"
;
PRODUCT_BUNDLE_IDENTIFIER
=
"Dropbox.${PRODUCT_NAME:rfc1034identifier}"
;
PRODUCT_NAME
=
DjinniObjcTestTests
;
PRODUCT_NAME
=
DjinniObjcTestTests
;
WARNING_CFLAGS
=
(
WARNING_CFLAGS
=
(
"-Wextra"
,
"-Wextra"
,
...
@@ -1151,13 +1162,13 @@
...
@@ -1151,13 +1162,13 @@
isa
=
XCBuildConfiguration
;
isa
=
XCBuildConfiguration
;
buildSettings
=
{
buildSettings
=
{
FRAMEWORK_SEARCH_PATHS
=
(
FRAMEWORK_SEARCH_PATHS
=
(
"$(SDKROOT)/Developer/Library/Frameworks"
,
"$(inherited)"
,
"$(inherited)"
,
"$(DEVELOPER_FRAMEWORKS_DIR)"
,
"$(DEVELOPER_FRAMEWORKS_DIR)"
,
);
);
GCC_PRECOMPILE_PREFIX_HEADER
=
NO
;
GCC_PRECOMPILE_PREFIX_HEADER
=
NO
;
GCC_PREFIX_HEADER
=
""
;
GCC_PREFIX_HEADER
=
""
;
INFOPLIST_FILE
=
"../handwritten-src/objc/tests/DjinniObjcTestTests-Info.plist"
;
INFOPLIST_FILE
=
"../handwritten-src/objc/tests/DjinniObjcTestTests-Info.plist"
;
PRODUCT_BUNDLE_IDENTIFIER
=
"Dropbox.${PRODUCT_NAME:rfc1034identifier}"
;
PRODUCT_NAME
=
DjinniObjcTestTests
;
PRODUCT_NAME
=
DjinniObjcTestTests
;
WARNING_CFLAGS
=
(
WARNING_CFLAGS
=
(
"-Wextra"
,
"-Wextra"
,
...
...
test-suite/objc/DjinniObjcTest.xcodeproj/xcshareddata/xcschemes/DjinniObjcTest.xcscheme
View file @
ef936c4c
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
<Scheme
LastUpgradeVersion =
"0
51
0"
LastUpgradeVersion =
"0
82
0"
version =
"1.3"
>
version =
"1.3"
>
<BuildAction
<BuildAction
parallelizeBuildables =
"YES"
parallelizeBuildables =
"YES"
...
@@ -23,10 +23,10 @@
...
@@ -23,10 +23,10 @@
</BuildActionEntries>
</BuildActionEntries>
</BuildAction>
</BuildAction>
<TestAction
<TestAction
buildConfiguration =
"Debug"
selectedDebuggerIdentifier =
"Xcode.DebuggerFoundation.Debugger.LLDB"
selectedDebuggerIdentifier =
"Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier =
"Xcode.DebuggerFoundation.Launcher.LLDB"
selectedLauncherIdentifier =
"Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv =
"YES"
shouldUseLaunchSchemeArgsEnv =
"YES"
>
buildConfiguration =
"Debug"
>
<Testables>
<Testables>
<TestableReference
<TestableReference
skipped =
"NO"
>
skipped =
"NO"
>
...
@@ -39,24 +39,36 @@
...
@@ -39,24 +39,36 @@
</BuildableReference>
</BuildableReference>
</TestableReference>
</TestableReference>
</Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
</TestAction>
<LaunchAction
<LaunchAction
buildConfiguration =
"Debug"
selectedDebuggerIdentifier =
"Xcode.DebuggerFoundation.Debugger.LLDB"
selectedDebuggerIdentifier =
"Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier =
"Xcode.DebuggerFoundation.Launcher.LLDB"
selectedLauncherIdentifier =
"Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle =
"0"
launchStyle =
"0"
useCustomWorkingDirectory =
"NO"
useCustomWorkingDirectory =
"NO"
buildConfiguration =
"Debug"
ignoresPersistentStateOnLaunch =
"NO"
ignoresPersistentStateOnLaunch =
"NO"
debugDocumentVersioning =
"YES"
debugDocumentVersioning =
"YES"
debugServiceExtension =
"internal"
allowLocationSimulation =
"YES"
>
allowLocationSimulation =
"YES"
>
<MacroExpansion>
<BuildableReference
BuildableIdentifier =
"primary"
BlueprintIdentifier =
"65868B491989FE4200D60EEE"
BuildableName =
"libDjinniObjcTest.a"
BlueprintName =
"DjinniObjcTest"
ReferencedContainer =
"container:DjinniObjcTest.xcodeproj"
>
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
<AdditionalOptions>
</AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
</LaunchAction>
<ProfileAction
<ProfileAction
buildConfiguration =
"Release"
shouldUseLaunchSchemeArgsEnv =
"YES"
shouldUseLaunchSchemeArgsEnv =
"YES"
savedToolIdentifier =
""
savedToolIdentifier =
""
useCustomWorkingDirectory =
"NO"
useCustomWorkingDirectory =
"NO"
buildConfiguration =
"Release"
debugDocumentVersioning =
"YES"
>
debugDocumentVersioning =
"YES"
>
</ProfileAction>
</ProfileAction>
<AnalyzeAction
<AnalyzeAction
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment