Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/.Wingetfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package 'cmake', path: 'Cmake\bin', bin: 'cmake'
package 'innosetup', path: 'Inno Setup 6', bin: 'iscc'
package 'OpenSSL', path: 'OpenSSL', bin: 'openssl', version: '3.6.2'
package 'OpenSSL', path: 'OpenSSL', bin: 'openssl'
package 'Microsoft.VisualStudio.Locator', path: 'vswhere', bin: 'vswhere'
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
[submodule "deps/asio"]
path = deps/asio
url = https://github.com/chriskohlhoff/asio.git
[submodule "deps/websocketpp"]
path = deps/websocketpp
url = https://github.com/zaphoyd/websocketpp.git
[submodule "deps/opencv"]
path = deps/opencv
url = https://github.com/opencv/opencv.git
Expand Down
4 changes: 4 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ repos:
rev: v0.6.13
hooks:
- id: cmake-format
exclude: |
(?x)^(
deps/.*
)$

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.3.2
Expand Down
1 change: 1 addition & 0 deletions build-aux/.run-format.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ invoke_formatter() {

local -a source_files=(**/(CMakeLists.txt|*.cmake)(.N))
source_files=(${source_files:#(build_*)/*})
source_files=(${source_files:#deps/*})

local -a format_args=()
if (( _loglevel > 2 )) format_args+=(--log-level debug)
Expand Down
2 changes: 1 addition & 1 deletion deps/asio
Submodule asio updated 2400 files
1 change: 0 additions & 1 deletion deps/websocketpp
Submodule websocketpp deleted from 56123c
18 changes: 18 additions & 0 deletions deps/websocketpp/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Lineendings
*.sln eol=crlf
*.vcproj eol=crlf
*.vcxproj* eol=crlf

# Whitespace rules
# strict (no trailing, no tabs)
*.cpp whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
*.hpp whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
*.c whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
*.h whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol

# normal (no trailing)
*.sql whitespace=trailing-space,space-before-tab,cr-at-eol
*.txt whitespace=trailing-space,space-before-tab,cr-at-eol

# special files which must ignore whitespace
*.patch whitespace=-trailing-space
94 changes: 94 additions & 0 deletions deps/websocketpp/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
# make .git* files visible to git
!.gitignore
!.gitattributes

.DS_Store

#vim stuff
*~
*.swp

*.o
*.so
*.so.?
*.so.?.?.?
*.a
*.dylib
lib/*

# CMake
*.cmake
*.dir
CMakeFiles
INSTALL.*
ZERO_CHECK.*
CMakeCache.txt
install_manifest.txt

# Windows/Visual Studio
*.vcproj*
*.sln
*.suo
*.ncb
*/Debug/*
*/*/Debug/*
bin/Debug
*/Release/*
*/*/Release/*
*/RelWithDebInfo/*
*/*/RelWithDebInfo/*

# explicitly allow this path with /debug/ in it
!websocketpp/transport/debug/*

objs_shared/
objs_static/

examples/chat_server/chat_server
examples/echo_server/echo_server
examples/chat_client/chat_client
examples/echo_client/echo_client
test/basic/tests
libwebsocketpp.dylib.0.1.0

websocketpp.xcodeproj/xcuserdata/*
websocketpp.xcodeproj/project.xcworkspace/xcuserdata/*
policy_based_notes.hpp

examples/echo_server_tls/echo_server_tls

examples/fuzzing_client/fuzzing_client

examples/stress_client/stress_client

examples/broadcast_server_tls/broadcast_server

test/basic/perf

examples/echo_server_tls/echo_server_tls

examples/concurrent_server/concurrent_server

examples/fuzzing_server_tls/fuzzing_server

examples/wsperf/wsperf

.sconsign.dblite

build/
doxygen/
examples/wsperf/wsperf_client

*.out

*.log
*.opensdf
*.sdf
*.vcxproj
*.vcxproj.filters
*.user
install
Makefile
bin

Testing/Temporary/CTestCostData.txt
21 changes: 21 additions & 0 deletions deps/websocketpp/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
language: cpp
compiler:
- gcc
before_install:
#- sudo apt-get install libboost-chrono1.48-dev libboost-regex1.48-dev libboost-system1.48-dev libboost-thread1.48-dev libboost-test1.48-dev libboost-random1.48-dev -y
- sudo add-apt-repository -y ppa:boost-latest/ppa && sudo apt-get update -q && sudo apt-get install -y libboost-chrono1.55-dev libboost-random1.55-dev libboost-regex1.55-dev libboost-system1.55-dev libboost-thread1.55-dev libboost-test1.55-dev
env:
global:
- BOOST_INCLUDES=/usr/include
- BOOST_LIBS=/usr/lib/x86_64-linux-gnu
script: scons -j 2 && scons test
branches:
only:
- master
- develop
notifications:
recipients:
- travis@zaphoyd.com
email:
on_success: change
on_failure: always
Loading
Loading