]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'master' into feature/cmake
authorAngus Gratton <angus@espressif.com>
Thu, 6 Sep 2018 12:23:04 +0000 (20:23 +0800)
committerAngus Gratton <gus@projectgus.com>
Thu, 6 Sep 2018 12:23:04 +0000 (20:23 +0800)
1  2 
.gitlab-ci.yml
components/lwip/CMakeLists.txt
docs/en/get-started/eclipse-setup-windows.rst
docs/zh_CN/get-started/eclipse-setup-windows.rst
examples/wifi/iperf/sdkconfig.defaults
tools/ci/executable-list.txt

diff --cc .gitlab-ci.yml
Simple merge
index 2d362f288cc17c480cdec3d0440475263fcb00b8,0000000000000000000000000000000000000000..45126db6550d011d4a8346275cefc44a38f1d04a
mode 100644,000000..100644
--- /dev/null
@@@ -1,41 -1,0 +1,37 @@@
-     include/lwip
-     include/lwip/port
-     include/lwip/posix
-     apps/ping
 +set(COMPONENT_ADD_INCLUDEDIRS
-     set(LWIP_PPP_DIRS netif/ppp/polarssl netif/ppp)
++    include/apps
++    lwip/src/include
++    port/esp32/include
++    port/esp32/include/arch
++    )
++
++set(COMPONENT_SRCDIRS
++    apps/dhcpserver
++      apps/ping
++      lwip/src/api
++      lwip/src/apps/sntp
++      lwip/src/core
++      lwip/src/core/ipv4
++      lwip/src/core/ipv6
++      lwip/src/netif
++      lwip/src/netif/ppp
++      port/esp32
++      port/esp32/freertos
++      port/esp32/netif
++      port/esp32/debug
 +    )
 +
 +if(CONFIG_PPP_SUPPORT)
- set(COMPONENT_SRCDIRS
-     api
-     apps apps/sntp apps/ping
-     core core/ipv4 core/ipv6
-     ${LWIP_PPP_DIRS} netif
-     port/freertos port/netif port/debug port)
++    list(APPEND COMPONENT_SRCDIRS
++        lwip/src/netif/ppp
++        lwip/src/netif/ppp/polarssl
++        )
 +endif()
 +
- # patch around warnings in third-party files
- set_source_files_properties(api/tcpip.c
-     PROPERTIES COMPILE_FLAGS
-     -Wno-unused-variable
-     )
- set_source_files_properties(core/pbuf.c core/tcp_in.c
-     PROPERTIES COMPILE_FLAGS
-     -Wno-unused-but-set-variable
-     )
- set_source_files_properties(apps/dhcpserver.c
-     PROPERTIES COMPILE_FLAGS
-     "-Wno-unused-variable -Wno-unused-but-set-variable -Wno-type-limits"
-     )
- set_source_files_properties(netif/ppp/pppos.c
-     PROPERTIES COMPILE_FLAGS
-     -Wno-type-limits)
 +set(COMPONENT_REQUIRES vfs)
 +set(COMPONENT_PRIV_REQUIRES ethernet tcpip_adapter)
 +
 +register_component()
 +
++# lots of LWIP source files evaluate macros that check address of stack variables
 +component_compile_options(-Wno-address)
index f084e4a675ebe37aaf22d87fffdc3374ab9a7a29,94b0ad2d9ead81d34da6400c3a41b09923f1883d..6c655bc5f9727fe84c808d929a3ebc2b5cc92045
@@@ -12,14 -12,14 +12,14 @@@ CONFIG_ESP32_WIFI_TX_BA_WIN=3
  CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
  CONFIG_ESP32_WIFI_RX_BA_WIN=32
  
 -CONFIG_FREERTOS_UNICORE=
 +CONFIG_FREERTOS_UNICORE=n
  CONFIG_FREERTOS_HZ=1000
  
 -CONFIG_INT_WDT=
 -CONFIG_TASK_WDT=
 +CONFIG_INT_WDT=n
 +CONFIG_TASK_WDT=n
  
- CONFIG_TCP_SND_BUF_DEFAULT=65535
- CONFIG_TCP_WND_DEFAULT=65535
+ CONFIG_TCP_SND_BUF_DEFAULT=65534
+ CONFIG_TCP_WND_DEFAULT=65534
  CONFIG_TCP_RECVMBOX_SIZE=64
  CONFIG_UDP_RECVMBOX_SIZE=64
  CONFIG_TCPIP_RECVMBOX_SIZE=64
index e240013c05b59677a833a5cac0372ebfd20d1270,4a43825f2654a23b721efcbc37f765f129bea1ff..fbb00ae8dedd10b8bf3543675b7b8ff0a98b96ae
@@@ -24,11 -22,9 +24,12 @@@ tools/ci/checkout_project_ref.p
  tools/ci/get-full-sources.sh
  tools/ci/mirror-submodule-update.sh
  tools/ci/mirror-synchronize.sh
+ tools/ci/push_to_github.sh
  tools/ci/test_build_system.sh
 +tools/ci/test_build_system_cmake.sh
  tools/ci/test_configure_ci_environment.sh
 +tools/cmake/convert_to_cmake.py
 +tools/cmake/run_cmake_lint.sh
  tools/esp_app_trace/apptrace_proc.py
  tools/esp_app_trace/logtrace_proc.py
  tools/format.sh
@@@ -62,4 -44,4 +63,5 @@@ tools/windows/tool_setup/build_installe
  tools/test_idf_size/test.sh
  tools/check_python_dependencies.py
  docs/gen-dxd.py
+ tools/ci/multirun_with_pyenv.sh
 +