diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-02-05 00:19:58 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-02-05 00:19:58 +0300 |
commit | 88a6bbe81cdac8392af63d9732b582fa02b04261 (patch) | |
tree | b3ff5d684c24990a1540bee398b59656c066089c /Hercules.xcodeproj | |
parent | a59d2cf735c961d86050ae51d345a5a81cfeb77c (diff) | |
parent | dcc9ee43a4b33ace1501864415f5a856b18f8201 (diff) | |
download | hercules-88a6bbe81cdac8392af63d9732b582fa02b04261.tar.gz hercules-88a6bbe81cdac8392af63d9732b582fa02b04261.tar.bz2 hercules-88a6bbe81cdac8392af63d9732b582fa02b04261.tar.xz hercules-88a6bbe81cdac8392af63d9732b582fa02b04261.zip |
Merge pull request #993 from HerculesWS/mobdb2sql
Mob DB support for the db2sql plugin
Diffstat (limited to 'Hercules.xcodeproj')
10 files changed, 13 insertions, 50 deletions
diff --git a/Hercules.xcodeproj/project.pbxproj b/Hercules.xcodeproj/project.pbxproj index 07967e965..1a4b6ae53 100644 --- a/Hercules.xcodeproj/project.pbxproj +++ b/Hercules.xcodeproj/project.pbxproj @@ -1068,7 +1068,7 @@ A56CC652185642B4009EB79C /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0700; + LastUpgradeCheck = 0710; ORGANIZATIONNAME = herc.ws; }; buildConfigurationList = A56CC655185642B4009EB79C /* Build configuration list for PBXProject "Hercules" */; @@ -1498,6 +1498,7 @@ CLANG_WARN_INT_CONVERSION = YES; CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)"; COPY_PHASE_STRIP = NO; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_FAST_MATH = YES; diff --git a/Hercules.xcodeproj/xcshareddata/xcschemes/HPMHooking_char.xcscheme b/Hercules.xcodeproj/xcshareddata/xcschemes/HPMHooking_char.xcscheme index 939f8b553..8fc8f9cbb 100644 --- a/Hercules.xcodeproj/xcshareddata/xcschemes/HPMHooking_char.xcscheme +++ b/Hercules.xcodeproj/xcshareddata/xcschemes/HPMHooking_char.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0700" + LastUpgradeVersion = "0710" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/Hercules.xcodeproj/xcshareddata/xcschemes/HPMHooking_login.xcscheme b/Hercules.xcodeproj/xcshareddata/xcschemes/HPMHooking_login.xcscheme index 18d882660..6ce9de3a6 100644 --- a/Hercules.xcodeproj/xcshareddata/xcschemes/HPMHooking_login.xcscheme +++ b/Hercules.xcodeproj/xcshareddata/xcschemes/HPMHooking_login.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0700" + LastUpgradeVersion = "0710" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/Hercules.xcodeproj/xcshareddata/xcschemes/HPMHooking_map.xcscheme b/Hercules.xcodeproj/xcshareddata/xcschemes/HPMHooking_map.xcscheme index 064025406..a62507de0 100644 --- a/Hercules.xcodeproj/xcshareddata/xcschemes/HPMHooking_map.xcscheme +++ b/Hercules.xcodeproj/xcshareddata/xcschemes/HPMHooking_map.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0700" + LastUpgradeVersion = "0710" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/Hercules.xcodeproj/xcshareddata/xcschemes/char-server.xcscheme b/Hercules.xcodeproj/xcshareddata/xcschemes/char-server.xcscheme index 5f85740db..a64514c1d 100644 --- a/Hercules.xcodeproj/xcshareddata/xcschemes/char-server.xcscheme +++ b/Hercules.xcodeproj/xcshareddata/xcschemes/char-server.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0700" + LastUpgradeVersion = "0710" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/Hercules.xcodeproj/xcshareddata/xcschemes/db2sql.xcscheme b/Hercules.xcodeproj/xcshareddata/xcschemes/db2sql.xcscheme index a90bb43af..603e02228 100644 --- a/Hercules.xcodeproj/xcshareddata/xcschemes/db2sql.xcscheme +++ b/Hercules.xcodeproj/xcshareddata/xcschemes/db2sql.xcscheme @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0700" - version = "1.7"> + LastUpgradeVersion = "0710" + version = "1.3"> <BuildAction parallelizeBuildables = "YES" buildImplicitDependencies = "YES"> @@ -56,44 +56,6 @@ debugDocumentVersioning = "YES" debugServiceExtension = "internal" allowLocationSimulation = "YES"> - <PreActions> - <ExecutionAction - ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction"> - <ActionContent - title = "Run Script" - scriptText = "sed -e 's:^\([[:blank:]]*\)//"db2sql",$:\1"db2sql",:' -i .db2sql "${PROJECT_DIR}/conf/plugins.conf"" - shellToInvoke = "/bin/bash"> - <EnvironmentBuildable> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "A56CC67B18564356009EB79C" - BuildableName = "map-server" - BlueprintName = "map-server" - ReferencedContainer = "container:Hercules.xcodeproj"> - </BuildableReference> - </EnvironmentBuildable> - </ActionContent> - </ExecutionAction> - </PreActions> - <PostActions> - <ExecutionAction - ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction"> - <ActionContent - title = "Run Script" - scriptText = "mv "${PROJECT_DIR}/conf/plugins.conf.db2sql" "${PROJECT_DIR}/conf/plugins.conf"" - shellToInvoke = "/bin/bash"> - <EnvironmentBuildable> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "A56CC67B18564356009EB79C" - BuildableName = "map-server" - BlueprintName = "map-server" - ReferencedContainer = "container:Hercules.xcodeproj"> - </BuildableReference> - </EnvironmentBuildable> - </ActionContent> - </ExecutionAction> - </PostActions> <BuildableProductRunnable runnableDebuggingMode = "0"> <BuildableReference @@ -106,7 +68,7 @@ </BuildableProductRunnable> <CommandLineArguments> <CommandLineArgument - argument = "--db2sql" + argument = "--load-plugin db2sql --db2sql" isEnabled = "YES"> </CommandLineArgument> </CommandLineArguments> diff --git a/Hercules.xcodeproj/xcshareddata/xcschemes/login-server.xcscheme b/Hercules.xcodeproj/xcshareddata/xcschemes/login-server.xcscheme index 3977cbe03..82cd4764d 100644 --- a/Hercules.xcodeproj/xcshareddata/xcschemes/login-server.xcscheme +++ b/Hercules.xcodeproj/xcshareddata/xcschemes/login-server.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0700" + LastUpgradeVersion = "0710" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/Hercules.xcodeproj/xcshareddata/xcschemes/map-server.xcscheme b/Hercules.xcodeproj/xcshareddata/xcschemes/map-server.xcscheme index 83a72c791..30cc2a2e3 100644 --- a/Hercules.xcodeproj/xcshareddata/xcschemes/map-server.xcscheme +++ b/Hercules.xcodeproj/xcshareddata/xcschemes/map-server.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0700" + LastUpgradeVersion = "0710" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/Hercules.xcodeproj/xcshareddata/xcschemes/mapcache.xcscheme b/Hercules.xcodeproj/xcshareddata/xcschemes/mapcache.xcscheme index bac21b6d8..756fb2794 100644 --- a/Hercules.xcodeproj/xcshareddata/xcschemes/mapcache.xcscheme +++ b/Hercules.xcodeproj/xcshareddata/xcschemes/mapcache.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0700" + LastUpgradeVersion = "0710" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/Hercules.xcodeproj/xcshareddata/xcschemes/sample.xcscheme b/Hercules.xcodeproj/xcshareddata/xcschemes/sample.xcscheme index bdb806e99..49d1cc5e8 100644 --- a/Hercules.xcodeproj/xcshareddata/xcschemes/sample.xcscheme +++ b/Hercules.xcodeproj/xcshareddata/xcschemes/sample.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0700" + LastUpgradeVersion = "0710" version = "1.3"> <BuildAction parallelizeBuildables = "YES" |