clean up top level of project

This commit is contained in:
Andy Green 2017-09-22 09:46:58 +08:00
parent 66a402cc96
commit 4f267c515e
84 changed files with 57 additions and 125 deletions

View file

@ -21,7 +21,7 @@ os:
- osx
language: generic
install:
- ./travis_install.sh
- ./scripts/travis_install.sh
script:
- if [ "$COVERITY_SCAN_BRANCH" != 1 -a "$TRAVIS_OS_NAME" = "osx" ]; then mkdir build && cd build && cmake -DOPENSSL_ROOT_DIR="/usr/local/opt/openssl" $CMAKE_ARGS .. && cmake --build .; else if [ "$COVERITY_SCAN_BRANCH" != 1 -a "$TRAVIS_OS_NAME" = "linux" ]; then mkdir build && cd build && cmake $CMAKE_ARGS .. && cmake --build .; fi ; fi
sudo: required

View file

@ -1158,12 +1158,12 @@ endif()
set(CMAKE_REQUIRED_LIBRARIES ${temp})
# Generate the lws_config.h that includes all the public compilation settings.
configure_file(
"${PROJECT_SOURCE_DIR}/lws_config.h.in"
"${PROJECT_SOURCE_DIR}/cmake/lws_config.h.in"
"${PROJECT_BINARY_DIR}/lws_config.h")
# Generate the lws_config.h that includes all the private compilation settings.
configure_file(
"${PROJECT_SOURCE_DIR}/lws_config_private.h.in"
"${PROJECT_SOURCE_DIR}/cmake/lws_config_private.h.in"
"${PROJECT_BINARY_DIR}/lws_config_private.h")
# Generate self-signed SSL certs for the test-server.
@ -1349,14 +1349,14 @@ if (NOT LWS_WITHOUT_TESTAPPS)
# test-server
#
if (NOT LWS_WITHOUT_TEST_SERVER)
create_test_app(test-server "test-server/test-server.c"
"test-server/test-server-http.c"
"test-server/test-server-dumb-increment.c"
create_test_app(test-server "test-apps/test-server.c"
"test-apps/test-server-http.c"
"test-apps/test-server-dumb-increment.c"
""
""
"")
if (UNIX)
create_test_app(test-fuzxy "test-server/fuzxy.c"
create_test_app(test-fuzxy "test-apps/fuzxy.c"
""
""
""
@ -1365,9 +1365,9 @@ if (NOT LWS_WITHOUT_TESTAPPS)
endif()
if (UNIX AND NOT ((CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) AND LWS_MAX_SMP GREATER 1)
create_test_app(test-server-pthreads
"test-server/test-server-pthreads.c"
"test-server/test-server-http.c"
"test-server/test-server-dumb-increment.c"
"test-apps/test-server-pthreads.c"
"test-apps/test-server-http.c"
"test-apps/test-server-dumb-increment.c"
""
""
"")
@ -1375,20 +1375,20 @@ if (NOT LWS_WITHOUT_TESTAPPS)
if (NOT ((CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
AND LWS_WITH_LIBEV)
create_test_app(test-server-libev
"test-server/test-server-libev.c"
"test-server/test-server-http.c"
"test-server/test-server-dumb-increment.c"
"test-apps/test-server-libev.c"
"test-apps/test-server-http.c"
"test-apps/test-server-dumb-increment.c"
""
""
"")
# libev generates a big mess of warnings with gcc, maintainers blame gcc
set_source_files_properties( test-server/test-server-libev.c PROPERTIES COMPILE_FLAGS "-Wno-error" )
set_source_files_properties( test-apps/test-server-libev.c PROPERTIES COMPILE_FLAGS "-Wno-error" )
endif()
if (NOT ((CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
AND LWS_WITH_LIBUV)
create_test_app(test-server-libuv
"test-server/test-server-libuv.c"
"test-server/test-server-http.c"
"test-apps/test-server-libuv.c"
"test-apps/test-server-http.c"
""
""
""
@ -1397,9 +1397,9 @@ if (NOT LWS_WITHOUT_TESTAPPS)
if (NOT ((CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
AND LWS_WITH_LIBEVENT)
create_test_app(test-server-libevent
"test-server/test-server-libevent.c"
"test-server/test-server-http.c"
"test-server/test-server-dumb-increment.c"
"test-apps/test-server-libevent.c"
"test-apps/test-server-http.c"
"test-apps/test-server-dumb-increment.c"
""
""
"")
@ -1410,9 +1410,9 @@ if (NOT LWS_WITHOUT_TESTAPPS)
# test-server-extpoll
#
if (NOT LWS_WITHOUT_TEST_SERVER_EXTPOLL)
create_test_app(test-server-extpoll "test-server/test-server.c"
"test-server/test-server-http.c"
"test-server/test-server-dumb-increment.c"
create_test_app(test-server-extpoll "test-apps/test-server.c"
"test-apps/test-server-http.c"
"test-apps/test-server-dumb-increment.c"
""
""
"")
@ -1436,7 +1436,7 @@ if (NOT LWS_WITHOUT_TESTAPPS)
if (LWS_WITH_PLUGINS)
create_test_app(
test-server-v2.0
"test-server/test-server-v2.0.c"
"test-apps/test-server-v2.0.c"
""
""
""
@ -1446,12 +1446,12 @@ if (NOT LWS_WITHOUT_TESTAPPS)
# Data files for running the test server.
set(TEST_SERVER_DATA
"${PROJECT_SOURCE_DIR}/test-server/favicon.ico"
"${PROJECT_SOURCE_DIR}/test-server/leaf.jpg"
"${PROJECT_SOURCE_DIR}/test-server/candide.zip"
"${PROJECT_SOURCE_DIR}/test-server/libwebsockets.org-logo.png"
"${PROJECT_SOURCE_DIR}/test-server/lws-common.js"
"${PROJECT_SOURCE_DIR}/test-server/test.html")
"${PROJECT_SOURCE_DIR}/test-apps/favicon.ico"
"${PROJECT_SOURCE_DIR}/test-apps/leaf.jpg"
"${PROJECT_SOURCE_DIR}/test-apps/candide.zip"
"${PROJECT_SOURCE_DIR}/test-apps/libwebsockets.org-logo.png"
"${PROJECT_SOURCE_DIR}/test-apps/lws-common.js"
"${PROJECT_SOURCE_DIR}/test-apps/test.html")
add_custom_command(TARGET test-server
POST_BUILD
@ -1473,27 +1473,27 @@ if (NOT LWS_WITHOUT_TESTAPPS)
# test-client
#
if (NOT LWS_WITHOUT_TEST_CLIENT)
create_test_app(test-client "test-server/test-client.c" "" "" "" "" "")
create_test_app(test-client "test-apps/test-client.c" "" "" "" "" "")
endif()
#
# test-fraggle
#
if (NOT LWS_WITHOUT_TEST_FRAGGLE)
create_test_app(test-fraggle "test-server/test-fraggle.c" "" "" "" "" "")
create_test_app(test-fraggle "test-apps/test-fraggle.c" "" "" "" "" "")
endif()
#
# test-ping
#
if (NOT LWS_WITHOUT_TEST_PING)
create_test_app(test-ping "test-server/test-ping.c" "" "" "" "" "")
create_test_app(test-ping "test-apps/test-ping.c" "" "" "" "" "")
endif()
#
# test-echo
#
if (NOT LWS_WITHOUT_TEST_ECHO)
create_test_app(test-echo "test-server/test-echo.c" "" "" "" "" "")
create_test_app(test-echo "test-apps/test-echo.c" "" "" "" "" "")
endif()
endif(NOT LWS_WITHOUT_CLIENT)
@ -1782,11 +1782,11 @@ if (NOT LWS_WITHOUT_TESTAPPS AND NOT LWS_WITHOUT_SERVER)
DESTINATION share/libwebsockets-test-server
COMPONENT examples)
install(FILES "${PROJECT_SOURCE_DIR}/test-server/private/index.html"
install(FILES "${PROJECT_SOURCE_DIR}/test-apps/private/index.html"
DESTINATION share/libwebsockets-test-server/private
COMPONENT examples)
if (LWS_WITH_CGI)
set(CGI_TEST_SCRIPT "${PROJECT_SOURCE_DIR}/test-server/lws-cgi-test.sh")
set(CGI_TEST_SCRIPT "${PROJECT_SOURCE_DIR}/test-apps/lws-cgi-test.sh")
install(FILES ${CGI_TEST_SCRIPT}
PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE OWNER_READ GROUP_READ WORLD_READ
DESTINATION share/libwebsockets-test-server
@ -1857,7 +1857,7 @@ add_custom_target(dist COMMAND "${CMAKE_MAKE_PROGRAM}" package_source)
include(UseRPMTools)
if (RPMTools_FOUND)
RPMTools_ADD_RPM_TARGETS(libwebsockets libwebsockets.spec)
RPMTools_ADD_RPM_TARGETS(libwebsockets scripts/libwebsockets.spec)
endif()
message("---------------------------------------------------------------------")

View file

@ -45,8 +45,8 @@ Relicensed to libwebsocket license
Public Domain (CC-zero) to simplify reuse
- test-server/*.c
- test-server/*.h
- test-apps/*.c
- test-apps/*.h
- lwsws/*
------ end of exceptions

View file

@ -8,6 +8,8 @@ libwebsockets
News
----
Please note the additional READMEs have moved to ./READMEs/
v2.3 is out... see the changelog https://github.com/warmcat/libwebsockets/blob/v2.3-stable/changelog
ESP32 is now supported in lws! Download the

View file

@ -305,7 +305,7 @@ The library is ready for use by C++ apps. You can get started quickly by
copying the test server
```
$ cp test-server/test-server.c test.cpp
$ cp test-apps/test-server.c test.cpp
```
and building it in C++ like this
@ -405,7 +405,7 @@ other reasons, if any of that happens you'll get a
After attempting the connection and getting back a non-`NULL` `wsi` you should
loop calling `lws_service()` until one of the above callbacks occurs.
As usual, see [test-client.c](test-server/test-client.c) for example code.
As usual, see [test-client.c](test-apps/test-client.c) for example code.
Notice that the client connection api tries to progress the connection
somewhat before returning. That means it's possible to get callbacks like

View file

@ -2,7 +2,7 @@ Overview of lws test apps
=========================
Are you building a client? You just need to look at the test client
[libwebsockets-test-client](test-server/test-client.c).
[libwebsockets-test-client](test-apps/test-client.c).
If you are building a standalone server, there are three choices, in order of
preferability.
@ -32,7 +32,7 @@ Plugins are still used, which implies libuv needed.
$ cmake .. -DLWS_WITH_PLUGINS=1
See [test-server-v2.0.c](test-server/test-server-v2.0.c)
See [test-server-v2.0.c](test-apps/test-server-v2.0.c)
3) protocols in the server app
@ -49,7 +49,7 @@ Notes about lws test apps
@section tsb Testing server with a browser
If you run [libwebsockets-test-server](test-server/test-server.c) and point your browser
If you run [libwebsockets-test-server](test-apps/test-server.c) and point your browser
(eg, Chrome) to
http://127.0.0.1:7681
@ -100,7 +100,7 @@ certificates in the browser and the connection will proceed
in first https and then websocket wss, acting exactly the
same.
[test-server.c](test-server/test-server.c) is all that is needed to use libwebsockets for
[test-server.c](test-apps/test-server.c) is all that is needed to use libwebsockets for
serving both the script html over http and websockets.
@section lwstsdynvhost Dynamic Vhosts

View file

@ -18,12 +18,12 @@ Release Checklist
e) attack.sh
$ ./test-server/attack.sh
$ ./test-apps/attack.sh
f) Autobahn
$ wstest -m fuzzingserver &
$ ./autobahn-test.sh
$ ./scripts/autobahn-test.sh
Force update by browser using agent "libwebsockets"
http://localhost:8080/test_browser.html
@ -42,7 +42,7 @@ Release Checklist
set(SOVERSION "6")
libwebsockets.spec
scripts/libwebsockets.spec
-/%{_libdir}/libwebsockets.so.6
+/%{_libdir}/libwebsockets.so.7
@ -69,29 +69,24 @@ Release Checklist
a) rpm version bump to match CMake one
libwebsockets.spec
scripts/libwebsockets.spec
Version: 1.6.0
b) Summarize changelog
libwebsockets.spec
scripts/libwebsockets.spec
%changelog
* Sun Jan 17 2016 Andrew Cooks <acooks@linux.com> 1.6.4-1
- Bump version to 1.6.4
- MINOR fix xyz
6) update api docs
$ cmake ..
$ cp doc/* ..
7) signed tag
6) signed tag
git tag -s vX.Y[.Z]
8) git
7) git
a) push

View file

@ -21,9 +21,6 @@ install:
- mkdir c:\assets
- mkdir c:\assets\libuv
- 7z x -oc:\assets\libuv win-libuv.zip
# - appveyor DownloadFile https://slproweb.com/download/Win32OpenSSL-1_0_2h.exe
# - appveyor DownloadFile https://libwebsockets.org:444/Win32OpenSSL-1_0_2L.exe
# - Win32OpenSSL-1_0_2L.exe /silent /verysilent /sp- /suppressmsgboxes
- appveyor DownloadFile https://libwebsockets.org:444/nsis-3.0rc1-setup.exe
- cmd /c start /wait nsis-3.0rc1-setup.exe /S /D=C:\nsis
- appveyor DownloadFile https://libwebsockets.org:444/sqlite-dll-win32-x86-3130000.zip
@ -38,21 +35,13 @@ build_script:
- cmake -DCMAKE_BUILD_TYPE=Release %CMAKE_ARGS% ..
- cmake --build . --config Release
# TODO: Keeps breaking Windows build, should be rewritten using CPack properly instead...
after_build:
- 7z a lws.zip %APPVEYOR_BUILD_FOLDER%\build\lib\Release\websockets.lib %APPVEYOR_BUILD_FOLDER%\build\lib\Release\websockets.exp %APPVEYOR_BUILD_FOLDER%\build\bin\Release\websockets.dll %APPVEYOR_BUILD_FOLDER%\lib\libwebsockets.h %APPVEYOR_BUILD_FOLDER%\build\lws_config.h %APPVEYOR_BUILD_FOLDER%\build\bin\Release\*.exe
# - cd ..
# - cd win32port
# - makensis -DVERSION=%APPVEYOR_BUILD_VERSION% libwebsockets.nsi
artifacts:
- path: lws.zip
name: lws.zip
type: Zip
#cache:
# - C:\OpenSSL-Win32
matrix:
fast_finish: true

View file

@ -1,5 +1,5 @@
COMPONENT_DEPENDS:=mbedtls openssl
COMPONENT_ADD_INCLUDEDIRS := ../../../../../../../../../../../../../../../../../../$(COMPONENT_BUILD_DIR)/include
COMPONENT_ADD_INCLUDEDIRS := ../../../../../../../../../../../../../../../../../../../../$(COMPONENT_BUILD_DIR)/include
COMPONENT_OWNBUILDTARGET:= 1
@ -23,7 +23,7 @@ build:
-DIDF_PATH=$(IDF_PATH) \
-DCROSS_PATH=$(CROSS_PATH) \
-DBUILD_DIR_BASE=$(BUILD_DIR_BASE) \
-DCMAKE_TOOLCHAIN_FILE=$(COMPONENT_PATH)/cross-esp32.cmake \
-DCMAKE_TOOLCHAIN_FILE=$(COMPONENT_PATH)/contrib/cross-esp32.cmake \
-DCMAKE_BUILD_TYPE=RELEASE \
-DLWS_MBEDTLS_INCLUDE_DIRS="${IDF_PATH}/components/openssl/include;${IDF_PATH}/components/mbedtls/include;${IDF_PATH}/components/mbedtls/port/include" \
-DLWS_WITH_STATS=0 \

View file

@ -7,7 +7,7 @@ DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = "libwebsockets"
PROJECT_NUMBER =
PROJECT_BRIEF = "Lightweight C library for HTML5 websockets"
PROJECT_LOGO = "./test-server/libwebsockets.org-logo.png"
PROJECT_LOGO = "./test-apps/libwebsockets.org-logo.png"
OUTPUT_DIRECTORY = "doc"
CREATE_SUBDIRS = NO
ALLOW_UNICODE_NAMES = NO
@ -101,7 +101,7 @@ WARN_LOGFILE =
#---------------------------------------------------------------------------
# Configuration options related to the input files
#---------------------------------------------------------------------------
INPUT = lib/libwebsockets.h mainpage.md README.build.md README.problems.md README.lwsws.md README.coding.md README.generic-sessions.md README.generic-table.md README.test-apps.md doc-assets
INPUT = lib/libwebsockets.h mainpage.md README.build.md README.problems.md README.lwsws.md README.coding.md README.generic-sessions.md README.generic-table.md README.test-apps.md README.lws-meta.md doc-assets
INPUT_ENCODING = UTF-8
FILE_PATTERNS = lib/*.c *.md *.png
RECURSIVE = NO

View file

@ -1,21 +0,0 @@
{
"name": "websockets",
"version": "1.6.0",
"description": "Libwebsockets",
"keywords": [
"lws",
"libwebsockets",
"websockets",
"ws"
],
"author": "Andy Green <andy@warmcat.com>",
"homepage": "https://libwebsockets.org",
"license": "LGPL2.1-SLE",
"extraIncludes": [ "build/frdm-k64f-gcc/generated/include" ],
"dependencies": {
"mbed-drivers": "",
"sal-stack-lwip": "",
"sockets": ""
}
}

View file

@ -1,33 +0,0 @@
# This module tries to find libWebsockets library and include files
#
# LIBWEBSOCKETS_INCLUDE_DIR, path where to find libwebsockets.h
# LIBWEBSOCKETS_LIBRARY_DIR, path where to find libwebsockets.so
# LIBWEBSOCKETS_LIBRARIES, the library to link against
# LIBWEBSOCKETS_FOUND, If false, do not try to use libWebSockets
#
# This currently works probably only for Linux
FIND_PATH ( LIBWEBSOCKETS_INCLUDE_DIR libwebsockets.h
/usr/local/include
/usr/include
)
FIND_LIBRARY ( LIBWEBSOCKETS_LIBRARIES websockets
/usr/local/lib
/usr/lib
)
GET_FILENAME_COMPONENT( LIBWEBSOCKETS_LIBRARY_DIR ${LIBWEBSOCKETS_LIBRARIES} PATH )
SET ( LIBWEBSOCKETS_FOUND "NO" )
IF ( LIBWEBSOCKETS_INCLUDE_DIR )
IF ( LIBWEBSOCKETS_LIBRARIES )
SET ( LIBWEBSOCKETS_FOUND "YES" )
ENDIF ( LIBWEBSOCKETS_LIBRARIES )
ENDIF ( LIBWEBSOCKETS_INCLUDE_DIR )
MARK_AS_ADVANCED(
LIBWEBSOCKETS_LIBRARY_DIR
LIBWEBSOCKETS_INCLUDE_DIR
LIBWEBSOCKETS_LIBRARIES
)

View file

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

View file

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View file

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View file

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

View file

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

View file

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View file

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View file

Before

Width:  |  Height:  |  Size: 2.4 MiB

After

Width:  |  Height:  |  Size: 2.4 MiB

View file

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB