From 3387a9733fa8b00ab4d5e4afc599f716b3d4db54 Mon Sep 17 00:00:00 2001 From: tbrand Date: Thu, 15 Mar 2018 22:20:18 +0900 Subject: [PATCH] update: 20180315 --- .gitignore | 1 + README.md | 150 +++++++------- config/environments/production.yml | 33 ---- .../Pods/Pods.xcodeproj/project.pbxproj | 184 +++++++++--------- .../CocoaAsyncSocket.xcconfig | 6 +- .../Criollo/Criollo.xcconfig | 8 +- .../Pods-server_objc_criollo-frameworks.sh | 44 ++++- .../Pods-server_objc_criollo.debug.xcconfig | 8 +- .../Pods-server_objc_criollo.release.xcconfig | 8 +- python/.gitignore | 1 + python/django/server_python_django | 2 +- tools/src/benchmarker.cr | 7 +- 12 files changed, 227 insertions(+), 225 deletions(-) delete mode 100644 config/environments/production.yml create mode 100644 python/.gitignore diff --git a/.gitignore b/.gitignore index 551a0f41711..25df062437d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ package-lock.json lib/ .shards/ +config ### Python ### diff --git a/README.md b/README.md index f76480e483b..9b8f02774cd 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Each framework has to have two features; routing and parsing path parameters. ## Result -Last update: 2018-02-26 +Last update: 2018-03-15 ``` OS: Darwin (version: 17.3.0, arch: x86_64) CPU Cores: 8 @@ -14,94 +14,96 @@ CPU Cores: 8 ### Ranking (Framework) -1. [router_cr](https://github.com/tbrand/router.cr) (crystal) -2. [actix](https://github.com/actix/actix-web) (rust) -3. [nickel](https://github.com/nickel-org/nickel.rs) (rust) -4. [iron](https://github.com/iron/iron) (rust) -5. [raze](https://github.com/samueleaton/raze) (crystal) -6. [japronto](https://github.com/squeaky-pl/japronto) (python) -7. [fasthttprouter](https://github.com/buaazp/fasthttprouter) (go) -8. [lucky](https://github.com/luckyframework/lucky) (crystal) +1. [nickel](https://github.com/nickel-org/nickel.rs) (rust) +2. [japronto](https://github.com/squeaky-pl/japronto) (python) +3. [iron](https://github.com/iron/iron) (rust) +4. [router_cr](https://github.com/tbrand/router.cr) (crystal) +5. [spider-gazelle](https://github.com/spider-gazelle/spider-gazelle) (crystal) +6. [raze](https://github.com/samueleaton/raze) (crystal) +7. [actix](https://github.com/actix/actix-web) (rust) +8. [fasthttprouter](https://github.com/buaazp/fasthttprouter) (go) 9. [amber](https://github.com/amberframework/amber) (crystal) -10. [kemal](https://github.com/kemalcr/kemal) (crystal) +10. [lucky](https://github.com/luckyframework/lucky) (crystal) 11. [rocket](https://github.com/SergioBenitez/Rocket) (rust) -12. [clusterpolka](https://github.com/lukeed/polka) (node) -13. [echo](https://github.com/labstack/echo) (go) -14. [gorilla_mux](https://github.com/gorilla/mux) (go) -15. [aspnetcore](https://github.com/aspnet/Home) (csharp) -16. [iris](https://github.com/kataras/iris) (go) -17. [phoenix](https://github.com/phoenixframework/phoenix) (elixir) -18. [plug](https://github.com/elixir-lang/plug) (elixir) -19. [gin](https://github.com/gin-gonic/gin) (go) -20. [vapor](https://github.com/vapor/vapor) (swift) -21. [perfect](https://github.com/PerfectlySoft/Perfect) (swift) -22. [sanic](https://github.com/channelcat/sanic) (python) -23. [polka](https://github.com/lukeed/polka) (node) +12. [kemal](https://github.com/kemalcr/kemal) (crystal) +13. [clusterpolka](https://github.com/lukeed/polka) (node) +14. [iris](https://github.com/kataras/iris) (go) +15. [gorilla_mux](https://github.com/gorilla/mux) (go) +16. [echo](https://github.com/labstack/echo) (go) +17. [gin](https://github.com/gin-gonic/gin) (go) +18. [vapor](https://github.com/vapor/vapor) (swift) +19. [aspnetcore](https://github.com/aspnet/Home) (csharp) +20. [perfect](https://github.com/PerfectlySoft/Perfect) (swift) +21. [sanic](https://github.com/channelcat/sanic) (python) +22. [polka](https://github.com/lukeed/polka) (node) +23. [kitura](https://github.com/IBM-Swift/Kitura) (swift) 24. [clusterexpress](https://github.com/LearnBoost/cluster) (node) -25. [kitura](https://github.com/IBM-Swift/Kitura) (swift) -26. [akkahttp](https://github.com/akka/akka-http) (scala) -27. [express](https://github.com/expressjs/express) (node) -28. [roda](https://github.com/jeremyevans/roda) (ruby) -29. [jester](https://github.com/dom96/jester) (nim) -30. [criollo](https://github.com/thecatalinstan/criollo) (objc) -31. [sinatra](https://github.com/sinatra/sinatra) (ruby) -32. [tornado](https://github.com/tornadoweb/tornado) (python) -33. [rack-routing](https://github.com/georgeu2000/rack-routing) (ruby) -34. [rails](https://github.com/rails/rails) (ruby) +25. [plug](https://github.com/elixir-lang/plug) (elixir) +26. [phoenix](https://github.com/phoenixframework/phoenix) (elixir) +27. [akkahttp](https://github.com/akka/akka-http) (scala) +28. [express](https://github.com/expressjs/express) (node) +29. [roda](https://github.com/jeremyevans/roda) (ruby) +30. [rack-routing](https://github.com/iAmPlus/rack-routing) (ruby) +31. [criollo](https://github.com/thecatalinstan/criollo) (objc) +32. [jester](https://github.com/dom96/jester) (nim) +33. [sinatra](https://github.com/sinatra/sinatra) (ruby) +34. [tornado](https://github.com/tornadoweb/tornado) (python) +35. [rails](https://github.com/rails/rails) (ruby) ### Ranking (Language) -1. crystal ([router_cr](https://github.com/tbrand/router.cr)) -2. rust ([actix](https://github.com/actix/actix-web)) -3. python ([japronto](https://github.com/squeaky-pl/japronto)) +1. rust ([nickel](https://github.com/nickel-org/nickel.rs)) +2. python ([japronto](https://github.com/squeaky-pl/japronto)) +3. crystal ([router_cr](https://github.com/tbrand/router.cr)) 4. go ([fasthttprouter](https://github.com/buaazp/fasthttprouter)) 5. node ([clusterpolka](https://github.com/lukeed/polka)) -6. csharp ([aspnetcore](https://github.com/aspnet/Home)) -7. elixir ([phoenix](https://github.com/phoenixframework/phoenix)) -8. swift ([vapor](https://github.com/vapor/vapor)) +6. swift ([vapor](https://github.com/vapor/vapor)) +7. csharp ([aspnetcore](https://github.com/aspnet/Home)) +8. elixir ([plug](https://github.com/elixir-lang/plug)) 9. scala ([akkahttp](https://github.com/akka/akka-http)) 10. ruby ([roda](https://github.com/jeremyevans/roda)) -11. nim ([jester](https://github.com/dom96/jester)) -12. objc ([criollo](https://github.com/thecatalinstan/criollo)) +11. objc ([criollo](https://github.com/thecatalinstan/criollo)) +12. nim ([jester](https://github.com/dom96/jester)) ### All frameworks | Language (Runtime) | Framework (Middleware) | Max [sec] | Min [sec] | Ave [sec] | |---------------------------|---------------------------|-----------------|-----------------|-----------------| -| ruby | rails | 330.695639 | 329.748766 | 330.283498 | -| ruby | sinatra | 97.614918 | 97.473684 | 97.549466 | -| ruby | roda | 37.567316 | 37.482821 | 37.537436 | -| ruby | rack-routing | 293.084913 | 291.885714 | 292.707013 | -| crystal | kemal | 8.471980 | 7.895288 | 8.240809 | -| crystal | router_cr | 6.663747 | 6.398756 | 6.580617 | -| crystal | raze | 7.046766 | 6.681810 | 6.931381 | -| crystal | lucky | 7.853848 | 7.483846 | 7.716000 | -| crystal | amber | 8.180518 | 7.714918 | 8.021653 | -| go | echo | 10.407790 | 9.657063 | 10.030704 | -| go | gorilla_mux | 10.162614 | 9.867718 | 10.041358 | -| go | iris | 10.584802 | 10.062414 | 10.369381 | -| go | fasthttprouter | 7.383870 | 7.237157 | 7.309896 | -| go | gin | 11.390456 | 10.660009 | 10.951984 | -| rust | actix | 6.837484 | 6.533378 | 6.661213 | -| rust | iron | 7.106496 | 6.702638 | 6.840316 | -| rust | nickel | 6.893016 | 6.765759 | 6.833456 | -| rust | rocket | 8.471154 | 8.249096 | 8.374040 | -| node | express | 27.553285 | 26.094557 | 26.461259 | -| node | clusterexpress | 15.340291 | 14.423945 | 14.746395 | -| node | polka | 15.204288 | 14.529034 | 14.746328 | -| node | clusterpolka | 9.005489 | 8.700110 | 8.890766 | -| elixir | plug | 11.180962 | 10.546574 | 10.919743 | -| elixir | phoenix | 10.930012 | 10.564129 | 10.792129 | -| swift | vapor | 12.312772 | 11.998519 | 12.125449 | -| swift | perfect | 12.949930 | 12.451148 | 12.665174 | -| swift | kitura | 15.190245 | 14.873937 | 15.024665 | -| scala | akkahttp | 18.091491 | 16.309630 | 16.807849 | -| csharp | aspnetcore | 10.464090 | 9.795961 | 10.130911 | -| python | sanic | 15.118685 | 12.626734 | 13.913008 | -| python | japronto | 7.219928 | 6.947663 | 7.123151 | -| python | tornado | 174.423872 | 173.858005 | 174.095675 | -| nim | jester | 54.692087 | 54.458567 | 54.575013 | -| objc | criollo | 61.117013 | 56.024134 | 57.618709 | +| ruby | rails | 183.065177 | 182.594138 | 182.784460 | +| ruby | sinatra | 54.599611 | 54.235050 | 54.360554 | +| ruby | roda | 19.539005 | 19.362119 | 19.428262 | +| ruby | rack-routing | 24.912685 | 24.787798 | 24.857921 | +| crystal | kemal | 5.239213 | 4.743690 | 4.857822 | +| crystal | router_cr | 4.066965 | 3.929231 | 4.015780 | +| crystal | raze | 4.274440 | 3.952904 | 4.073834 | +| crystal | lucky | 4.407409 | 4.320964 | 4.377559 | +| crystal | amber | 4.422603 | 4.302611 | 4.371277 | +| crystal | spider-gazelle | 4.111804 | 3.961091 | 4.038874 | +| go | echo | 5.706486 | 5.195444 | 5.458082 | +| go | gorilla_mux | 5.688501 | 5.039164 | 5.442471 | +| go | iris | 5.540159 | 5.014120 | 5.355044 | +| go | fasthttprouter | 4.363762 | 4.202933 | 4.299051 | +| go | gin | 6.022577 | 5.461489 | 5.817580 | +| rust | actix | 4.239260 | 4.058780 | 4.103622 | +| rust | iron | 3.980654 | 3.918856 | 3.944900 | +| rust | nickel | 3.922851 | 3.836264 | 3.886912 | +| rust | rocket | 4.922653 | 4.449431 | 4.709064 | +| node | express | 15.727199 | 14.595424 | 14.948420 | +| node | clusterexpress | 10.672635 | 8.388129 | 9.267956 | +| node | polka | 8.788398 | 8.311747 | 8.478669 | +| node | clusterpolka | 5.425973 | 5.079739 | 5.266841 | +| elixir | plug | 10.217389 | 9.375499 | 9.780671 | +| elixir | phoenix | 10.176699 | 9.456586 | 10.015052 | +| swift | vapor | 6.805480 | 6.259005 | 6.561916 | +| swift | perfect | 7.729230 | 7.527969 | 7.624530 | +| swift | kitura | 9.018302 | 8.751379 | 8.857953 | +| scala | akkahttp | 11.285840 | 9.558254 | 10.281555 | +| csharp | aspnetcore | 7.064339 | 6.611566 | 6.810423 | +| python | sanic | 8.930118 | 7.300009 | 8.129179 | +| python | japronto | 4.255003 | 3.793259 | 3.926455 | +| python | tornado | 99.925639 | 98.832093 | 99.228150 | +| nim | jester | 35.604124 | 34.916220 | 35.241652 | +| objc | criollo | 32.341102 | 31.504481 | 31.896720 | ## Current target frameworks (middlewares) diff --git a/config/environments/production.yml b/config/environments/production.yml deleted file mode 100644 index 64006a9001a..00000000000 --- a/config/environments/production.yml +++ /dev/null @@ -1,33 +0,0 @@ -secret_key_base: VuYrJ2n2SFsZ6QFa56a1LNQQYdLcaHjMzfhFgjCChvQ -port: 3000 -name: amber -logging: - severity: info - colorize: false - filter: - - password - - confirm_password - skip: - - - context: - - request - - session - - headers - - cookies - - params - -host: 0.0.0.0 -port_reuse: true -process_count: 1 -# ssl_key_file: -# ssl_cert_file: -redis_url: "redis://localhost:6379" -database_url: postgres://postgres:@localhost:5432/amber_production -session: - key: amber.session - store: signed_cookie - expires: 0 - -secrets: - description: Store your production secrets credentials and settings here. - diff --git a/objc/criollo/Pods/Pods.xcodeproj/project.pbxproj b/objc/criollo/Pods/Pods.xcodeproj/project.pbxproj index 2e84b5b8637..b419a18a0bc 100644 --- a/objc/criollo/Pods/Pods.xcodeproj/project.pbxproj +++ b/objc/criollo/Pods/Pods.xcodeproj/project.pbxproj @@ -715,65 +715,27 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 1A4F6D43520B8B4BEEB72BB8180875A4 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 407D8751EA6B4240A0C4A1E61CED7531 /* CocoaAsyncSocket.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_VERSION = A; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/CocoaAsyncSocket/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; - MODULEMAP_FILE = "Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = CocoaAsyncSocket; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; - 513DCF8ED7EE5FBA235609F7D53B59DC /* Release */ = { + 099B25CDD28D4EA3FEFD7C95651612A1 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 79171FEB35C1A41653F6BB433DBBF6B5 /* Criollo.xcconfig */; buildSettings = { - CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_VERSION = A; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREFIX_HEADER = "Target Support Files/Criollo/Criollo-prefix.pch"; INFOPLIST_FILE = "Target Support Files/Criollo/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.9; MODULEMAP_FILE = "Target Support Files/Criollo/Criollo.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = Criollo; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -781,33 +743,29 @@ VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; + name = Debug; }; - 65029AAEC68B818019B73D51F5F1B514 /* Release */ = { + 397AE6B104BBCCB6C880049A48ADC699 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = BB2C6E1A1EA1BE782B95152DC3F08804 /* Pods-server_objc_criollo.release.xcconfig */; buildSettings = { - CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_VERSION = A; - GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = "Target Support Files/Pods-server_objc_criollo/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.10; MODULEMAP_FILE = "Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; @@ -820,31 +778,27 @@ }; name = Release; }; - 6F8B2198E4B433720F0E9D04C0FE50B6 /* Debug */ = { + 797F9C7A2E7C1DEE2EAD7C9FBDE8E361 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 79171FEB35C1A41653F6BB433DBBF6B5 /* Criollo.xcconfig */; buildSettings = { - CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_VERSION = A; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREFIX_HEADER = "Target Support Files/Criollo/Criollo-prefix.pch"; INFOPLIST_FILE = "Target Support Files/Criollo/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.9; MODULEMAP_FILE = "Target Support Files/Criollo/Criollo.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_NAME = Criollo; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -852,50 +806,61 @@ VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; + name = Release; }; - 774D345C1316346D6149B25F10444935 /* Debug */ = { + 7A580D893249EFCBDBEA83EE658FEF8F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGNING_REQUIRED = NO; COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "POD_CONFIGURATION_DEBUG=1", "DEBUG=1", "$(inherited)", ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.10; + MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -903,31 +868,27 @@ }; name = Debug; }; - 8690162715CF0909852483BFAA7625A0 /* Debug */ = { + 9C361FEFE6FC93C24DA7680BAAB6D445 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 8CA0F6C601992EB3A7353371AF92970A /* Pods-server_objc_criollo.debug.xcconfig */; buildSettings = { - CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_VERSION = A; - GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = "Target Support Files/Pods-server_objc_criollo/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.10; MODULEMAP_FILE = "Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; @@ -940,31 +901,27 @@ }; name = Debug; }; - 8CD7EF43ACF1AB0F8E0A178BAC364CAB /* Debug */ = { + 9F56A38FFE92BA9860F85B63998D945B /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 407D8751EA6B4240A0C4A1E61CED7531 /* CocoaAsyncSocket.xcconfig */; buildSettings = { - CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_VERSION = A; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREFIX_HEADER = "Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket-prefix.pch"; INFOPLIST_FILE = "Target Support Files/CocoaAsyncSocket/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.7; MODULEMAP_FILE = "Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_NAME = CocoaAsyncSocket; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -974,47 +931,88 @@ }; name = Debug; }; - 945EB9E2C47E9C30E16985278CFFC5AE /* Release */ = { + D2FE8C89211A1EFD8EF552187D50B4D7 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 407D8751EA6B4240A0C4A1E61CED7531 /* CocoaAsyncSocket.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_VERSION = A; + GCC_PREFIX_HEADER = "Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/CocoaAsyncSocket/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + MODULEMAP_FILE = "Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket.modulemap"; + PRODUCT_NAME = CocoaAsyncSocket; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + E8B0732F7D3E5BB15C212C29C806F741 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGNING_REQUIRED = NO; - COPY_PHASE_STRIP = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "POD_CONFIGURATION_RELEASE=1", "$(inherited)", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.10; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; SYMROOT = "${SRCROOT}/../build"; - VALIDATE_PRODUCT = YES; }; name = Release; }; @@ -1024,8 +1022,8 @@ 245EF526FCFC920732B8D602E8722780 /* Build configuration list for PBXNativeTarget "Criollo" */ = { isa = XCConfigurationList; buildConfigurations = ( - 6F8B2198E4B433720F0E9D04C0FE50B6 /* Debug */, - 513DCF8ED7EE5FBA235609F7D53B59DC /* Release */, + 099B25CDD28D4EA3FEFD7C95651612A1 /* Debug */, + 797F9C7A2E7C1DEE2EAD7C9FBDE8E361 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1033,8 +1031,8 @@ 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - 774D345C1316346D6149B25F10444935 /* Debug */, - 945EB9E2C47E9C30E16985278CFFC5AE /* Release */, + 7A580D893249EFCBDBEA83EE658FEF8F /* Debug */, + E8B0732F7D3E5BB15C212C29C806F741 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1042,8 +1040,8 @@ 5A32E082D07EA83BBC792327C06B6900 /* Build configuration list for PBXNativeTarget "Pods-server_objc_criollo" */ = { isa = XCConfigurationList; buildConfigurations = ( - 8690162715CF0909852483BFAA7625A0 /* Debug */, - 65029AAEC68B818019B73D51F5F1B514 /* Release */, + 9C361FEFE6FC93C24DA7680BAAB6D445 /* Debug */, + 397AE6B104BBCCB6C880049A48ADC699 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1051,8 +1049,8 @@ F2A03B912F777B2BFB05E7B9E903B15F /* Build configuration list for PBXNativeTarget "CocoaAsyncSocket" */ = { isa = XCConfigurationList; buildConfigurations = ( - 8CD7EF43ACF1AB0F8E0A178BAC364CAB /* Debug */, - 1A4F6D43520B8B4BEEB72BB8180875A4 /* Release */, + 9F56A38FFE92BA9860F85B63998D945B /* Debug */, + D2FE8C89211A1EFD8EF552187D50B4D7 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/objc/criollo/Pods/Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket.xcconfig b/objc/criollo/Pods/Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket.xcconfig index a11311f71c3..4ca55fa9b1c 100644 --- a/objc/criollo/Pods/Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket.xcconfig +++ b/objc/criollo/Pods/Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket.xcconfig @@ -1,10 +1,10 @@ CODE_SIGN_IDENTITY = -CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/CocoaAsyncSocket +CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/CocoaAsyncSocket GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public" OTHER_LDFLAGS = -framework "CoreServices" -framework "Security" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/CocoaAsyncSocket PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} diff --git a/objc/criollo/Pods/Target Support Files/Criollo/Criollo.xcconfig b/objc/criollo/Pods/Target Support Files/Criollo/Criollo.xcconfig index 9c2af2743eb..d9b8e7e7681 100644 --- a/objc/criollo/Pods/Target Support Files/Criollo/Criollo.xcconfig +++ b/objc/criollo/Pods/Target Support Files/Criollo/Criollo.xcconfig @@ -1,11 +1,11 @@ CODE_SIGN_IDENTITY = -CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/Criollo -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/CocoaAsyncSocket" +CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Criollo +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CocoaAsyncSocket" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public" OTHER_LDFLAGS = -framework "Foundation" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/Criollo PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} diff --git a/objc/criollo/Pods/Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo-frameworks.sh b/objc/criollo/Pods/Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo-frameworks.sh index 5037d261262..d8d01b2aa9c 100755 --- a/objc/criollo/Pods/Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo-frameworks.sh +++ b/objc/criollo/Pods/Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo-frameworks.sh @@ -6,10 +6,14 @@ mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" +# Used as a return value for each invocation of `strip_invalid_archs` function. +STRIP_BINARY_RETVAL=0 + # This protects against multiple targets copying the same framework dependency at the same time. The solution # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") +# Copies and strips a vendored framework install_framework() { if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then @@ -58,12 +62,31 @@ install_framework() fi } -# Copies the dSYM of a vendored framework +# Copies and strips a vendored dSYM install_dsym() { local source="$1" if [ -r "$source" ]; then - echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\"" - rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}" + # Copy the dSYM into a the targets temp dir. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}" + + local basename + basename="$(basename -s .framework.dSYM "$source")" + binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}" + + # Strip invalid architectures so "fat" simulator / device frameworks work on device + if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then + strip_invalid_archs "$binary" + fi + + if [[ $STRIP_BINARY_RETVAL == 1 ]]; then + # Move the stripped file into its final destination. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}" + else + # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing. + touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM" + fi fi } @@ -85,10 +108,18 @@ code_sign_if_enabled() { # Strip invalid architectures strip_invalid_archs() { binary="$1" - # Get architectures for current file - archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)" + # Get architectures for current target binary + binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)" + # Intersect them with the architectures we are building for + intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)" + # If there are no archs supported by this binary then warn the user + if [[ -z "$intersected_archs" ]]; then + echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)." + STRIP_BINARY_RETVAL=0 + return + fi stripped="" - for arch in $archs; do + for arch in $binary_archs; do if ! [[ "${ARCHS}" == *"$arch"* ]]; then # Strip non-valid architectures in-place lipo -remove "$arch" -output "$binary" "$binary" || exit 1 @@ -98,6 +129,7 @@ strip_invalid_archs() { if [[ "$stripped" ]]; then echo "Stripped $binary of architectures:$stripped" fi + STRIP_BINARY_RETVAL=1 } diff --git a/objc/criollo/Pods/Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo.debug.xcconfig b/objc/criollo/Pods/Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo.debug.xcconfig index b70e7f4f35c..d41f9e7cc76 100644 --- a/objc/criollo/Pods/Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo.debug.xcconfig +++ b/objc/criollo/Pods/Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo.debug.xcconfig @@ -1,10 +1,10 @@ CODE_SIGN_IDENTITY = -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/CocoaAsyncSocket" "$PODS_CONFIGURATION_BUILD_DIR/Criollo" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CocoaAsyncSocket" "${PODS_CONFIGURATION_BUILD_DIR}/Criollo" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/../Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/CocoaAsyncSocket/CocoaAsyncSocket.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/Criollo/Criollo.framework/Headers" +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/CocoaAsyncSocket/CocoaAsyncSocket.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Criollo/Criollo.framework/Headers" OTHER_LDFLAGS = $(inherited) -framework "CocoaAsyncSocket" -framework "Criollo" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods diff --git a/objc/criollo/Pods/Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo.release.xcconfig b/objc/criollo/Pods/Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo.release.xcconfig index b70e7f4f35c..d41f9e7cc76 100644 --- a/objc/criollo/Pods/Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo.release.xcconfig +++ b/objc/criollo/Pods/Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo.release.xcconfig @@ -1,10 +1,10 @@ CODE_SIGN_IDENTITY = -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/CocoaAsyncSocket" "$PODS_CONFIGURATION_BUILD_DIR/Criollo" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CocoaAsyncSocket" "${PODS_CONFIGURATION_BUILD_DIR}/Criollo" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/../Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/CocoaAsyncSocket/CocoaAsyncSocket.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/Criollo/Criollo.framework/Headers" +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/CocoaAsyncSocket/CocoaAsyncSocket.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Criollo/Criollo.framework/Headers" OTHER_LDFLAGS = $(inherited) -framework "CocoaAsyncSocket" -framework "Criollo" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods diff --git a/python/.gitignore b/python/.gitignore new file mode 100644 index 00000000000..ed8ebf583f7 --- /dev/null +++ b/python/.gitignore @@ -0,0 +1 @@ +__pycache__ \ No newline at end of file diff --git a/python/django/server_python_django b/python/django/server_python_django index 3ddbec744f3..37fcd9daa77 100755 --- a/python/django/server_python_django +++ b/python/django/server_python_django @@ -1 +1 @@ -cd python/django;python3 `which gunicorn` app.wsgi --bind 127.0.0.1:3000 +cd python/django; gunicorn app.wsgi --bind 127.0.0.1:3000 diff --git a/tools/src/benchmarker.cr b/tools/src/benchmarker.cr index 9532dcdecda..05fce97de6d 100644 --- a/tools/src/benchmarker.cr +++ b/tools/src/benchmarker.cr @@ -60,8 +60,9 @@ LANGS = [ {lang: "python", targets: [ {name: "sanic", repo: "channelcat/sanic"}, {name: "japronto", repo: "squeaky-pl/japronto"}, - {name: "flask", repo: "pallets/flask"}, - {name: "django", repo: "django/django"}, + # Issue: https://github.com/tbrand/which_is_the_fastest/issues/165 + # {name: "flask", repo: "pallets/flask"}, + # {name: "django", repo: "django/django"}, {name: "tornado", repo: "tornadoweb/tornado"}, ]}, {lang: "nim", targets: [ @@ -168,7 +169,7 @@ def benchmark(server, count, threads, requests) : BenchResult result = BenchResult.new(max, min, ave, total) - sleep 10 + sleep 5 result end