Merge branch 'master' of github.com:dankamongmen/notcurses

pull/300/head
nick black 5 years ago
commit 04329707ae
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(notcurses VERSION 1.1.1
project(notcurses VERSION 1.1.2
DESCRIPTION "UI for modern terminal emulators"
HOMEPAGE_URL "https://nick-black.com/dankwiki/index.php/notcurses"
LANGUAGES C CXX)
@ -13,6 +13,7 @@ include(GNUInstallDirs)
set(NOTCURSES_SHARE ${CMAKE_INSTALL_PREFIX}/share/notcurses)
option(DISABLE_FFMPEG "Disable FFmpeg image/video support" OFF)
option(BUILD_PYTHON "Build Python wrappers" OFF)
find_package(PkgConfig REQUIRED)
find_package(Threads REQUIRED)
@ -431,31 +432,32 @@ write_basic_package_version_file(
)
# Python bindings
find_package(Python3 COMPONENTS Development Interpreter REQUIRED)
file(GLOB PYSRC CONFIGURE_DEPENDS python/src/notcurses/*.py)
set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/python/setup.py.in")
set(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/python/setup.py")
set(SETUP_CFG_IN "${CMAKE_CURRENT_SOURCE_DIR}/python/setup.cfg.in")
set(SETUP_CFG "${CMAKE_CURRENT_BINARY_DIR}/setup.cfg")
configure_file(${SETUP_PY_IN} ${SETUP_PY})
configure_file(${SETUP_CFG_IN} ${SETUP_CFG})
add_custom_command(
OUTPUT
"${CMAKE_CURRENT_BINARY_DIR}/build/pytimestamp"
COMMAND
"${Python3_EXECUTABLE}" ${SETUP_PY} build &&
"${Python3_EXECUTABLE}" ${SETUP_PY} build_ext &&
mkdir -p "${CMAKE_CURRENT_BINARY_DIR}/build" &&
${CMAKE_COMMAND} -E touch "${CMAKE_CURRENT_BINARY_DIR}/build/pytimestamp"
DEPENDS
${PYSRC} ${SETUP_PY} ${SETUP_CFG} notcurses
COMMENT "Building Python wrappers"
)
add_custom_target(pymod
ALL
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/build/pytimestamp"
)
install(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install)")
if(${BUILD_PYTHON})
find_package(Python3 COMPONENTS Development Interpreter REQUIRED)
file(GLOB PYSRC CONFIGURE_DEPENDS python/src/notcurses/*.py)
set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/python/setup.py.in")
set(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/python/setup.py")
set(SETUP_CFG_IN "${CMAKE_CURRENT_SOURCE_DIR}/python/setup.cfg.in")
set(SETUP_CFG "${CMAKE_CURRENT_BINARY_DIR}/setup.cfg")
configure_file(${SETUP_PY_IN} ${SETUP_PY})
configure_file(${SETUP_CFG_IN} ${SETUP_CFG})
add_custom_command(
OUTPUT
"${CMAKE_CURRENT_BINARY_DIR}/build/pytimestamp"
COMMAND
"${Python3_EXECUTABLE}" ${SETUP_PY} build &&
"${Python3_EXECUTABLE}" ${SETUP_PY} build_ext
DEPENDS
${PYSRC} ${SETUP_PY} ${SETUP_CFG} notcurses
COMMENT "Building Python wrappers"
)
# build/pytimestamp isn't actually generated, and thus this runs each time.
# python does its own dep tracking, so it "works" out like recursive make.
add_custom_target(pymod
ALL
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/build/pytimestamp"
)
endif()
# Installation
install(FILES
@ -499,6 +501,10 @@ install(TARGETS notcurses
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
COMPONENT Development
)
install(
CODE
"execute_process(COMMAND ${Python3_EXECUTABLE} ${SETUP_PY} install --root=${CMAKE_SOURCE_DIR}/debian/python3-notcurses --install-layout=deb --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ../python)")
if(${BUILD_PYTHON})
if(DEFINED $ENV{DEB_VENDOR})
install(
CODE
"execute_process(COMMAND ${Python3_EXECUTABLE} ${SETUP_PY} install --root=${CMAKE_SOURCE_DIR}/debian/python3-notcurses --install-layout=deb --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ../python)")
endif()
endif()

@ -14,7 +14,7 @@
</script>
</head>
<body>
<h1><a href="https://nick-black.com/dankwiki/index.php/Notcurses">notcurses</a> man pages (v1.1.1)</h1>
<h1><a href="https://nick-black.com/dankwiki/index.php/Notcurses">notcurses</a> man pages (v1.1.2)</h1>
<a href="notcurses.3.html">notcurses(3)</a>—a blingful TUI library<br/>
<h2>Binaries (section 1)</h2>
<a href="notcurses-demo.1.html">notcurses-demo</a>—shows off some notcurses features<br/>

@ -1,6 +1,6 @@
% notcurses-demo(1)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses-input(1)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses-planereel(1)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses-view(1)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses(3)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses_cell(3)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses_channels(3)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses_directmode(3)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses_fade(3)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses_init(3)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses_input(3)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses_lines(3)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses_ncplane(3)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses_ncvisual(3)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME
notcurses_ncvisual - notcurses multimedia

@ -1,6 +1,6 @@
% notcurses_output(3)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses_palette(3)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses_panelreels(3)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses_render(3)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses_resize(3)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses_stats(3)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses_stdplane(3)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,6 +1,6 @@
% notcurses_stop(3)
% nick black <nickblack@linux.com>
% v1.1.1
% v1.1.2
# NAME

@ -1,5 +1,4 @@
* Verify version in CMakeLists.txt
* Update versions in man page headers
* `for i in CMakeLists.txt doc/man/man*/* doc/man/index.html python/setup.py rust/*/Cargo.toml rust/libnotcurses-sys/build.rs ; do sed -i -e 's/1.1.1/1.1.2/g' $i ; done`
* Finalize Debian changelog with `dch -r`
* Update version in rust/Cargo.toml
* git commit -a -m v$VERSION

@ -6,7 +6,7 @@ def read(fname):
setup(
name="notcurses",
version="1.1.1",
version="1.1.2",
package_dir={'': 'src'},
packages=find_packages('src'),
author="Nick Black",

@ -5,7 +5,7 @@ license = "Apache-2.0"
description = "Low-level rust bindings for the notcurses C library."
repository = "https://github.com/dankamongmen/notcurses"
homepage = "https://nick-black.com/dankwiki/index.php/Notcurses"
version = "1.1.1"
version = "1.1.2"
links = "notcurses"
build = "build.rs"
edition = "2018"

@ -5,7 +5,7 @@ use std::path::PathBuf;
fn main() {
pkg_config::Config::new()
.atleast_version("1.1.1")
.atleast_version("1.1.2")
.probe("notcurses")
.unwrap();

@ -1,6 +1,6 @@
[package]
name = "notcurses"
version = "1.1.1"
version = "1.1.2"
authors = ["nick black <dankamongmen@gmail.com>"]
edition = "2018"
license = "Apache-2.0"

@ -372,11 +372,12 @@ int main(int argc, char** argv){
if(dimy < MIN_SUPPORTED_ROWS || dimx < MIN_SUPPORTED_COLS){
goto err;
}
// no one cares about the leaderscreen. 1s max.
if(demodelay.tv_sec >= 1){
sleep(1);
}else{
nanosleep(&demodelay, NULL);
if(nopts.inhibit_alternate_screen){ // no one cares. 1s max.
if(demodelay.tv_sec >= 1){
sleep(1);
}else{
nanosleep(&demodelay, NULL);
}
}
if(ext_demos(nc, spec) == NULL){
goto err;

@ -905,18 +905,19 @@ notcurses* notcurses_init(const notcurses_options* opts, FILE* outfp){
#endif
term_fg_palindex(ret, ret->ttyfp, ret->RGBflag ? 0xe02080 : 3);
if(!ret->RGBflag){ // FIXME
fprintf(ret->ttyfp, "\n Warning!\n Your colors are subject to https://github.com/dankamongmen/notcurses/issues/4");
fprintf(ret->ttyfp, "\n Warning! Colors subject to https://github.com/dankamongmen/notcurses/issues/4");
fprintf(ret->ttyfp, "\n Are you specifying a proper DirectColor TERM?\n");
}else{
/*if((unsigned)ret->colors < (1u << 24u)){
fprintf(ret->ttyfp, "\n Warning!\n Advertised DirectColor but only %d colors\n", ret->colors);
fprintf(ret->ttyfp, "\n Warning! Advertised DirectColor but only %d colors\n", ret->colors);
}*/
if(!ret->CCCflag){
fprintf(ret->ttyfp, "\n Warning!\n Advertised DirectColor but no 'ccc' flag\n");
fprintf(ret->ttyfp, "\n Warning! Advertised DirectColor but no 'ccc' flag\n");
}
}
}
if(ret->smcup && term_emit("smcup", ret->smcup, ret->ttyfp, false)){
// flush on the switch to alternate screen, lest initial output be swept away
if(ret->smcup && term_emit("smcup", ret->smcup, ret->ttyfp, true)){
free_plane(ret->top);
goto err;
}

Loading…
Cancel
Save