Skip to content

Commit

Permalink
Merge branch 'release-1.0.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
catharanthus committed Aug 28, 2022
2 parents 299bdf3 + afc5529 commit 6365bde
Show file tree
Hide file tree
Showing 42 changed files with 4,896 additions and 391 deletions.
9 changes: 9 additions & 0 deletions doc/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
========================
SDM 1.0.6
------------------------
Released on 2022-08-28
========================

* removed unnecessarily complex features from the SDM channel FIFO API
* use linenoise-ng line editing library on Linux (can be disabled via a build option)

========================
SDM 1.0.5
------------------------
Expand Down
3 changes: 3 additions & 0 deletions doc/licenses/license.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,6 @@ directory.

* Lua: Copyright © 1994–2020 Lua.org, PUC-Rio.
* The Qt Toolkit: Copyright © 2015 The Qt Company Ltd.
* linenoise-ng: Copyright © 2010-2014, Salvatore Sanfilippo <antirez at
gmail dot com>, Copyright © 2010-2013, Pieter Noordhuis <pcnoordhuis at
gmail dot com>
66 changes: 66 additions & 0 deletions doc/licenses/linenoise/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
linenoise.cpp
=============

Copyright (c) 2010, Salvatore Sanfilippo <antirez at gmail dot com>
Copyright (c) 2010, Pieter Noordhuis <pcnoordhuis at gmail dot com>

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.
* Neither the name of Redis nor the names of its contributors may be used
to endorse or promote products derived from this software without
specific prior written permission.

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 OWNER 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.


wcwidth.cpp
===========

Markus Kuhn -- 2007-05-26 (Unicode 5.0)

Permission to use, copy, modify, and distribute this software
for any purpose and without fee is hereby granted. The author
disclaims all warranties with regard to this software.



ConvertUTF.cpp
==============

Copyright 2001-2004 Unicode, Inc.

Disclaimer

This source code is provided as is by Unicode, Inc. No claims are
made as to fitness for any particular purpose. No warranties of any
kind are expressed or implied. The recipient agrees to determine
applicability of information provided. If this file has been
purchased on magnetic or optical media from Unicode, Inc., the
sole remedy for any claim will be exchange of defective media
within 90 days of receipt.

Limitations on Rights to Redistribute This Code

Unicode, Inc. hereby grants the right to freely use the information
supplied in this file in the creation of products supporting the
Unicode Standard, and to make copies of this file in any form
for internal or external distribution as long as this notice
remains attached.
Binary file modified doc/manual.pdf
Binary file not shown.
9 changes: 9 additions & 0 deletions src/3rdparty/linenoise-ng/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Note: this file is NOT a part of the original Linenoise distribution

cmake_minimum_required(VERSION 3.3.0)

include(DisableWarningsFor3rdPartyCode)

add_library(linenoise STATIC linenoise.cpp ConvertUTF.cpp wcwidth.cpp)

target_include_directories(linenoise PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
Loading

0 comments on commit 6365bde

Please sign in to comment.