Skip to content

Commit

Permalink
Replace old gsh code with new version
Browse files Browse the repository at this point in the history
Looking like we're pretty much a parity, with the new ability to show rt
command's textual output without hanging.  Needs more testing,
particularly on Windows.
  • Loading branch information
starseeker committed Oct 30, 2024
1 parent 802c309 commit 8e1910f
Show file tree
Hide file tree
Showing 6 changed files with 120 additions and 515 deletions.
1 change: 1 addition & 0 deletions doc/legal/embedded/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ brlcad_manage_files(hv3_snit.txt ${DOC_DIR}/legal/embedded TRIGGER
brlcad_manage_files(Inconsolata.txt ${DOC_DIR}/legal/embedded TRIGGER libbu)
brlcad_manage_files(image-hash.txt ${DOC_DIR}/legal/embedded TRIGGER libicv)
brlcad_manage_files(json.txt ${DOC_DIR}/legal/embedded TRIGGER libgcv libged)
brlcad_manage_files(linenoise.txt ${DOC_DIR}/legal/embedded TRIGGER ganalyze gsh nirt)
brlcad_manage_files(lod.txt ${DOC_DIR}/legal/embedded TRIGGER libbv)
brlcad_manage_files(lseg_lseg.txt ${DOC_DIR}/legal/embedded TRIGGER libbg)
brlcad_manage_files(lseg_pt.txt ${DOC_DIR}/legal/embedded TRIGGER libbg)
Expand Down
116 changes: 116 additions & 0 deletions doc/legal/embedded/linenoise.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
https://github.com/yhirose/cpp-linenoise

Copyright (c) 2015 yhirose
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. 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 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.

Licenses of incorporated codes:

linenoise.h -- guerrilla line editing library against the idea that a
line editing lib needs to be 20,000 lines of C code.

See linenoise.c for more information.

------------------------------------------------------------------------

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.

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.


ANSI.c - ANSI escape sequence console driver.

Copyright (C) 2005-2014 Jason Hood
This software is provided 'as-is', without any express or implied
warranty. In no event will the author be held liable for any damages
arising from the use of this software.

Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:

1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.

Jason Hood
[email protected]


Win32_ANSI.h and Win32_ANSI.c

Derived from ANSI.c by Jason Hood, from his ansicon project
(https://github.com/adoxa/ansicon), with modifications.

Copyright (c), Microsoft Open Technologies, Inc.
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.


file:/src/libtermio/linenoise.hpp

5 changes: 0 additions & 5 deletions src/gtools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ brlcad_addexec(gex "gex.cpp" "libbu;librt")
brlcad_addexec(glint glint.cpp "librt;${M_LIBRARY}")
brlcad_addexec(gqa gqa.c "libged;librt")

brlcad_addexec(gsh gsh.cpp "libged;libdm;libbu;${LINENOISE_LIBRARIES}")
target_include_directories(gsh BEFORE PRIVATE ${LINENOISE_INCLUDE_DIRS})
set_property(TARGET gsh APPEND PROPERTY COMPILE_DEFINITIONS "LINENOISE_DLL_IMPORTS")
add_dependencies(gsh dm_plugins)

brlcad_addexec(gtransfer gtransfer.c "librt;libpkg" NO_INSTALL)

add_subdirectory(beset)
Expand Down
Loading

0 comments on commit 8e1910f

Please sign in to comment.