diff --git a/Makefile b/Makefile index 0fe920ebe2d..7e8a6f7ad6c 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,4 @@ -all: cpp elixir node ruby crystal go rust swift python nim csharp scala client benchmarker - -# --- C++/CPP --- -cpp: evhtp - -evhtp: - cd cpp/evhtp && cmake -H. -B_builds -DCMAKE_BUILD_TYPE=Release && cmake --build _builds --config Release - ln -s -f ../cpp/evhtp/_builds/server_cpp_evhtp bin/. +all: elixir node ruby crystal go rust swift python nim csharp scala client benchmarker # --- Elixir --- elixir: plug phoenix diff --git a/README.md b/README.md index cc33d1108df..5015647d873 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-03-15 +Last update: 2018-04-10 ``` OS: Darwin (version: 17.3.0, arch: x86_64) CPU Cores: 8 @@ -14,96 +14,98 @@ CPU Cores: 8 ### Ranking (Framework) -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) +1. [router_cr](https://github.com/tbrand/router.cr) (crystal) +2. [iron](https://github.com/iron/iron) (rust) +3. [raze](https://github.com/samueleaton/raze) (crystal) +4. [nickel](https://github.com/nickel-org/nickel.rs) (rust) +5. [japronto](https://github.com/squeaky-pl/japronto) (python) +6. [actix](https://github.com/actix/actix-web) (rust) +7. [spider-gazelle](https://github.com/spider-gazelle/spider-gazelle) (crystal) 8. [fasthttprouter](https://github.com/buaazp/fasthttprouter) (go) -9. [amber](https://github.com/amberframework/amber) (crystal) +9. [mofuw](https://github.com/2vg/mofuw) (nim) 10. [lucky](https://github.com/luckyframework/lucky) (crystal) -11. [rocket](https://github.com/SergioBenitez/Rocket) (rust) +11. [amber](https://github.com/amberframework/amber) (crystal) 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. [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) +13. [rocket](https://github.com/SergioBenitez/Rocket) (rust) +14. [clusterpolka](https://github.com/lukeed/polka) (node) +15. [iris](https://github.com/kataras/iris) (go) +16. [gorilla_mux](https://github.com/gorilla/mux) (go) +17. [echo](https://github.com/labstack/echo) (go) +18. [phoenix](https://github.com/phoenixframework/phoenix) (elixir) +19. [gin](https://github.com/gin-gonic/gin) (go) +20. [plug](https://github.com/elixir-lang/plug) (elixir) +21. [aspnetcore](https://github.com/aspnet/Home) (csharp) +22. [vapor](https://github.com/vapor/vapor) (swift) +23. [sanic](https://github.com/channelcat/sanic) (python) +24. [perfect](https://github.com/PerfectlySoft/Perfect) (swift) +25. [kitura](https://github.com/IBM-Swift/Kitura) (swift) +26. [jester](https://github.com/dom96/jester) (nim) +27. [polka](https://github.com/lukeed/polka) (node) +28. [clusterexpress](https://github.com/LearnBoost/cluster) (node) +29. [akkahttp](https://github.com/akka/akka-http) (scala) +30. [express](https://github.com/expressjs/express) (node) +31. [roda](https://github.com/jeremyevans/roda) (ruby) +32. [rack-routing](https://github.com/iAmPlus/rack-routing) (ruby) +33. [criollo](https://github.com/thecatalinstan/criollo) (objc) +34. [sinatra](https://github.com/sinatra/sinatra) (ruby) +35. [tornado](https://github.com/tornadoweb/tornado) (python) +36. [rails](https://github.com/rails/rails) (ruby) ### Ranking (Language) -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)) +1. crystal ([router_cr](https://github.com/tbrand/router.cr)) +2. rust ([iron](https://github.com/iron/iron)) +3. python ([japronto](https://github.com/squeaky-pl/japronto)) 4. go ([fasthttprouter](https://github.com/buaazp/fasthttprouter)) -5. node ([clusterpolka](https://github.com/lukeed/polka)) -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. objc ([criollo](https://github.com/thecatalinstan/criollo)) -12. nim ([jester](https://github.com/dom96/jester)) +5. nim ([mofuw](https://github.com/2vg/mofuw)) +6. node ([clusterpolka](https://github.com/lukeed/polka)) +7. elixir ([phoenix](https://github.com/phoenixframework/phoenix)) +8. csharp ([aspnetcore](https://github.com/aspnet/Home)) +9. swift ([vapor](https://github.com/vapor/vapor)) +10. scala ([akkahttp](https://github.com/akka/akka-http)) +11. ruby ([roda](https://github.com/jeremyevans/roda)) +12. objc ([criollo](https://github.com/thecatalinstan/criollo)) ### All frameworks | Language (Runtime) | Framework (Middleware) | Max [sec] | Min [sec] | Ave [sec] | |---------------------------|---------------------------|-----------------|-----------------|-----------------| -| 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 | +| ruby | rails | 350.161733 | 349.403240 | 349.758695 | +| ruby | sinatra | 100.885575 | 100.654648 | 100.776388 | +| ruby | roda | 35.200353 | 34.684047 | 34.891702 | +| ruby | rack-routing | 45.339112 | 44.963142 | 45.080912 | +| crystal | kemal | 8.239321 | 7.847715 | 8.080067 | +| crystal | router_cr | 6.643287 | 6.410330 | 6.555974 | +| crystal | raze | 6.931865 | 6.664825 | 6.848396 | +| crystal | lucky | 8.145836 | 7.735874 | 8.010866 | +| crystal | amber | 8.090061 | 7.831198 | 8.011325 | +| crystal | spider-gazelle | 7.240015 | 7.046256 | 7.192485 | +| go | echo | 10.205904 | 9.653988 | 9.989534 | +| go | gorilla_mux | 9.971818 | 9.486147 | 9.743084 | +| go | iris | 9.732393 | 9.387682 | 9.565645 | +| go | fasthttprouter | 7.592036 | 7.326633 | 7.452470 | +| go | gin | 10.973279 | 10.560217 | 10.811344 | +| rust | actix | 7.199203 | 6.997528 | 7.099141 | +| rust | iron | 6.801253 | 6.679035 | 6.710507 | +| rust | nickel | 6.936677 | 6.786194 | 6.876099 | +| rust | rocket | 8.657137 | 8.349306 | 8.504091 | +| node | express | 28.081658 | 26.611051 | 27.016107 | +| node | clusterexpress | 17.409648 | 15.773684 | 16.309491 | +| node | polka | 15.867429 | 15.066904 | 15.401819 | +| node | clusterpolka | 9.363300 | 9.197916 | 9.309864 | +| elixir | plug | 11.253845 | 10.597757 | 10.876218 | +| elixir | phoenix | 11.220435 | 10.087917 | 10.668334 | +| swift | vapor | 12.498265 | 12.178270 | 12.336104 | +| swift | perfect | 12.900839 | 12.444516 | 12.684239 | +| swift | kitura | 13.263198 | 12.493619 | 12.940476 | +| scala | akkahttp | 18.595948 | 16.553332 | 17.078369 | +| csharp | aspnetcore | 10.932268 | 10.829186 | 10.887798 | +| python | sanic | 12.986084 | 11.706889 | 12.437696 | +| python | japronto | 7.116580 | 7.002742 | 7.055527 | +| python | tornado | 176.956387 | 176.746874 | 176.855119 | +| nim | jester | 14.122242 | 14.050893 | 14.082330 | +| nim | mofuw | 8.012292 | 7.701051 | 7.814884 | +| objc | criollo | 57.233161 | 55.853540 | 56.561862 | ## Current target frameworks (middlewares) @@ -153,8 +155,6 @@ CPU Cores: 8 - [mofuw](https://github.com/2vg/mofuw) - Objective-C - [Criollo](https://criollo.io/) - - C++/CPP - - [evhtp](https://github.com/criticalstack/libevhtp) See Development section when you want to add new languages or frameworks. diff --git a/cpp/evhtp/.gitignore b/cpp/evhtp/.gitignore deleted file mode 100644 index ea6f2e33a28..00000000000 --- a/cpp/evhtp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/_builds/* diff --git a/cpp/evhtp/CMakeLists.txt b/cpp/evhtp/CMakeLists.txt deleted file mode 100644 index 67b752e9b02..00000000000 --- a/cpp/evhtp/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -cmake_minimum_required(VERSION 3.1) - -include("cmake/HunterGate.cmake") -HunterGate( - URL "https://github.com/ruslo/hunter/archive/v0.20.32.tar.gz" - SHA1 "72bd88df338cb1b02d4c36c3f85ac87b33578eab" -) - -project(server_cpp_evhtp) - -hunter_add_package(libevhtp) -find_package(libevhtp CONFIG REQUIRED) - -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS OFF) - -add_executable(server_cpp_evhtp main.cpp) -target_link_libraries(server_cpp_evhtp libevhtp::evhtp) - diff --git a/cpp/evhtp/cmake/HunterGate.cmake b/cpp/evhtp/cmake/HunterGate.cmake deleted file mode 100644 index c24c0e57714..00000000000 --- a/cpp/evhtp/cmake/HunterGate.cmake +++ /dev/null @@ -1,543 +0,0 @@ -# Copyright (c) 2013-2017, Ruslan Baratov -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# This is a gate file to Hunter package manager. -# Include this file using `include` command and add package you need, example: -# -# cmake_minimum_required(VERSION 3.0) -# -# include("cmake/HunterGate.cmake") -# HunterGate( -# URL "https://github.com/path/to/hunter/archive.tar.gz" -# SHA1 "798501e983f14b28b10cda16afa4de69eee1da1d" -# ) -# -# project(MyProject) -# -# hunter_add_package(Foo) -# hunter_add_package(Boo COMPONENTS Bar Baz) -# -# Projects: -# * https://github.com/hunter-packages/gate/ -# * https://github.com/ruslo/hunter - -option(HUNTER_ENABLED "Enable Hunter package manager support" ON) -if(HUNTER_ENABLED) - if(CMAKE_VERSION VERSION_LESS "3.0") - message(FATAL_ERROR "At least CMake version 3.0 required for hunter dependency management." - " Update CMake or set HUNTER_ENABLED to OFF.") - endif() -endif() - -include(CMakeParseArguments) # cmake_parse_arguments - -option(HUNTER_STATUS_PRINT "Print working status" ON) -option(HUNTER_STATUS_DEBUG "Print a lot info" OFF) -option(HUNTER_TLS_VERIFY "Enable/disable TLS certificate checking on downloads" ON) - -set(HUNTER_WIKI "https://github.com/ruslo/hunter/wiki") - -function(hunter_gate_status_print) - foreach(print_message ${ARGV}) - if(HUNTER_STATUS_PRINT OR HUNTER_STATUS_DEBUG) - message(STATUS "[hunter] ${print_message}") - endif() - endforeach() -endfunction() - -function(hunter_gate_status_debug) - foreach(print_message ${ARGV}) - if(HUNTER_STATUS_DEBUG) - string(TIMESTAMP timestamp) - message(STATUS "[hunter *** DEBUG *** ${timestamp}] ${print_message}") - endif() - endforeach() -endfunction() - -function(hunter_gate_wiki wiki_page) - message("------------------------------ WIKI -------------------------------") - message(" ${HUNTER_WIKI}/${wiki_page}") - message("-------------------------------------------------------------------") - message("") - message(FATAL_ERROR "") -endfunction() - -function(hunter_gate_internal_error) - message("") - foreach(print_message ${ARGV}) - message("[hunter ** INTERNAL **] ${print_message}") - endforeach() - message("[hunter ** INTERNAL **] [Directory:${CMAKE_CURRENT_LIST_DIR}]") - message("") - hunter_gate_wiki("error.internal") -endfunction() - -function(hunter_gate_fatal_error) - cmake_parse_arguments(hunter "" "WIKI" "" "${ARGV}") - string(COMPARE EQUAL "${hunter_WIKI}" "" have_no_wiki) - if(have_no_wiki) - hunter_gate_internal_error("Expected wiki") - endif() - message("") - foreach(x ${hunter_UNPARSED_ARGUMENTS}) - message("[hunter ** FATAL ERROR **] ${x}") - endforeach() - message("[hunter ** FATAL ERROR **] [Directory:${CMAKE_CURRENT_LIST_DIR}]") - message("") - hunter_gate_wiki("${hunter_WIKI}") -endfunction() - -function(hunter_gate_user_error) - hunter_gate_fatal_error(${ARGV} WIKI "error.incorrect.input.data") -endfunction() - -function(hunter_gate_self root version sha1 result) - string(COMPARE EQUAL "${root}" "" is_bad) - if(is_bad) - hunter_gate_internal_error("root is empty") - endif() - - string(COMPARE EQUAL "${version}" "" is_bad) - if(is_bad) - hunter_gate_internal_error("version is empty") - endif() - - string(COMPARE EQUAL "${sha1}" "" is_bad) - if(is_bad) - hunter_gate_internal_error("sha1 is empty") - endif() - - string(SUBSTRING "${sha1}" 0 7 archive_id) - - if(EXISTS "${root}/cmake/Hunter") - set(hunter_self "${root}") - else() - set( - hunter_self - "${root}/_Base/Download/Hunter/${version}/${archive_id}/Unpacked" - ) - endif() - - set("${result}" "${hunter_self}" PARENT_SCOPE) -endfunction() - -# Set HUNTER_GATE_ROOT cmake variable to suitable value. -function(hunter_gate_detect_root) - # Check CMake variable - string(COMPARE NOTEQUAL "${HUNTER_ROOT}" "" not_empty) - if(not_empty) - set(HUNTER_GATE_ROOT "${HUNTER_ROOT}" PARENT_SCOPE) - hunter_gate_status_debug("HUNTER_ROOT detected by cmake variable") - return() - endif() - - # Check environment variable - string(COMPARE NOTEQUAL "$ENV{HUNTER_ROOT}" "" not_empty) - if(not_empty) - set(HUNTER_GATE_ROOT "$ENV{HUNTER_ROOT}" PARENT_SCOPE) - hunter_gate_status_debug("HUNTER_ROOT detected by environment variable") - return() - endif() - - # Check HOME environment variable - string(COMPARE NOTEQUAL "$ENV{HOME}" "" result) - if(result) - set(HUNTER_GATE_ROOT "$ENV{HOME}/.hunter" PARENT_SCOPE) - hunter_gate_status_debug("HUNTER_ROOT set using HOME environment variable") - return() - endif() - - # Check SYSTEMDRIVE and USERPROFILE environment variable (windows only) - if(WIN32) - string(COMPARE NOTEQUAL "$ENV{SYSTEMDRIVE}" "" result) - if(result) - set(HUNTER_GATE_ROOT "$ENV{SYSTEMDRIVE}/.hunter" PARENT_SCOPE) - hunter_gate_status_debug( - "HUNTER_ROOT set using SYSTEMDRIVE environment variable" - ) - return() - endif() - - string(COMPARE NOTEQUAL "$ENV{USERPROFILE}" "" result) - if(result) - set(HUNTER_GATE_ROOT "$ENV{USERPROFILE}/.hunter" PARENT_SCOPE) - hunter_gate_status_debug( - "HUNTER_ROOT set using USERPROFILE environment variable" - ) - return() - endif() - endif() - - hunter_gate_fatal_error( - "Can't detect HUNTER_ROOT" - WIKI "error.detect.hunter.root" - ) -endfunction() - -macro(hunter_gate_lock dir) - if(NOT HUNTER_SKIP_LOCK) - if("${CMAKE_VERSION}" VERSION_LESS "3.2") - hunter_gate_fatal_error( - "Can't lock, upgrade to CMake 3.2 or use HUNTER_SKIP_LOCK" - WIKI "error.can.not.lock" - ) - endif() - hunter_gate_status_debug("Locking directory: ${dir}") - file(LOCK "${dir}" DIRECTORY GUARD FUNCTION) - hunter_gate_status_debug("Lock done") - endif() -endmacro() - -function(hunter_gate_download dir) - string( - COMPARE - NOTEQUAL - "$ENV{HUNTER_DISABLE_AUTOINSTALL}" - "" - disable_autoinstall - ) - if(disable_autoinstall AND NOT HUNTER_RUN_INSTALL) - hunter_gate_fatal_error( - "Hunter not found in '${dir}'" - "Set HUNTER_RUN_INSTALL=ON to auto-install it from '${HUNTER_GATE_URL}'" - "Settings:" - " HUNTER_ROOT: ${HUNTER_GATE_ROOT}" - " HUNTER_SHA1: ${HUNTER_GATE_SHA1}" - WIKI "error.run.install" - ) - endif() - string(COMPARE EQUAL "${dir}" "" is_bad) - if(is_bad) - hunter_gate_internal_error("Empty 'dir' argument") - endif() - - string(COMPARE EQUAL "${HUNTER_GATE_SHA1}" "" is_bad) - if(is_bad) - hunter_gate_internal_error("HUNTER_GATE_SHA1 empty") - endif() - - string(COMPARE EQUAL "${HUNTER_GATE_URL}" "" is_bad) - if(is_bad) - hunter_gate_internal_error("HUNTER_GATE_URL empty") - endif() - - set(done_location "${dir}/DONE") - set(sha1_location "${dir}/SHA1") - - set(build_dir "${dir}/Build") - set(cmakelists "${dir}/CMakeLists.txt") - - hunter_gate_lock("${dir}") - if(EXISTS "${done_location}") - # while waiting for lock other instance can do all the job - hunter_gate_status_debug("File '${done_location}' found, skip install") - return() - endif() - - file(REMOVE_RECURSE "${build_dir}") - file(REMOVE_RECURSE "${cmakelists}") - - file(MAKE_DIRECTORY "${build_dir}") # check directory permissions - - # Disabling languages speeds up a little bit, reduces noise in the output - # and avoids path too long windows error - file( - WRITE - "${cmakelists}" - "cmake_minimum_required(VERSION 3.0)\n" - "project(HunterDownload LANGUAGES NONE)\n" - "include(ExternalProject)\n" - "ExternalProject_Add(\n" - " Hunter\n" - " URL\n" - " \"${HUNTER_GATE_URL}\"\n" - " URL_HASH\n" - " SHA1=${HUNTER_GATE_SHA1}\n" - " DOWNLOAD_DIR\n" - " \"${dir}\"\n" - " TLS_VERIFY\n" - " ${HUNTER_TLS_VERIFY}\n" - " SOURCE_DIR\n" - " \"${dir}/Unpacked\"\n" - " CONFIGURE_COMMAND\n" - " \"\"\n" - " BUILD_COMMAND\n" - " \"\"\n" - " INSTALL_COMMAND\n" - " \"\"\n" - ")\n" - ) - - if(HUNTER_STATUS_DEBUG) - set(logging_params "") - else() - set(logging_params OUTPUT_QUIET) - endif() - - hunter_gate_status_debug("Run generate") - - # Need to add toolchain file too. - # Otherwise on Visual Studio + MDD this will fail with error: - # "Could not find an appropriate version of the Windows 10 SDK installed on this machine" - if(EXISTS "${CMAKE_TOOLCHAIN_FILE}") - get_filename_component(absolute_CMAKE_TOOLCHAIN_FILE "${CMAKE_TOOLCHAIN_FILE}" ABSOLUTE) - set(toolchain_arg "-DCMAKE_TOOLCHAIN_FILE=${absolute_CMAKE_TOOLCHAIN_FILE}") - else() - # 'toolchain_arg' can't be empty - set(toolchain_arg "-DCMAKE_TOOLCHAIN_FILE=") - endif() - - string(COMPARE EQUAL "${CMAKE_MAKE_PROGRAM}" "" no_make) - if(no_make) - set(make_arg "") - else() - # Test case: remove Ninja from PATH but set it via CMAKE_MAKE_PROGRAM - set(make_arg "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}") - endif() - - execute_process( - COMMAND - "${CMAKE_COMMAND}" - "-H${dir}" - "-B${build_dir}" - "-G${CMAKE_GENERATOR}" - "${toolchain_arg}" - ${make_arg} - WORKING_DIRECTORY "${dir}" - RESULT_VARIABLE download_result - ${logging_params} - ) - - if(NOT download_result EQUAL 0) - hunter_gate_internal_error("Configure project failed") - endif() - - hunter_gate_status_print( - "Initializing Hunter workspace (${HUNTER_GATE_SHA1})" - " ${HUNTER_GATE_URL}" - " -> ${dir}" - ) - execute_process( - COMMAND "${CMAKE_COMMAND}" --build "${build_dir}" - WORKING_DIRECTORY "${dir}" - RESULT_VARIABLE download_result - ${logging_params} - ) - - if(NOT download_result EQUAL 0) - hunter_gate_internal_error("Build project failed") - endif() - - file(REMOVE_RECURSE "${build_dir}") - file(REMOVE_RECURSE "${cmakelists}") - - file(WRITE "${sha1_location}" "${HUNTER_GATE_SHA1}") - file(WRITE "${done_location}" "DONE") - - hunter_gate_status_debug("Finished") -endfunction() - -# Must be a macro so master file 'cmake/Hunter' can -# apply all variables easily just by 'include' command -# (otherwise PARENT_SCOPE magic needed) -macro(HunterGate) - if(HUNTER_GATE_DONE) - # variable HUNTER_GATE_DONE set explicitly for external project - # (see `hunter_download`) - set_property(GLOBAL PROPERTY HUNTER_GATE_DONE YES) - endif() - - # First HunterGate command will init Hunter, others will be ignored - get_property(_hunter_gate_done GLOBAL PROPERTY HUNTER_GATE_DONE SET) - - if(NOT HUNTER_ENABLED) - # Empty function to avoid error "unknown function" - function(hunter_add_package) - endfunction() - - set( - _hunter_gate_disabled_mode_dir - "${CMAKE_CURRENT_LIST_DIR}/cmake/Hunter/disabled-mode" - ) - if(EXISTS "${_hunter_gate_disabled_mode_dir}") - hunter_gate_status_debug( - "Adding \"disabled-mode\" modules: ${_hunter_gate_disabled_mode_dir}" - ) - list(APPEND CMAKE_PREFIX_PATH "${_hunter_gate_disabled_mode_dir}") - endif() - elseif(_hunter_gate_done) - hunter_gate_status_debug("Secondary HunterGate (use old settings)") - hunter_gate_self( - "${HUNTER_CACHED_ROOT}" - "${HUNTER_VERSION}" - "${HUNTER_SHA1}" - _hunter_self - ) - include("${_hunter_self}/cmake/Hunter") - else() - set(HUNTER_GATE_LOCATION "${CMAKE_CURRENT_LIST_DIR}") - - string(COMPARE NOTEQUAL "${PROJECT_NAME}" "" _have_project_name) - if(_have_project_name) - hunter_gate_fatal_error( - "Please set HunterGate *before* 'project' command. " - "Detected project: ${PROJECT_NAME}" - WIKI "error.huntergate.before.project" - ) - endif() - - cmake_parse_arguments( - HUNTER_GATE "LOCAL" "URL;SHA1;GLOBAL;FILEPATH" "" ${ARGV} - ) - - string(COMPARE EQUAL "${HUNTER_GATE_SHA1}" "" _empty_sha1) - string(COMPARE EQUAL "${HUNTER_GATE_URL}" "" _empty_url) - string( - COMPARE - NOTEQUAL - "${HUNTER_GATE_UNPARSED_ARGUMENTS}" - "" - _have_unparsed - ) - string(COMPARE NOTEQUAL "${HUNTER_GATE_GLOBAL}" "" _have_global) - string(COMPARE NOTEQUAL "${HUNTER_GATE_FILEPATH}" "" _have_filepath) - - if(_have_unparsed) - hunter_gate_user_error( - "HunterGate unparsed arguments: ${HUNTER_GATE_UNPARSED_ARGUMENTS}" - ) - endif() - if(_empty_sha1) - hunter_gate_user_error("SHA1 suboption of HunterGate is mandatory") - endif() - if(_empty_url) - hunter_gate_user_error("URL suboption of HunterGate is mandatory") - endif() - if(_have_global) - if(HUNTER_GATE_LOCAL) - hunter_gate_user_error("Unexpected LOCAL (already has GLOBAL)") - endif() - if(_have_filepath) - hunter_gate_user_error("Unexpected FILEPATH (already has GLOBAL)") - endif() - endif() - if(HUNTER_GATE_LOCAL) - if(_have_global) - hunter_gate_user_error("Unexpected GLOBAL (already has LOCAL)") - endif() - if(_have_filepath) - hunter_gate_user_error("Unexpected FILEPATH (already has LOCAL)") - endif() - endif() - if(_have_filepath) - if(_have_global) - hunter_gate_user_error("Unexpected GLOBAL (already has FILEPATH)") - endif() - if(HUNTER_GATE_LOCAL) - hunter_gate_user_error("Unexpected LOCAL (already has FILEPATH)") - endif() - endif() - - hunter_gate_detect_root() # set HUNTER_GATE_ROOT - - # Beautify path, fix probable problems with windows path slashes - get_filename_component( - HUNTER_GATE_ROOT "${HUNTER_GATE_ROOT}" ABSOLUTE - ) - hunter_gate_status_debug("HUNTER_ROOT: ${HUNTER_GATE_ROOT}") - if(NOT HUNTER_ALLOW_SPACES_IN_PATH) - string(FIND "${HUNTER_GATE_ROOT}" " " _contain_spaces) - if(NOT _contain_spaces EQUAL -1) - hunter_gate_fatal_error( - "HUNTER_ROOT (${HUNTER_GATE_ROOT}) contains spaces." - "Set HUNTER_ALLOW_SPACES_IN_PATH=ON to skip this error" - "(Use at your own risk!)" - WIKI "error.spaces.in.hunter.root" - ) - endif() - endif() - - string( - REGEX - MATCH - "[0-9]+\\.[0-9]+\\.[0-9]+[-_a-z0-9]*" - HUNTER_GATE_VERSION - "${HUNTER_GATE_URL}" - ) - string(COMPARE EQUAL "${HUNTER_GATE_VERSION}" "" _is_empty) - if(_is_empty) - set(HUNTER_GATE_VERSION "unknown") - endif() - - hunter_gate_self( - "${HUNTER_GATE_ROOT}" - "${HUNTER_GATE_VERSION}" - "${HUNTER_GATE_SHA1}" - _hunter_self - ) - - set(_master_location "${_hunter_self}/cmake/Hunter") - if(EXISTS "${HUNTER_GATE_ROOT}/cmake/Hunter") - # Hunter downloaded manually (e.g. by 'git clone') - set(_unused "xxxxxxxxxx") - set(HUNTER_GATE_SHA1 "${_unused}") - set(HUNTER_GATE_VERSION "${_unused}") - else() - get_filename_component(_archive_id_location "${_hunter_self}/.." ABSOLUTE) - set(_done_location "${_archive_id_location}/DONE") - set(_sha1_location "${_archive_id_location}/SHA1") - - # Check Hunter already downloaded by HunterGate - if(NOT EXISTS "${_done_location}") - hunter_gate_download("${_archive_id_location}") - endif() - - if(NOT EXISTS "${_done_location}") - hunter_gate_internal_error("hunter_gate_download failed") - endif() - - if(NOT EXISTS "${_sha1_location}") - hunter_gate_internal_error("${_sha1_location} not found") - endif() - file(READ "${_sha1_location}" _sha1_value) - string(COMPARE EQUAL "${_sha1_value}" "${HUNTER_GATE_SHA1}" _is_equal) - if(NOT _is_equal) - hunter_gate_internal_error( - "Short SHA1 collision:" - " ${_sha1_value} (from ${_sha1_location})" - " ${HUNTER_GATE_SHA1} (HunterGate)" - ) - endif() - if(NOT EXISTS "${_master_location}") - hunter_gate_user_error( - "Master file not found:" - " ${_master_location}" - "try to update Hunter/HunterGate" - ) - endif() - endif() - include("${_master_location}") - set_property(GLOBAL PROPERTY HUNTER_GATE_DONE YES) - endif() -endmacro() diff --git a/cpp/evhtp/main.cpp b/cpp/evhtp/main.cpp deleted file mode 100644 index f41d1087aac..00000000000 --- a/cpp/evhtp/main.cpp +++ /dev/null @@ -1,56 +0,0 @@ -#include -#include -#include -#include - -// No error checking or anything of the sort, as per the guidelines - -const int num_threads = -1; - -void on_request_index(evhtp_request_t *req, void*) { - if(req->method == htp_method_GET) { - evhtp_send_reply(req, EVHTP_RES_OK); - } -} - -void on_request_user_register(evhtp_request_t *req, void*) { - if(req->method == htp_method_POST) { - evhtp_send_reply(req, EVHTP_RES_OK); - } -} - -void on_request_user_index(evhtp_request_t *req, void*) { - if(req->method == htp_method_GET) { - const char *p = req->uri->path->full + 6; // 6 being the length of "/user/" - const unsigned int pl = strlen(p); - evbuffer_add_reference(req->buffer_out, p, pl, NULL, NULL); - evhtp_send_reply(req, EVHTP_RES_OK); - } -} - -int main(int argc, char **argv) { - evbase_t *evbase = event_base_new(); - evhtp_t *htp = evhtp_new(evbase, NULL); - - evhtp_set_parser_flags(htp, EVHTP_PARSE_QUERY_FLAG_LENIENT); - evhtp_enable_flag(htp, EVHTP_FLAG_ENABLE_NODELAY); - - evhtp_set_cb(htp, "/user/", on_request_user_index, NULL); - evhtp_set_cb(htp, "/user", on_request_user_register, NULL); - evhtp_set_cb(htp, "/", on_request_index, NULL); - evhtp_bind_socket(htp, "0.0.0.0", 3000, 1024); - - if(num_threads > 1) { - evhtp_use_threads_wexit(htp, NULL, NULL, num_threads, NULL); - } - else if(num_threads < 0) { - const int cores = std::thread::hardware_concurrency(); - if(cores > 0 && cores > -num_threads + 1) { - evhtp_use_threads_wexit(htp, NULL, NULL, cores + num_threads + 1, NULL); - } - } - - event_base_loop(evbase, 0); - return 0; -} - diff --git a/neph.yaml b/neph.yaml index c2c0f61f6ad..3005a5790ad 100644 --- a/neph.yaml +++ b/neph.yaml @@ -1,6 +1,5 @@ main: depends_on: - - cpp - node - ruby - crystal @@ -15,18 +14,6 @@ main: - objc - benchmarker -cpp: - depends_on: - - evhtp - -evhtp: - command: | - cmake -H. -B_builds -DCMAKE_BUILD_TYPE=Release - cmake --build _builds --config Release - ln -s -f ../cpp/evhtp/_builds/server_cpp_evhtp bin/. - dir: - cpp/evhtp - node: depends_on: - express diff --git a/objc/criollo/Pods/Pods.xcodeproj/project.pbxproj b/objc/criollo/Pods/Pods.xcodeproj/project.pbxproj index b419a18a0bc..a2f6d5b2490 100644 --- a/objc/criollo/Pods/Pods.xcodeproj/project.pbxproj +++ b/objc/criollo/Pods/Pods.xcodeproj/project.pbxproj @@ -9,15 +9,16 @@ /* Begin PBXBuildFile section */ 09851E4EE560ABB62592C9A4C67F46C2 /* CRHTTPResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C971835F86423A8B6992B3C311019A2 /* CRHTTPResponse.m */; }; 0B648CA12DB9F5A270817BD37DA72068 /* CRFCGIRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 0737866FB9E490DBBC28636404AE95A1 /* CRFCGIRecord.h */; settings = {ATTRIBUTES = (Project, ); }; }; + 0E238323679E23EB14D5353A84C714E5 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73E37E621B5C0AF1B632E81FE03991A3 /* Cocoa.framework */; }; + 0E29BFED3333BB3C8E6E97C9DBC90B00 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F27540700B858AB501F83122499CB32 /* CoreServices.framework */; }; 13929480308BF9E34042624056995AD9 /* CRStaticDirectoryManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C40A24F594216FDCEF3B5ED7509F220 /* CRStaticDirectoryManager.m */; }; 198EAFE1B92DD174948BA5DC22E74746 /* CRFCGIConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 431C01FD74193C986954D0C5DC355640 /* CRFCGIConnection.m */; }; - 1EC3538DF934F7FFA3B00DDB2531C93E /* Criollo-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = AD02D97521331184F100F44FCD30962A /* Criollo-dummy.m */; }; + 1EC3538DF934F7FFA3B00DDB2531C93E /* Criollo-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = D729F810D0091397B71D6D5088439541 /* Criollo-dummy.m */; }; + 2363FCF530A1628F6F85AD3EAF15303C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADB6459DE982ACC4F3EE6F5975E40220 /* Foundation.framework */; }; 29B67AFD9A349F3ABF779BDF51935F98 /* CRRouter_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AB2A9A86E66215EC2B718A00C0E92CC /* CRRouter_Internal.h */; settings = {ATTRIBUTES = (Project, ); }; }; 2E18FF3170AEAA181041F6F37D28F42A /* CRTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = BA74F8D1E17FBFAEB6BBEE39B82BFBD6 /* CRTypes.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 3144345774E1197710DF187304F8C5F4 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 015F2D3D3961194BBD10E2188FFB8EE7 /* Security.framework */; }; 35704A8807807923389EC302CB027FD6 /* CRApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 0385E5A48868DEEB0C981A49C470107E /* CRApplication.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3834B7721A82EFFA4F8743E41119D853 /* CRNib.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CB20285B00BBBF8CE56A713795D8403 /* CRNib.m */; }; - 38BB1690CADE507168AF322686C545F0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26D7734B672A8EDBAC9B07F50BA6E414 /* Foundation.framework */; }; 3950608EB1554180DB3A8667663A345A /* CRRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 726FB81797AB25AC77A7E6CE5D2E8123 /* CRRequest.h */; settings = {ATTRIBUTES = (Public, ); }; }; 399A85AF65AA3B8F093A8682A83FB0C5 /* CRServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 96E21999363D9E2FE6A941F7D7792B84 /* CRServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3BD967874EA83AE3DD98FB77EE347A09 /* CRHTTPResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = E6E2A7EFFC25BB5BE2A4672797102427 /* CRHTTPResponse.h */; settings = {ATTRIBUTES = (Project, ); }; }; @@ -28,6 +29,7 @@ 4AF52846B32909F76D11964611218C07 /* CRNib.h in Headers */ = {isa = PBXBuildFile; fileRef = E75F19FD957E73C72C0E1E5380CCF48C /* CRNib.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D9251A7458E713AD39685BA17CBADC4 /* CRStaticDirectoryManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A2316FFA2CF4E49F5F906F6A1F41D1CE /* CRStaticDirectoryManager.h */; settings = {ATTRIBUTES = (Project, ); }; }; 52FBEC41E3C4965B7DF5B7B943E448FD /* CRServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A930A941C8E40391190D0B5102D592B /* CRServer.m */; }; + 544E558615230C13688C13E8A8DF4038 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73E37E621B5C0AF1B632E81FE03991A3 /* Cocoa.framework */; }; 5C9FAE6F6C2537A49872EBD9CA07CE51 /* CRMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = A5D1E4B363E5FE510C85C00744A3C5BC /* CRMessage.m */; }; 5D3012E595C937439908A8102F600FF7 /* CRFCGIRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D29F3B98E60E955327E9D15E72D3353 /* CRFCGIRequest.m */; }; 5F8E294A55F30B1C44BD5D5E9AFAD830 /* CRRoute_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = F0074B739B7032C179CE1E24769E74DF /* CRRoute_Internal.h */; settings = {ATTRIBUTES = (Project, ); }; }; @@ -38,10 +40,9 @@ 71C611FF49B0EBB783754988D396452D /* CRFCGIServer.m in Sources */ = {isa = PBXBuildFile; fileRef = FCF21F80EE5133892F31B0C4FDB63687 /* CRFCGIServer.m */; }; 723DAB37AA4B9FAF421F0A72F0B80C89 /* CRRouter.h in Headers */ = {isa = PBXBuildFile; fileRef = 48F3575701449A3001DCAD6BB3486BD2 /* CRRouter.h */; settings = {ATTRIBUTES = (Public, ); }; }; 74286C759784F5E75088B64F5D156CDB /* CRRouteMatchingResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 172FBF30A8A6338D8AC05105A53D0CD5 /* CRRouteMatchingResult.m */; }; - 781C271B7443AD52B0979D3732ACD05F /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3118E72E5CD11EDDF9926F837462BE28 /* CoreServices.framework */; }; 7A62F3739C0CC93727DBCE1856804274 /* CRFCGIServerConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B42A67A51DC31457ED01D01849A2912 /* CRFCGIServerConfiguration.h */; settings = {ATTRIBUTES = (Project, ); }; }; 7D4D87E2F25156216770D5460E38B7C2 /* NSString+Criollo.m in Sources */ = {isa = PBXBuildFile; fileRef = B540A73A17ED4F64ADBDB9CFA5C39F74 /* NSString+Criollo.m */; }; - 7E4F0161B4D135DA3A0763619A56C2F5 /* CocoaAsyncSocket-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A11396569971568D005B86A255B3F2C /* CocoaAsyncSocket-dummy.m */; }; + 7E4F0161B4D135DA3A0763619A56C2F5 /* CocoaAsyncSocket-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DE7C25EF39229124A885D67337665B1 /* CocoaAsyncSocket-dummy.m */; }; 82C40C956D6A52946A296AF5A5597DB2 /* NSDate+RFC1123.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A082ED314BC0CF507B7942CCBA8EDF /* NSDate+RFC1123.m */; }; 83168FB9F0AEBD7FDC3FAB65399DDB92 /* NSDate+RFC1123.h in Headers */ = {isa = PBXBuildFile; fileRef = E9BB8E735DB4EE3F341D2FFDFEEA64C2 /* NSDate+RFC1123.h */; settings = {ATTRIBUTES = (Project, ); }; }; 8480493AEC1C7AF1B5C0E0BF2F70FB44 /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 65AD684FFB8D65129A56AFACE6152D11 /* GCDAsyncSocket.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; @@ -52,12 +53,11 @@ 93D547740D7455469B7FEBD3A11B5F93 /* CRUploadedFile.m in Sources */ = {isa = PBXBuildFile; fileRef = E6B11B4622F7A4AE6A9E1267F9E78FEF /* CRUploadedFile.m */; }; 9407EBADB481F7A5C67DFB8991093525 /* CRMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 277711D161DD9841394B571390D954FF /* CRMessage.h */; settings = {ATTRIBUTES = (Public, ); }; }; 97D96C9953365CA6DE3F8E99A455A60F /* CRRouteController.h in Headers */ = {isa = PBXBuildFile; fileRef = F4D20B4440D4E2C5066109035971680C /* CRRouteController.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 996FEFE7516497600B7E0F676104F478 /* Criollo-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 925F414DD356C31C2AEF9231CE9E0AC8 /* Criollo-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 996FEFE7516497600B7E0F676104F478 /* Criollo-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C0349C22466B02B2F1B9A4E14A8D6B4 /* Criollo-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9A9BDA79420BF768F4C0FB8223E857BE /* CRRoute.h in Headers */ = {isa = PBXBuildFile; fileRef = 7FF48AFCAA44E76E6BA5088FF2709B92 /* CRRoute.h */; settings = {ATTRIBUTES = (Project, ); }; }; 9BAD5ACF176B485658B3570B51E021E6 /* CRMimeTypeHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 391CC18E3FF70470D5593E2EFFB368FC /* CRMimeTypeHelper.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9D1835E56DBC594998475C18DD6E60EA /* CRView.h in Headers */ = {isa = PBXBuildFile; fileRef = B1D2181CD2D3CA15D6E07CD363E374BD /* CRView.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9E16F1D1488CB987BDB0F89DFFF1B3F1 /* CRHTTPConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D6384D0C1986583CC9C4CFC035797E9 /* CRHTTPConnection.m */; }; - 9FCBA4BF43231B081AE123C33AEB5EFB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA92D24E0689574A4FCDC6E21C8DACC9 /* Cocoa.framework */; }; A17DE3D8316EA12AEB3923EC3F2CAC74 /* CRHTTPServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 2750C2A195E058B74CF32D9A16D6C11A /* CRHTTPServer.m */; }; A21A66624F17D24A1BF517527F00B5BA /* CRRouteMatchingResult_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = E5D4613C054307D215A3B8F111C033AE /* CRRouteMatchingResult_Internal.h */; settings = {ATTRIBUTES = (Project, ); }; }; A4D9EA549B622168485AC5F127ED80D7 /* CRFCGIServer.h in Headers */ = {isa = PBXBuildFile; fileRef = AB8F3950BD2C8FCB4BAE30E14A29AACA /* CRFCGIServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -65,7 +65,7 @@ A7869A70E29E14E7C5335F60EC9BEEE7 /* CRFCGIResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = C9CFE08CB04391AE7A47BB28431EC766 /* CRFCGIResponse.h */; settings = {ATTRIBUTES = (Project, ); }; }; A81F5BDCDA0B589F09B069AE236EC11F /* CRView.m in Sources */ = {isa = PBXBuildFile; fileRef = E5FF011791DB50F83996FBCB939083D7 /* CRView.m */; }; A882891E5A89CADF96C2CA79606409CA /* GCDAsyncSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = D15E00E67EC21A7EC208151356473824 /* GCDAsyncSocket.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A9FE96DA5A00065116C5ED189D1FB875 /* Pods-server_objc_criollo-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = E4AD0A805A281F236C2BB8EFA191814D /* Pods-server_objc_criollo-dummy.m */; }; + A9FE96DA5A00065116C5ED189D1FB875 /* Pods-server_objc_criollo-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 5197206142A6A70BF3A6CFDF0BCB47AD /* Pods-server_objc_criollo-dummy.m */; }; AC7DC2A21843CD99040DCD79FF3BE91B /* GCDAsyncUdpSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B66BF1727FD7254BB78CA4CD1CCA688 /* GCDAsyncUdpSocket.h */; settings = {ATTRIBUTES = (Public, ); }; }; AEE9644DA0EFCF945438E125BA4F0724 /* GCDAsyncUdpSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 90C259D2BCD31F1E1C9E99A1CFECA3E3 /* GCDAsyncUdpSocket.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0"; }; }; B037CF688B9935B16163659B5D9BFA0D /* CRFCGIResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = ACDAB6B550C29F91F274E4D3FD4E87F3 /* CRFCGIResponse.m */; }; @@ -75,21 +75,20 @@ B7D4FA77C60E9C229AC4987595D11DFC /* CRServerConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = DF941577A76E5C521E90140AAACB4C8D /* CRServerConfiguration.h */; settings = {ATTRIBUTES = (Project, ); }; }; B93374A5BD8F6FBEA10B40CB8456F203 /* CRResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = E4FFDC47C477C24694B6F6952F6C5DC4 /* CRResponse.m */; }; BBF00FE2A42157FDCA661A7F0AF2D974 /* CRHTTPServerConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = A5A5C9190F93651827C49208BF75D10A /* CRHTTPServerConfiguration.h */; settings = {ATTRIBUTES = (Project, ); }; }; - BF38B255C5D7C2A0E8DF82506FA52200 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA92D24E0689574A4FCDC6E21C8DACC9 /* Cocoa.framework */; }; C1532B1FE0F0F5DC467DAE276D1BB166 /* CRRequestRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A91EEE6D3DA80427F9F5008CBA6ECF5 /* CRRequestRange.h */; settings = {ATTRIBUTES = (Public, ); }; }; C395695927868358475BA7182683AAF1 /* CRHTTPServerConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = D914C0CF3AAA0B77BB40FBF661D0B424 /* CRHTTPServerConfiguration.m */; }; - C48AB028BF64F558C4671ADA227E9F40 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA92D24E0689574A4FCDC6E21C8DACC9 /* Cocoa.framework */; }; C6628506EDEA6FD65368FA8F006AEBC0 /* CRRequestRange.m in Sources */ = {isa = PBXBuildFile; fileRef = CBF7CF4C167CEB3FEF175AECA302B98E /* CRRequestRange.m */; }; C6F0C13AE9819DD4B83EE5368358CA94 /* CRRequestRange_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CFA492EE568F558F4ACD925E2EB0AF0 /* CRRequestRange_Internal.h */; settings = {ATTRIBUTES = (Project, ); }; }; - C97B7606A630ADBB8AA7CD0DB8CD2B4D /* Pods-server_objc_criollo-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = D10F1996FB0846258B6AE08C814B19EF /* Pods-server_objc_criollo-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C97B7606A630ADBB8AA7CD0DB8CD2B4D /* Pods-server_objc_criollo-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = D5683DCD2AC8E444B37C645AF1000FC8 /* Pods-server_objc_criollo-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; CAA4704D3C25823DB7A90F4A4F0DABB9 /* CRResponse_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = C89B9396836EFA159B6CFE576DBE6F27 /* CRResponse_Internal.h */; settings = {ATTRIBUTES = (Project, ); }; }; CE1068635BF8D44FB5C71B7D63B24598 /* CRRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = D046E9BB5FCF65516DAFF28A73B768F4 /* CRRequest.m */; }; CF2F1210EF9A6EE917B2381B25E6CB31 /* CRFCGIRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 62DE206631733F495904AD68D1D0B2CC /* CRFCGIRecord.m */; }; D420F68CF9642CC4BD8A5D68FF22130A /* CRFCGIServerConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BC17C3C4660273F8992B4D395714011 /* CRFCGIServerConfiguration.m */; }; D72C9D2EA0DCF142AB198975406E9DE0 /* Criollo.h in Headers */ = {isa = PBXBuildFile; fileRef = B64B03EED4CEAAB82C784CBF16EAE2D4 /* Criollo.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D74151E82696AE966F792828BB81DB6F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73E37E621B5C0AF1B632E81FE03991A3 /* Cocoa.framework */; }; DB9BFCFE6BD5042177A01F702FAEC292 /* CRRoute.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D2BE7C896AE4E678C1627DED8E0BD /* CRRoute.m */; }; DF25AA8A610872F8C6B14A6821AE6D4B /* CRConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 83104D7C2B4AA5AE2CDBEDD55044C6B1 /* CRConnection.m */; }; - E4230DB0D114C94B081018C1AC1E9972 /* CocoaAsyncSocket-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 39FDB2FCD3DBC88ABF0117B105C7DE78 /* CocoaAsyncSocket-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E4230DB0D114C94B081018C1AC1E9972 /* CocoaAsyncSocket-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BBBB063057E26D4BA1F00F7FAE73C5A /* CocoaAsyncSocket-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; E46C0E6F02964CBCB35141E0BF8D49FC /* CRRequest_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = AFF82CAF8A0C0C782C9150A686CCC8FD /* CRRequest_Internal.h */; settings = {ATTRIBUTES = (Project, ); }; }; E5491883389ECE37E08A6B1826D2781D /* CRFCGIConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = A0732BD944FEF01A365448CD2F14AE63 /* CRFCGIConnection.h */; settings = {ATTRIBUTES = (Project, ); }; }; E5D465C1E1BD57BF85B6200715B0001F /* CRStaticFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 55D55A09FB3E1995077A660A6EE905DE /* CRStaticFileManager.m */; }; @@ -100,6 +99,7 @@ F3AC8A3137630F88CF194F1BB4E446A7 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB767549C04C9A143FF82824BDF4F19E /* CocoaAsyncSocket.framework */; }; F7FCAA061C323276D5A7DCDAF4CE4668 /* NSString+Criollo.h in Headers */ = {isa = PBXBuildFile; fileRef = 77286777CEE3C13B27383403EEF22555 /* NSString+Criollo.h */; settings = {ATTRIBUTES = (Project, ); }; }; FC75395190949F349596D2362A210C49 /* CRApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = D385D6FD30BB083E9A6977F740A8861A /* CRApplication.m */; }; + FFA692069B5F985BE7590844ED9F4B05 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 207701D028065DFF4904944398D180A4 /* Security.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -127,103 +127,104 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 015F2D3D3961194BBD10E2188FFB8EE7 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; 0385E5A48868DEEB0C981A49C470107E /* CRApplication.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRApplication.h; path = Criollo/Source/CRApplication.h; sourceTree = ""; }; 0737866FB9E490DBBC28636404AE95A1 /* CRFCGIRecord.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRFCGIRecord.h; path = Criollo/Source/FCGI/CRFCGIRecord.h; sourceTree = ""; }; 0C09580D2CF4DC329CF7A69183AFA004 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = CocoaAsyncSocket.framework; path = CocoaAsyncSocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 0CFA492EE568F558F4ACD925E2EB0AF0 /* CRRequestRange_Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRRequestRange_Internal.h; path = Criollo/Source/CRRequestRange_Internal.h; sourceTree = ""; }; - 0F1D08A06DD7CCBC37FEDEFBA171589F /* Pods-server_objc_criollo-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-server_objc_criollo-acknowledgements.markdown"; sourceTree = ""; }; - 0F63AC02666F8AA39BCE732A00EA05E7 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 0F8617918B94D4548A77145725989C68 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 1157A0AEB2036C745F1A08AEB403AC81 /* Pods-server_objc_criollo.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-server_objc_criollo.modulemap"; sourceTree = ""; }; + 165FCC718819FDB12F8C3720F21DBDD4 /* CocoaAsyncSocket.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = CocoaAsyncSocket.xcconfig; sourceTree = ""; }; 172FBF30A8A6338D8AC05105A53D0CD5 /* CRRouteMatchingResult.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRRouteMatchingResult.m; path = Criollo/Source/Routing/CRRouteMatchingResult.m; sourceTree = ""; }; + 18C080648A84978B38A275A725D95BC5 /* Pods-server_objc_criollo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-server_objc_criollo.release.xcconfig"; sourceTree = ""; }; 19F0A85E8ADAA60D92BF074444FB8604 /* CRConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRConnection.h; path = Criollo/Source/CRConnection.h; sourceTree = ""; }; - 26D7734B672A8EDBAC9B07F50BA6E414 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; + 207701D028065DFF4904944398D180A4 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; 2750C2A195E058B74CF32D9A16D6C11A /* CRHTTPServer.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRHTTPServer.m; path = Criollo/Source/HTTP/CRHTTPServer.m; sourceTree = ""; }; 277711D161DD9841394B571390D954FF /* CRMessage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRMessage.h; path = Criollo/Source/CRMessage.h; sourceTree = ""; }; - 2A11396569971568D005B86A255B3F2C /* CocoaAsyncSocket-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "CocoaAsyncSocket-dummy.m"; sourceTree = ""; }; 2B66BF1727FD7254BB78CA4CD1CCA688 /* GCDAsyncUdpSocket.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GCDAsyncUdpSocket.h; path = Source/GCD/GCDAsyncUdpSocket.h; sourceTree = ""; }; - 3118E72E5CD11EDDF9926F837462BE28 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/CoreServices.framework; sourceTree = DEVELOPER_DIR; }; + 2F0D43F389075CF36D7E196E9B680E4D /* Pods-server_objc_criollo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-server_objc_criollo.debug.xcconfig"; sourceTree = ""; }; + 3606775BDB7DBE0ABA4777605B5C4557 /* Pods-server_objc_criollo.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-server_objc_criollo.modulemap"; sourceTree = ""; }; 391CC18E3FF70470D5593E2EFFB368FC /* CRMimeTypeHelper.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRMimeTypeHelper.h; path = Criollo/Source/CRMimeTypeHelper.h; sourceTree = ""; }; - 39FDB2FCD3DBC88ABF0117B105C7DE78 /* CocoaAsyncSocket-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CocoaAsyncSocket-umbrella.h"; sourceTree = ""; }; + 3A81DCDF8FC2467CB08B82BE34C3D0CF /* Criollo.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = Criollo.modulemap; sourceTree = ""; }; 3A930A941C8E40391190D0B5102D592B /* CRServer.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRServer.m; path = Criollo/Source/CRServer.m; sourceTree = ""; }; 3AB2A9A86E66215EC2B718A00C0E92CC /* CRRouter_Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRRouter_Internal.h; path = Criollo/Source/Routing/CRRouter_Internal.h; sourceTree = ""; }; - 407D8751EA6B4240A0C4A1E61CED7531 /* CocoaAsyncSocket.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = CocoaAsyncSocket.xcconfig; sourceTree = ""; }; 431C01FD74193C986954D0C5DC355640 /* CRFCGIConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRFCGIConnection.m; path = Criollo/Source/FCGI/CRFCGIConnection.m; sourceTree = ""; }; 45E4579BEDE4CE99CD181ACC8FCE42D3 /* NSHTTPCookie+Criollo.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSHTTPCookie+Criollo.h"; path = "Criollo/Source/Extensions/NSHTTPCookie+Criollo.h"; sourceTree = ""; }; 48F3575701449A3001DCAD6BB3486BD2 /* CRRouter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRRouter.h; path = Criollo/Source/Routing/CRRouter.h; sourceTree = ""; }; - 4959025A4676A2416E521009D6B16497 /* CocoaAsyncSocket-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CocoaAsyncSocket-prefix.pch"; sourceTree = ""; }; 4B4D2BE7C896AE4E678C1627DED8E0BD /* CRRoute.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRRoute.m; path = Criollo/Source/Routing/CRRoute.m; sourceTree = ""; }; 4C971835F86423A8B6992B3C311019A2 /* CRHTTPResponse.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRHTTPResponse.m; path = Criollo/Source/HTTP/CRHTTPResponse.m; sourceTree = ""; }; 4D6384D0C1986583CC9C4CFC035797E9 /* CRHTTPConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRHTTPConnection.m; path = Criollo/Source/HTTP/CRHTTPConnection.m; sourceTree = ""; }; + 5197206142A6A70BF3A6CFDF0BCB47AD /* Pods-server_objc_criollo-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-server_objc_criollo-dummy.m"; sourceTree = ""; }; 55D55A09FB3E1995077A660A6EE905DE /* CRStaticFileManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRStaticFileManager.m; path = Criollo/Source/CRStaticFileManager.m; sourceTree = ""; }; 5AAC0BBAE46E5C5121377A14D36F72CE /* CRStaticFileManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRStaticFileManager.h; path = Criollo/Source/CRStaticFileManager.h; sourceTree = ""; }; 5BC17C3C4660273F8992B4D395714011 /* CRFCGIServerConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRFCGIServerConfiguration.m; path = Criollo/Source/FCGI/CRFCGIServerConfiguration.m; sourceTree = ""; }; + 5DE7C25EF39229124A885D67337665B1 /* CocoaAsyncSocket-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "CocoaAsyncSocket-dummy.m"; sourceTree = ""; }; 61A082ED314BC0CF507B7942CCBA8EDF /* NSDate+RFC1123.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSDate+RFC1123.m"; path = "Criollo/Source/Extensions/NSDate+RFC1123.m"; sourceTree = ""; }; + 61CCE68473BE4A5FA46A1858AC815ECE /* Pods-server_objc_criollo-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-server_objc_criollo-acknowledgements.plist"; sourceTree = ""; }; 62DE206631733F495904AD68D1D0B2CC /* CRFCGIRecord.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRFCGIRecord.m; path = Criollo/Source/FCGI/CRFCGIRecord.m; sourceTree = ""; }; - 6446709EA70A2D45826913F1751C99E1 /* Pods-server_objc_criollo-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-server_objc_criollo-resources.sh"; sourceTree = ""; }; + 642CA34FB73ED2485F3B314F25A15335 /* Pods-server_objc_criollo-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-server_objc_criollo-resources.sh"; sourceTree = ""; }; 65AD684FFB8D65129A56AFACE6152D11 /* GCDAsyncSocket.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = GCDAsyncSocket.m; path = Source/GCD/GCDAsyncSocket.m; sourceTree = ""; }; - 69BB8852026FCCE551976FEAB78F10ED /* Criollo.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = Criollo.modulemap; sourceTree = ""; }; + 69943E23C4D3EAA8A21EC6396A31A921 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 726FB81797AB25AC77A7E6CE5D2E8123 /* CRRequest.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRRequest.h; path = Criollo/Source/CRRequest.h; sourceTree = ""; }; - 75D121653F14EFEC68879DCCB7572968 /* Pods-server_objc_criollo-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-server_objc_criollo-acknowledgements.plist"; sourceTree = ""; }; + 73E37E621B5C0AF1B632E81FE03991A3 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; }; 77286777CEE3C13B27383403EEF22555 /* NSString+Criollo.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSString+Criollo.h"; path = "Criollo/Source/Extensions/NSString+Criollo.h"; sourceTree = ""; }; + 7770EE04EEC90EC0B12699AC37450C52 /* Criollo-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Criollo-prefix.pch"; sourceTree = ""; }; 77AFC5D5D8186AD35140812F802FC2E5 /* CRHTTPConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRHTTPConnection.h; path = Criollo/Source/HTTP/CRHTTPConnection.h; sourceTree = ""; }; - 79171FEB35C1A41653F6BB433DBBF6B5 /* Criollo.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Criollo.xcconfig; sourceTree = ""; }; 7B42A67A51DC31457ED01D01849A2912 /* CRFCGIServerConfiguration.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRFCGIServerConfiguration.h; path = Criollo/Source/FCGI/CRFCGIServerConfiguration.h; sourceTree = ""; }; + 7BBBB063057E26D4BA1F00F7FAE73C5A /* CocoaAsyncSocket-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CocoaAsyncSocket-umbrella.h"; sourceTree = ""; }; 7C40A24F594216FDCEF3B5ED7509F220 /* CRStaticDirectoryManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRStaticDirectoryManager.m; path = Criollo/Source/CRStaticDirectoryManager.m; sourceTree = ""; }; 7CB20285B00BBBF8CE56A713795D8403 /* CRNib.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRNib.m; path = Criollo/Source/Routing/CRNib.m; sourceTree = ""; }; + 7F27540700B858AB501F83122499CB32 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks/CoreServices.framework; sourceTree = DEVELOPER_DIR; }; 7FAC114C4DFB184CB413895171437991 /* CRConnection_Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRConnection_Internal.h; path = Criollo/Source/CRConnection_Internal.h; sourceTree = ""; }; 7FF48AFCAA44E76E6BA5088FF2709B92 /* CRRoute.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRRoute.h; path = Criollo/Source/Routing/CRRoute.h; sourceTree = ""; }; 83104D7C2B4AA5AE2CDBEDD55044C6B1 /* CRConnection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRConnection.m; path = Criollo/Source/CRConnection.m; sourceTree = ""; }; + 8706408972FE1E8EA8BBAE509E2BF460 /* CocoaAsyncSocket.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = CocoaAsyncSocket.modulemap; sourceTree = ""; }; + 8A0AA9E08EACD735AE2F2A53A84A61CC /* CocoaAsyncSocket-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CocoaAsyncSocket-prefix.pch"; sourceTree = ""; }; 8A91EEE6D3DA80427F9F5008CBA6ECF5 /* CRRequestRange.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRRequestRange.h; path = Criollo/Source/CRRequestRange.h; sourceTree = ""; }; - 8B66ADE80F8AAB0D96B9DFB72214C380 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 8C0349C22466B02B2F1B9A4E14A8D6B4 /* Criollo-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Criollo-umbrella.h"; sourceTree = ""; }; 8C06B7AD3D7A356C401CAC1B79DD1DB9 /* CRUploadedFile.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRUploadedFile.h; path = Criollo/Source/CRUploadedFile.h; sourceTree = ""; }; - 8CA0F6C601992EB3A7353371AF92970A /* Pods-server_objc_criollo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-server_objc_criollo.debug.xcconfig"; sourceTree = ""; }; 8D29F3B98E60E955327E9D15E72D3353 /* CRFCGIRequest.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRFCGIRequest.m; path = Criollo/Source/FCGI/CRFCGIRequest.m; sourceTree = ""; }; - 8E1EA82EF6B55D89432C8ADAF7B2F0C4 /* Criollo-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Criollo-prefix.pch"; sourceTree = ""; }; 90C259D2BCD31F1E1C9E99A1CFECA3E3 /* GCDAsyncUdpSocket.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = GCDAsyncUdpSocket.m; path = Source/GCD/GCDAsyncUdpSocket.m; sourceTree = ""; }; - 925F414DD356C31C2AEF9231CE9E0AC8 /* Criollo-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Criollo-umbrella.h"; sourceTree = ""; }; - 92D02A1EE5C64D6D362F1C01D227B713 /* Pods-server_objc_criollo-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-server_objc_criollo-frameworks.sh"; sourceTree = ""; }; 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 96E21999363D9E2FE6A941F7D7792B84 /* CRServer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRServer.h; path = Criollo/Source/CRServer.h; sourceTree = ""; }; A0732BD944FEF01A365448CD2F14AE63 /* CRFCGIConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRFCGIConnection.h; path = Criollo/Source/FCGI/CRFCGIConnection.h; sourceTree = ""; }; + A0E03DEA4BDA76E0B65C54AA7AC28F6C /* Criollo.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Criollo.xcconfig; sourceTree = ""; }; A1D638A420C1B5172E9BBDC6F814F1D0 /* CRUploadedFile_Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRUploadedFile_Internal.h; path = Criollo/Source/CRUploadedFile_Internal.h; sourceTree = ""; }; A2316FFA2CF4E49F5F906F6A1F41D1CE /* CRStaticDirectoryManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRStaticDirectoryManager.h; path = Criollo/Source/CRStaticDirectoryManager.h; sourceTree = ""; }; A56CBB116298B7A2C836BB8E9AE6D0A3 /* CRViewController.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRViewController.m; path = Criollo/Source/Routing/CRViewController.m; sourceTree = ""; }; A5A5C9190F93651827C49208BF75D10A /* CRHTTPServerConfiguration.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRHTTPServerConfiguration.h; path = Criollo/Source/HTTP/CRHTTPServerConfiguration.h; sourceTree = ""; }; A5D1E4B363E5FE510C85C00744A3C5BC /* CRMessage.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRMessage.m; path = Criollo/Source/CRMessage.m; sourceTree = ""; }; + AABE59AF1CB9FDB97FAB2B21FA5A1271 /* Pods-server_objc_criollo-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-server_objc_criollo-acknowledgements.markdown"; sourceTree = ""; }; AB767549C04C9A143FF82824BDF4F19E /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CocoaAsyncSocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; AB8F3950BD2C8FCB4BAE30E14A29AACA /* CRFCGIServer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRFCGIServer.h; path = Criollo/Source/FCGI/CRFCGIServer.h; sourceTree = ""; }; ACDAB6B550C29F91F274E4D3FD4E87F3 /* CRFCGIResponse.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRFCGIResponse.m; path = Criollo/Source/FCGI/CRFCGIResponse.m; sourceTree = ""; }; - AD02D97521331184F100F44FCD30962A /* Criollo-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Criollo-dummy.m"; sourceTree = ""; }; + ADB6459DE982ACC4F3EE6F5975E40220 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; AFF82CAF8A0C0C782C9150A686CCC8FD /* CRRequest_Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRRequest_Internal.h; path = Criollo/Source/CRRequest_Internal.h; sourceTree = ""; }; B1D2181CD2D3CA15D6E07CD363E374BD /* CRView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRView.h; path = Criollo/Source/Routing/CRView.h; sourceTree = ""; }; B417B107C6A8ED3A2D20DF56CB491303 /* CRMimeTypeHelper.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRMimeTypeHelper.m; path = Criollo/Source/CRMimeTypeHelper.m; sourceTree = ""; }; B540A73A17ED4F64ADBDB9CFA5C39F74 /* NSString+Criollo.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSString+Criollo.m"; path = "Criollo/Source/Extensions/NSString+Criollo.m"; sourceTree = ""; }; B64B03EED4CEAAB82C784CBF16EAE2D4 /* Criollo.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Criollo.h; path = Criollo/Criollo.h; sourceTree = ""; }; B7000E7DC7C4DEAC9DD00E4180B48683 /* CRViewController.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRViewController.h; path = Criollo/Source/Routing/CRViewController.h; sourceTree = ""; }; + B781EDDA13DAF5CD65DA24C357D1CEE8 /* Pods-server_objc_criollo-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-server_objc_criollo-frameworks.sh"; sourceTree = ""; }; BA74F8D1E17FBFAEB6BBEE39B82BFBD6 /* CRTypes.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRTypes.h; path = Criollo/Source/CRTypes.h; sourceTree = ""; }; - BB2C6E1A1EA1BE782B95152DC3F08804 /* Pods-server_objc_criollo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-server_objc_criollo.release.xcconfig"; sourceTree = ""; }; BD209578C439D6DF56C7FF03F2578289 /* CRMessage_Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRMessage_Internal.h; path = Criollo/Source/CRMessage_Internal.h; sourceTree = ""; }; C11A65524C5B89615A94816AC06CFDD2 /* CRRouter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRRouter.m; path = Criollo/Source/Routing/CRRouter.m; sourceTree = ""; }; + C186447B5A2FCDE331D5B8DB3859536F /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; C89B9396836EFA159B6CFE576DBE6F27 /* CRResponse_Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRResponse_Internal.h; path = Criollo/Source/CRResponse_Internal.h; sourceTree = ""; }; C9CFE08CB04391AE7A47BB28431EC766 /* CRFCGIResponse.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRFCGIResponse.h; path = Criollo/Source/FCGI/CRFCGIResponse.h; sourceTree = ""; }; CBF7CF4C167CEB3FEF175AECA302B98E /* CRRequestRange.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRRequestRange.m; path = Criollo/Source/CRRequestRange.m; sourceTree = ""; }; D046E9BB5FCF65516DAFF28A73B768F4 /* CRRequest.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRRequest.m; path = Criollo/Source/CRRequest.m; sourceTree = ""; }; D10C8B662C091E14978504828AA11A30 /* CRFCGIRequest.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRFCGIRequest.h; path = Criollo/Source/FCGI/CRFCGIRequest.h; sourceTree = ""; }; - D10F1996FB0846258B6AE08C814B19EF /* Pods-server_objc_criollo-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-server_objc_criollo-umbrella.h"; sourceTree = ""; }; D15E00E67EC21A7EC208151356473824 /* GCDAsyncSocket.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GCDAsyncSocket.h; path = Source/GCD/GCDAsyncSocket.h; sourceTree = ""; }; D1973C7F5E208D06CD64247A4C660160 /* CRRouteController.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRRouteController.m; path = Criollo/Source/Routing/CRRouteController.m; sourceTree = ""; }; D1A88C842A523988F74C96D76BD5C49F /* Criollo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Criollo.framework; path = Criollo.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D362BB87B2FD6E2AC6935C5F2FEA4299 /* NSHTTPCookie+Criollo.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSHTTPCookie+Criollo.m"; path = "Criollo/Source/Extensions/NSHTTPCookie+Criollo.m"; sourceTree = ""; }; D385D6FD30BB083E9A6977F740A8861A /* CRApplication.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRApplication.m; path = Criollo/Source/CRApplication.m; sourceTree = ""; }; + D5683DCD2AC8E444B37C645AF1000FC8 /* Pods-server_objc_criollo-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-server_objc_criollo-umbrella.h"; sourceTree = ""; }; + D729F810D0091397B71D6D5088439541 /* Criollo-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Criollo-dummy.m"; sourceTree = ""; }; D74A9B8F0D618382ECF48AD99D2749BB /* CRHTTPServer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRHTTPServer.h; path = Criollo/Source/HTTP/CRHTTPServer.h; sourceTree = ""; }; D914C0CF3AAA0B77BB40FBF661D0B424 /* CRHTTPServerConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRHTTPServerConfiguration.m; path = Criollo/Source/HTTP/CRHTTPServerConfiguration.m; sourceTree = ""; }; - DA92D24E0689574A4FCDC6E21C8DACC9 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; }; DF941577A76E5C521E90140AAACB4C8D /* CRServerConfiguration.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRServerConfiguration.h; path = Criollo/Source/CRServerConfiguration.h; sourceTree = ""; }; + E396BDCC4DEC93233D1BF51446283523 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E41C9FCBFC3CBB7CA9BC4CE999A3B048 /* CRResponse.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRResponse.h; path = Criollo/Source/CRResponse.h; sourceTree = ""; }; E42EF4FEE06760B2AD0FD07124BED3DA /* CRServerConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRServerConfiguration.m; path = Criollo/Source/CRServerConfiguration.m; sourceTree = ""; }; - E4AD0A805A281F236C2BB8EFA191814D /* Pods-server_objc_criollo-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-server_objc_criollo-dummy.m"; sourceTree = ""; }; E4FFDC47C477C24694B6F6952F6C5DC4 /* CRResponse.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRResponse.m; path = Criollo/Source/CRResponse.m; sourceTree = ""; }; E5D4613C054307D215A3B8F111C033AE /* CRRouteMatchingResult_Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRRouteMatchingResult_Internal.h; path = Criollo/Source/Routing/CRRouteMatchingResult_Internal.h; sourceTree = ""; }; E5FF011791DB50F83996FBCB939083D7 /* CRView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRView.m; path = Criollo/Source/Routing/CRView.m; sourceTree = ""; }; @@ -235,7 +236,6 @@ F0074B739B7032C179CE1E24769E74DF /* CRRoute_Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRRoute_Internal.h; path = Criollo/Source/Routing/CRRoute_Internal.h; sourceTree = ""; }; F48F4C42D74050C109B1989089E174BC /* CRServer_Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRServer_Internal.h; path = Criollo/Source/CRServer_Internal.h; sourceTree = ""; }; F4D20B4440D4E2C5066109035971680C /* CRRouteController.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRRouteController.h; path = Criollo/Source/Routing/CRRouteController.h; sourceTree = ""; }; - F934FA71E114A0919C6403CF3C8795D4 /* CocoaAsyncSocket.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = CocoaAsyncSocket.modulemap; sourceTree = ""; }; FCF21F80EE5133892F31B0C4FDB63687 /* CRFCGIServer.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CRFCGIServer.m; path = Criollo/Source/FCGI/CRFCGIServer.m; sourceTree = ""; }; FE4EE0E0FF8E4312390FD531D10F3A20 /* CRRouteMatchingResult.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CRRouteMatchingResult.h; path = Criollo/Source/Routing/CRRouteMatchingResult.h; sourceTree = ""; }; /* End PBXFileReference section */ @@ -245,9 +245,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9FCBA4BF43231B081AE123C33AEB5EFB /* Cocoa.framework in Frameworks */, + 0E238323679E23EB14D5353A84C714E5 /* Cocoa.framework in Frameworks */, F3AC8A3137630F88CF194F1BB4E446A7 /* CocoaAsyncSocket.framework in Frameworks */, - 38BB1690CADE507168AF322686C545F0 /* Foundation.framework in Frameworks */, + 2363FCF530A1628F6F85AD3EAF15303C /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -255,9 +255,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C48AB028BF64F558C4671ADA227E9F40 /* Cocoa.framework in Frameworks */, - 781C271B7443AD52B0979D3732ACD05F /* CoreServices.framework in Frameworks */, - 3144345774E1197710DF187304F8C5F4 /* Security.framework in Frameworks */, + D74151E82696AE966F792828BB81DB6F /* Cocoa.framework in Frameworks */, + 0E29BFED3333BB3C8E6E97C9DBC90B00 /* CoreServices.framework in Frameworks */, + FFA692069B5F985BE7590844ED9F4B05 /* Security.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -265,13 +265,27 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - BF38B255C5D7C2A0E8DF82506FA52200 /* Cocoa.framework in Frameworks */, + 544E558615230C13688C13E8A8DF4038 /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 0BA667251E389ED8F25B7975ED12453B /* Support Files */ = { + isa = PBXGroup; + children = ( + 3A81DCDF8FC2467CB08B82BE34C3D0CF /* Criollo.modulemap */, + A0E03DEA4BDA76E0B65C54AA7AC28F6C /* Criollo.xcconfig */, + D729F810D0091397B71D6D5088439541 /* Criollo-dummy.m */, + 7770EE04EEC90EC0B12699AC37450C52 /* Criollo-prefix.pch */, + 8C0349C22466B02B2F1B9A4E14A8D6B4 /* Criollo-umbrella.h */, + 69943E23C4D3EAA8A21EC6396A31A921 /* Info.plist */, + ); + name = "Support Files"; + path = "../Target Support Files/Criollo"; + sourceTree = ""; + }; 18CF16E348F1885486D7274FD5300D80 /* Criollo */ = { isa = PBXGroup; children = ( @@ -351,12 +365,30 @@ D362BB87B2FD6E2AC6935C5F2FEA4299 /* NSHTTPCookie+Criollo.m */, 77286777CEE3C13B27383403EEF22555 /* NSString+Criollo.h */, B540A73A17ED4F64ADBDB9CFA5C39F74 /* NSString+Criollo.m */, - ED21183842F550F3EFAF0114ED3D69F5 /* Support Files */, + 0BA667251E389ED8F25B7975ED12453B /* Support Files */, ); name = Criollo; path = Criollo; sourceTree = ""; }; + 3B76F3F5765F04DCD89AD6F577AB00A2 /* Pods-server_objc_criollo */ = { + isa = PBXGroup; + children = ( + C186447B5A2FCDE331D5B8DB3859536F /* Info.plist */, + 3606775BDB7DBE0ABA4777605B5C4557 /* Pods-server_objc_criollo.modulemap */, + AABE59AF1CB9FDB97FAB2B21FA5A1271 /* Pods-server_objc_criollo-acknowledgements.markdown */, + 61CCE68473BE4A5FA46A1858AC815ECE /* Pods-server_objc_criollo-acknowledgements.plist */, + 5197206142A6A70BF3A6CFDF0BCB47AD /* Pods-server_objc_criollo-dummy.m */, + B781EDDA13DAF5CD65DA24C357D1CEE8 /* Pods-server_objc_criollo-frameworks.sh */, + 642CA34FB73ED2485F3B314F25A15335 /* Pods-server_objc_criollo-resources.sh */, + D5683DCD2AC8E444B37C645AF1000FC8 /* Pods-server_objc_criollo-umbrella.h */, + 2F0D43F389075CF36D7E196E9B680E4D /* Pods-server_objc_criollo.debug.xcconfig */, + 18C080648A84978B38A275A725D95BC5 /* Pods-server_objc_criollo.release.xcconfig */, + ); + name = "Pods-server_objc_criollo"; + path = "Target Support Files/Pods-server_objc_criollo"; + sourceTree = ""; + }; 5C8F1C5B58E8FC867D3C644054E374E3 /* CocoaAsyncSocket */ = { isa = PBXGroup; children = ( @@ -364,24 +396,21 @@ 65AD684FFB8D65129A56AFACE6152D11 /* GCDAsyncSocket.m */, 2B66BF1727FD7254BB78CA4CD1CCA688 /* GCDAsyncUdpSocket.h */, 90C259D2BCD31F1E1C9E99A1CFECA3E3 /* GCDAsyncUdpSocket.m */, - 74E6E421D562FEF133DF7BE7F9096969 /* Support Files */, + 9BB1EA45215BBF4D3AFB3A670AD047E7 /* Support Files */, ); name = CocoaAsyncSocket; path = CocoaAsyncSocket; sourceTree = ""; }; - 74E6E421D562FEF133DF7BE7F9096969 /* Support Files */ = { + 742420CB49D6A33A68BBDD80BDCB8EE4 /* OS X */ = { isa = PBXGroup; children = ( - F934FA71E114A0919C6403CF3C8795D4 /* CocoaAsyncSocket.modulemap */, - 407D8751EA6B4240A0C4A1E61CED7531 /* CocoaAsyncSocket.xcconfig */, - 2A11396569971568D005B86A255B3F2C /* CocoaAsyncSocket-dummy.m */, - 4959025A4676A2416E521009D6B16497 /* CocoaAsyncSocket-prefix.pch */, - 39FDB2FCD3DBC88ABF0117B105C7DE78 /* CocoaAsyncSocket-umbrella.h */, - 8B66ADE80F8AAB0D96B9DFB72214C380 /* Info.plist */, + 73E37E621B5C0AF1B632E81FE03991A3 /* Cocoa.framework */, + 7F27540700B858AB501F83122499CB32 /* CoreServices.framework */, + ADB6459DE982ACC4F3EE6F5975E40220 /* Foundation.framework */, + 207701D028065DFF4904944398D180A4 /* Security.framework */, ); - name = "Support Files"; - path = "../Target Support Files/CocoaAsyncSocket"; + name = "OS X"; sourceTree = ""; }; 7DB346D0F39D3F0E887471402A8071AB = { @@ -395,15 +424,18 @@ ); sourceTree = ""; }; - 7F12E059D603F05DBC37F6CBD6CA3113 /* OS X */ = { + 9BB1EA45215BBF4D3AFB3A670AD047E7 /* Support Files */ = { isa = PBXGroup; children = ( - DA92D24E0689574A4FCDC6E21C8DACC9 /* Cocoa.framework */, - 3118E72E5CD11EDDF9926F837462BE28 /* CoreServices.framework */, - 26D7734B672A8EDBAC9B07F50BA6E414 /* Foundation.framework */, - 015F2D3D3961194BBD10E2188FFB8EE7 /* Security.framework */, + 8706408972FE1E8EA8BBAE509E2BF460 /* CocoaAsyncSocket.modulemap */, + 165FCC718819FDB12F8C3720F21DBDD4 /* CocoaAsyncSocket.xcconfig */, + 5DE7C25EF39229124A885D67337665B1 /* CocoaAsyncSocket-dummy.m */, + 8A0AA9E08EACD735AE2F2A53A84A61CC /* CocoaAsyncSocket-prefix.pch */, + 7BBBB063057E26D4BA1F00F7FAE73C5A /* CocoaAsyncSocket-umbrella.h */, + E396BDCC4DEC93233D1BF51446283523 /* Info.plist */, ); - name = "OS X"; + name = "Support Files"; + path = "../Target Support Files/CocoaAsyncSocket"; sourceTree = ""; }; AF2182AC850E34E2AE8D42D076CDA8FA /* Products */ = { @@ -429,51 +461,19 @@ isa = PBXGroup; children = ( AB767549C04C9A143FF82824BDF4F19E /* CocoaAsyncSocket.framework */, - 7F12E059D603F05DBC37F6CBD6CA3113 /* OS X */, + 742420CB49D6A33A68BBDD80BDCB8EE4 /* OS X */, ); name = Frameworks; sourceTree = ""; }; - D8629CB1C1B9DC95A2FCDE832262CB8B /* Pods-server_objc_criollo */ = { - isa = PBXGroup; - children = ( - 0F8617918B94D4548A77145725989C68 /* Info.plist */, - 1157A0AEB2036C745F1A08AEB403AC81 /* Pods-server_objc_criollo.modulemap */, - 0F1D08A06DD7CCBC37FEDEFBA171589F /* Pods-server_objc_criollo-acknowledgements.markdown */, - 75D121653F14EFEC68879DCCB7572968 /* Pods-server_objc_criollo-acknowledgements.plist */, - E4AD0A805A281F236C2BB8EFA191814D /* Pods-server_objc_criollo-dummy.m */, - 92D02A1EE5C64D6D362F1C01D227B713 /* Pods-server_objc_criollo-frameworks.sh */, - 6446709EA70A2D45826913F1751C99E1 /* Pods-server_objc_criollo-resources.sh */, - D10F1996FB0846258B6AE08C814B19EF /* Pods-server_objc_criollo-umbrella.h */, - 8CA0F6C601992EB3A7353371AF92970A /* Pods-server_objc_criollo.debug.xcconfig */, - BB2C6E1A1EA1BE782B95152DC3F08804 /* Pods-server_objc_criollo.release.xcconfig */, - ); - name = "Pods-server_objc_criollo"; - path = "Target Support Files/Pods-server_objc_criollo"; - sourceTree = ""; - }; E92BD9C0B3B9E47BAD1ABE18FDA911D4 /* Targets Support Files */ = { isa = PBXGroup; children = ( - D8629CB1C1B9DC95A2FCDE832262CB8B /* Pods-server_objc_criollo */, + 3B76F3F5765F04DCD89AD6F577AB00A2 /* Pods-server_objc_criollo */, ); name = "Targets Support Files"; sourceTree = ""; }; - ED21183842F550F3EFAF0114ED3D69F5 /* Support Files */ = { - isa = PBXGroup; - children = ( - 69BB8852026FCCE551976FEAB78F10ED /* Criollo.modulemap */, - 79171FEB35C1A41653F6BB433DBBF6B5 /* Criollo.xcconfig */, - AD02D97521331184F100F44FCD30962A /* Criollo-dummy.m */, - 8E1EA82EF6B55D89432C8ADAF7B2F0C4 /* Criollo-prefix.pch */, - 925F414DD356C31C2AEF9231CE9E0AC8 /* Criollo-umbrella.h */, - 0F63AC02666F8AA39BCE732A00EA05E7 /* Info.plist */, - ); - name = "Support Files"; - path = "../Target Support Files/Criollo"; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -610,8 +610,8 @@ D41D8CD98F00B204E9800998ECF8427E /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0700; + LastSwiftUpdateCheck = 0930; + LastUpgradeCheck = 0930; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -715,40 +715,12 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 099B25CDD28D4EA3FEFD7C95651612A1 /* Debug */ = { + 0C55DC96AE87BF3E17C0CFF167F15DBF /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 79171FEB35C1A41653F6BB433DBBF6B5 /* Criollo.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/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"; - PRODUCT_NAME = Criollo; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 397AE6B104BBCCB6C880049A48ADC699 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = BB2C6E1A1EA1BE782B95152DC3F08804 /* Pods-server_objc_criollo.release.xcconfig */; + baseConfigurationReference = 2F0D43F389075CF36D7E196E9B680E4D /* Pods-server_objc_criollo.debug.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + CLANG_ENABLE_OBJC_WEAK = NO; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -770,17 +742,17 @@ OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_server_objc_criollo; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SDKROOT = macosx; SKIP_INSTALL = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; + name = Debug; }; - 797F9C7A2E7C1DEE2EAD7C9FBDE8E361 /* Release */ = { + 0CF21AD497F88C8AC02C24221050721A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 79171FEB35C1A41653F6BB433DBBF6B5 /* Criollo.xcconfig */; + baseConfigurationReference = A0E03DEA4BDA76E0B65C54AA7AC28F6C /* Criollo.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -799,6 +771,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.9; MODULEMAP_FILE = "Target Support Files/Criollo/Criollo.modulemap"; + PRODUCT_MODULE_NAME = Criollo; PRODUCT_NAME = Criollo; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -806,9 +779,9 @@ VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; + name = Debug; }; - 7A580D893249EFCBDBEA83EE658FEF8F /* Debug */ = { + 10E850B85F3451D5157989C3751F075F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -818,10 +791,12 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -829,6 +804,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -837,18 +813,16 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGNING_ALLOWED = NO; CODE_SIGNING_REQUIRED = NO; COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; 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", + "POD_CONFIGURATION_RELEASE=1", "$(inherited)", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -858,52 +832,16 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.10; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; + MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SYMROOT = "${SRCROOT}/../build"; }; - name = Debug; - }; - 9C361FEFE6FC93C24DA7680BAAB6D445 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 8CA0F6C601992EB3A7353371AF92970A /* Pods-server_objc_criollo.debug.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; - 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"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_server_objc_criollo; - SDKROOT = macosx; - SKIP_INSTALL = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; + name = Release; }; - 9F56A38FFE92BA9860F85B63998D945B /* Debug */ = { + C6116D07481E46CE230196588825293C /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 407D8751EA6B4240A0C4A1E61CED7531 /* CocoaAsyncSocket.xcconfig */; + baseConfigurationReference = 165FCC718819FDB12F8C3720F21DBDD4 /* CocoaAsyncSocket.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -922,6 +860,7 @@ 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_MODULE_NAME = CocoaAsyncSocket; PRODUCT_NAME = CocoaAsyncSocket; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -931,10 +870,12 @@ }; name = Debug; }; - D2FE8C89211A1EFD8EF552187D50B4D7 /* Release */ = { + CE6504F95E148A2594453C14F4C8CA5D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 407D8751EA6B4240A0C4A1E61CED7531 /* CocoaAsyncSocket.xcconfig */; + baseConfigurationReference = 18C080648A84978B38A275A725D95BC5 /* Pods-server_objc_criollo.release.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + CLANG_ENABLE_OBJC_WEAK = NO; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -946,22 +887,25 @@ 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"; + 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"; - MACOSX_DEPLOYMENT_TARGET = 10.7; - MODULEMAP_FILE = "Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket.modulemap"; - PRODUCT_NAME = CocoaAsyncSocket; + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.10; + MODULEMAP_FILE = "Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Release; }; - E8B0732F7D3E5BB15C212C29C806F741 /* Release */ = { + D5B651532ED11AFBC5E147B64848AFB4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -971,10 +915,12 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -982,6 +928,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -990,15 +937,19 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGNING_ALLOWED = NO; CODE_SIGNING_REQUIRED = NO; COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; + DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( - "POD_CONFIGURATION_RELEASE=1", + "POD_CONFIGURATION_DEBUG=1", + "DEBUG=1", "$(inherited)", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1008,12 +959,75 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.10; - MTL_ENABLE_DEBUG_INFO = NO; + 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; SYMROOT = "${SRCROOT}/../build"; }; + name = Debug; + }; + E9BD4B95773A7460BEF2AD614E294186 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = A0E03DEA4BDA76E0B65C54AA7AC28F6C /* Criollo.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/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"; + PRODUCT_MODULE_NAME = Criollo; + PRODUCT_NAME = Criollo; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + FCF35D14791B412A7DF6F04257AA45A8 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 165FCC718819FDB12F8C3720F21DBDD4 /* 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_MODULE_NAME = CocoaAsyncSocket; + PRODUCT_NAME = CocoaAsyncSocket; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; name = Release; }; /* End XCBuildConfiguration section */ @@ -1022,8 +1036,8 @@ 245EF526FCFC920732B8D602E8722780 /* Build configuration list for PBXNativeTarget "Criollo" */ = { isa = XCConfigurationList; buildConfigurations = ( - 099B25CDD28D4EA3FEFD7C95651612A1 /* Debug */, - 797F9C7A2E7C1DEE2EAD7C9FBDE8E361 /* Release */, + 0CF21AD497F88C8AC02C24221050721A /* Debug */, + E9BD4B95773A7460BEF2AD614E294186 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1031,8 +1045,8 @@ 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - 7A580D893249EFCBDBEA83EE658FEF8F /* Debug */, - E8B0732F7D3E5BB15C212C29C806F741 /* Release */, + D5B651532ED11AFBC5E147B64848AFB4 /* Debug */, + 10E850B85F3451D5157989C3751F075F /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1040,8 +1054,8 @@ 5A32E082D07EA83BBC792327C06B6900 /* Build configuration list for PBXNativeTarget "Pods-server_objc_criollo" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9C361FEFE6FC93C24DA7680BAAB6D445 /* Debug */, - 397AE6B104BBCCB6C880049A48ADC699 /* Release */, + 0C55DC96AE87BF3E17C0CFF167F15DBF /* Debug */, + CE6504F95E148A2594453C14F4C8CA5D /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1049,8 +1063,8 @@ F2A03B912F777B2BFB05E7B9E903B15F /* Build configuration list for PBXNativeTarget "CocoaAsyncSocket" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9F56A38FFE92BA9860F85B63998D945B /* Debug */, - D2FE8C89211A1EFD8EF552187D50B4D7 /* Release */, + C6116D07481E46CE230196588825293C /* Debug */, + FCF35D14791B412A7DF6F04257AA45A8 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/objc/criollo/Pods/Pods.xcodeproj/xcuserdata/taichiro.xcuserdatad/xcschemes/CocoaAsyncSocket.xcscheme b/objc/criollo/Pods/Pods.xcodeproj/xcuserdata/taichiro.xcuserdatad/xcschemes/CocoaAsyncSocket.xcscheme index 25f6cd1c6c6..3cd7177df67 100644 --- a/objc/criollo/Pods/Pods.xcodeproj/xcuserdata/taichiro.xcuserdatad/xcschemes/CocoaAsyncSocket.xcscheme +++ b/objc/criollo/Pods/Pods.xcodeproj/xcuserdata/taichiro.xcuserdatad/xcschemes/CocoaAsyncSocket.xcscheme @@ -1,6 +1,6 @@ + BuildableIdentifier = "primary" + BlueprintIdentifier = "AC0D2D2B4EE7C873431AB3502859CA60" + BlueprintName = "CocoaAsyncSocket" + ReferencedContainer = "container:Pods.xcodeproj" + BuildableName = "CocoaAsyncSocket.framework"> diff --git a/objc/criollo/Pods/Pods.xcodeproj/xcuserdata/taichiro.xcuserdatad/xcschemes/Criollo.xcscheme b/objc/criollo/Pods/Pods.xcodeproj/xcuserdata/taichiro.xcuserdatad/xcschemes/Criollo.xcscheme index 6e8c88d3005..5cad3fa3591 100644 --- a/objc/criollo/Pods/Pods.xcodeproj/xcuserdata/taichiro.xcuserdatad/xcschemes/Criollo.xcscheme +++ b/objc/criollo/Pods/Pods.xcodeproj/xcuserdata/taichiro.xcuserdatad/xcschemes/Criollo.xcscheme @@ -1,6 +1,6 @@ + BuildableIdentifier = "primary" + BlueprintIdentifier = "05D1A920F51C0C2B731CE47C0CCC5BAB" + BlueprintName = "Criollo" + ReferencedContainer = "container:Pods.xcodeproj" + BuildableName = "Criollo.framework"> diff --git a/objc/criollo/Pods/Pods.xcodeproj/xcuserdata/taichiro.xcuserdatad/xcschemes/Pods-server_objc_criollo.xcscheme b/objc/criollo/Pods/Pods.xcodeproj/xcuserdata/taichiro.xcuserdatad/xcschemes/Pods-server_objc_criollo.xcscheme index 6ef6a92f90e..201d8f51bc4 100644 --- a/objc/criollo/Pods/Pods.xcodeproj/xcuserdata/taichiro.xcuserdatad/xcschemes/Pods-server_objc_criollo.xcscheme +++ b/objc/criollo/Pods/Pods.xcodeproj/xcuserdata/taichiro.xcuserdatad/xcschemes/Pods-server_objc_criollo.xcscheme @@ -1,6 +1,6 @@ + BuildableIdentifier = "primary" + BlueprintIdentifier = "686F6BB36B96AD681CA800D78DC1EE5C" + BlueprintName = "Pods-server_objc_criollo" + ReferencedContainer = "container:Pods.xcodeproj" + BuildableName = "Pods-server_objc_criollo.framework"> diff --git a/objc/criollo/Pods/Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket.xcconfig b/objc/criollo/Pods/Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket.xcconfig index 4ca55fa9b1c..cbdfd697d24 100644 --- a/objc/criollo/Pods/Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket.xcconfig +++ b/objc/criollo/Pods/Target Support Files/CocoaAsyncSocket/CocoaAsyncSocket.xcconfig @@ -1,7 +1,6 @@ CODE_SIGN_IDENTITY = 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) diff --git a/objc/criollo/Pods/Target Support Files/Criollo/Criollo.xcconfig b/objc/criollo/Pods/Target Support Files/Criollo/Criollo.xcconfig index d9b8e7e7681..b1c1f6dc38f 100644 --- a/objc/criollo/Pods/Target Support Files/Criollo/Criollo.xcconfig +++ b/objc/criollo/Pods/Target Support Files/Criollo/Criollo.xcconfig @@ -2,7 +2,6 @@ CODE_SIGN_IDENTITY = 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) 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 d8d01b2aa9c..458c56c2664 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 @@ -1,9 +1,18 @@ #!/bin/sh set -e +set -u +set -o pipefail + +if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then + # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy + # frameworks to, so exit 0 (signalling the script phase was successful). + exit 0 +fi echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" +COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}" SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" # Used as a return value for each invocation of `strip_invalid_archs` function. @@ -92,10 +101,10 @@ install_dsym() { # Signs a framework with the provided identity code_sign_if_enabled() { - if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then + if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then # Use the current code_sign_identitiy echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'" + local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'" if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then code_sign_cmd="$code_sign_cmd &" diff --git a/objc/criollo/Pods/Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo-resources.sh b/objc/criollo/Pods/Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo-resources.sh index a7df4405b65..fe3f9c72891 100755 --- a/objc/criollo/Pods/Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo-resources.sh +++ b/objc/criollo/Pods/Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo-resources.sh @@ -1,5 +1,13 @@ #!/bin/sh set -e +set -u +set -o pipefail + +if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then + # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy + # resources to, so exit 0 (signalling the script phase was successful). + exit 0 +fi mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" @@ -12,7 +20,7 @@ XCASSET_FILES=() # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") -case "${TARGETED_DEVICE_FAMILY}" in +case "${TARGETED_DEVICE_FAMILY:-}" in 1,2) TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" ;; @@ -92,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then fi rm -f "$RESOURCES_TO_COPY" -if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] +if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ] then # Find all other xcassets (this unfortunately includes those of path pods and other targets). OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) @@ -102,5 +110,9 @@ then fi done <<<"$OTHER_XCASSETS" - printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + else + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_BUILD_DIR}/assetcatalog_generated_info.plist" + fi fi diff --git a/objc/criollo/server_objc_criollo.xcodeproj/project.pbxproj b/objc/criollo/server_objc_criollo.xcodeproj/project.pbxproj index 6cc49549a1f..b5c323ca051 100644 --- a/objc/criollo/server_objc_criollo.xcodeproj/project.pbxproj +++ b/objc/criollo/server_objc_criollo.xcodeproj/project.pbxproj @@ -93,7 +93,6 @@ 4A2A3B931FA1356000CEE70B /* Frameworks */, 4A2A3B941FA1356000CEE70B /* Resources */, 4EDA02DEC78827E2DA5D3FEB /* [CP] Embed Pods Frameworks */, - 9313CD7CF23EF813CC30138E /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -186,21 +185,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 9313CD7CF23EF813CC30138E /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-server_objc_criollo/Pods-server_objc_criollo-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/swift/kitura/Package.resolved b/swift/kitura/Package.resolved index 5076b08fad1..04d3a2f7d2e 100644 --- a/swift/kitura/Package.resolved +++ b/swift/kitura/Package.resolved @@ -2,75 +2,75 @@ "object": { "pins": [ { - "package": "CCurl", - "repositoryURL": "https://github.com/IBM-Swift/CCurl.git", + "package": "Socket", + "repositoryURL": "https://github.com/IBM-Swift/BlueSocket.git", "state": { "branch": null, - "revision": "f481bd86e58787824cc1c1ec1786e03b67831f38", - "version": "0.4.1" + "revision": "26c8f4e4e3000421a0c97aaf0c7b5e9aa5475222", + "version": "0.12.94" } }, { - "package": "Kitura", - "repositoryURL": "https://github.com/IBM-Swift/Kitura.git", + "package": "SSLService", + "repositoryURL": "https://github.com/IBM-Swift/BlueSSLService.git", "state": { "branch": null, - "revision": "e02c756134c5b399cfc45f186bc2c6f1d51032d1", - "version": "1.7.9" + "revision": "3a87b64a97fb8e923f52f2a68e31e7bd4fc46b42", + "version": "0.12.84" } }, { - "package": "Kitura-TemplateEngine", - "repositoryURL": "https://github.com/IBM-Swift/Kitura-TemplateEngine.git", + "package": "CCurl", + "repositoryURL": "https://github.com/IBM-Swift/CCurl.git", "state": { "branch": null, - "revision": "8e75a213bf4dd7b5effd03848335e344535969aa", - "version": "1.7.2" + "revision": "2a431e3a5fb8d004aa7d4d1bebb5d511f568c43e", + "version": "1.0.0" } }, { - "package": "Kitura-net", - "repositoryURL": "https://github.com/IBM-Swift/Kitura-net.git", + "package": "Kitura", + "repositoryURL": "https://github.com/IBM-Swift/Kitura.git", "state": { "branch": null, - "revision": "5b1b9b2463633f43f0e9fcee74c8360d6feb8d81", - "version": "1.7.16" + "revision": "30b8d3156a63e69bf5229c61f8c343cc909d3d68", + "version": "2.2.1" } }, { - "package": "LoggerAPI", - "repositoryURL": "https://github.com/IBM-Swift/LoggerAPI.git", + "package": "Kitura-net", + "repositoryURL": "https://github.com/IBM-Swift/Kitura-net.git", "state": { "branch": null, - "revision": "6b62fe66da9b8794d6581e5c341710eea3173cd4", - "version": "1.7.1" + "revision": "9b4221e7378f76e0c5e04acaf30cdee99594aed3", + "version": "2.0.4" } }, { - "package": "SSLService", - "repositoryURL": "https://github.com/IBM-Swift/BlueSSLService.git", + "package": "Kitura-TemplateEngine", + "repositoryURL": "https://github.com/IBM-Swift/Kitura-TemplateEngine.git", "state": { "branch": null, - "revision": "b4cac06a7860b7016ee968563812e9af3afe28e3", - "version": "0.12.57" + "revision": "d432d61cd9dfb66bc9741fec44434bbbcad676cd", + "version": "1.7.3" } }, { - "package": "Socket", - "repositoryURL": "https://github.com/IBM-Swift/BlueSocket.git", + "package": "KituraContracts", + "repositoryURL": "https://github.com/IBM-Swift/KituraContracts.git", "state": { "branch": null, - "revision": "d7d26f12e9614679423d4f7731de43597ae1e872", - "version": "0.12.70" + "revision": "8821f72962c369f4941bcd006437f966972ed53d", + "version": "0.0.20" } }, { - "package": "SwiftyJSON", - "repositoryURL": "https://github.com/IBM-Swift/SwiftyJSON.git", + "package": "LoggerAPI", + "repositoryURL": "https://github.com/IBM-Swift/LoggerAPI.git", "state": { "branch": null, - "revision": "1190845cf7d25a5c8ea7653fe03dcdd39a082056", - "version": "17.0.0" + "revision": "ee0084cbb8bace59b3409cec05bedc5d2e97f8b7", + "version": "1.7.2" } } ] diff --git a/swift/kitura/Package.swift b/swift/kitura/Package.swift index 0a56e2731df..b84b3fc1bec 100644 --- a/swift/kitura/Package.swift +++ b/swift/kitura/Package.swift @@ -5,6 +5,6 @@ import PackageDescription let package = Package( name: "server_swift_kitura", dependencies: [ - .Package(url: "https://github.com/IBM-Swift/Kitura.git", majorVersion: 1, minor: 7) + .Package(url: "https://github.com/IBM-Swift/Kitura.git", majorVersion: 2, minor: 2) ] ) diff --git a/swift/perfect/Package.resolved b/swift/perfect/Package.resolved index faa65aeec7a..5925d63dcdd 100644 --- a/swift/perfect/Package.resolved +++ b/swift/perfect/Package.resolved @@ -37,15 +37,6 @@ "version": "2.3.4" } }, - { - "package": "PerfectLib", - "repositoryURL": "https://github.com/PerfectlySoft/PerfectLib.git", - "state": { - "branch": null, - "revision": "e85a9ead840f80dfd85ca90627cf88cfb6e0cb59", - "version": "2.0.11" - } - }, { "package": "PerfectNet", "repositoryURL": "https://github.com/PerfectlySoft/Perfect-Net.git", @@ -63,6 +54,15 @@ "revision": "7d09e1830dd8e46b99c34a754a0bf4c2d567794e", "version": "2.0.12" } + }, + { + "package": "PerfectLib", + "repositoryURL": "https://github.com/PerfectlySoft/PerfectLib.git", + "state": { + "branch": null, + "revision": "e85a9ead840f80dfd85ca90627cf88cfb6e0cb59", + "version": "2.0.11" + } } ] }, diff --git a/swift/vapor/Package.resolved b/swift/vapor/Package.resolved index deeab5f393a..1c9b9564017 100644 --- a/swift/vapor/Package.resolved +++ b/swift/vapor/Package.resolved @@ -19,15 +19,6 @@ "version": "1.1.0" } }, - { - "package": "CTLS", - "repositoryURL": "https://github.com/vapor/ctls.git", - "state": { - "branch": null, - "revision": "fddec6a4643d6e85b6bb6dc54b1b5cdbabd395d2", - "version": "1.1.2" - } - }, { "package": "Console", "repositoryURL": "https://github.com/vapor/console.git", @@ -55,6 +46,15 @@ "version": "2.1.1" } }, + { + "package": "CTLS", + "repositoryURL": "https://github.com/vapor/ctls.git", + "state": { + "branch": null, + "revision": "fddec6a4643d6e85b6bb6dc54b1b5cdbabd395d2", + "version": "1.1.2" + } + }, { "package": "Debugging", "repositoryURL": "https://github.com/vapor/debugging.git", diff --git a/tools/src/benchmarker.cr b/tools/src/benchmarker.cr index 6279688ef00..d7db9bb9dcc 100644 --- a/tools/src/benchmarker.cr +++ b/tools/src/benchmarker.cr @@ -72,9 +72,6 @@ LANGS = [ {lang: "objc", targets: [ {name: "criollo", repo: "thecatalinstan/criollo"}, ]}, - {lang: "cpp", targets: [ - {name: "evhtp", repo: "criticalstack/libevhtp"}, - ]}, ] # struct for benchmark result