From fceb27bfab238cbc5d1f2498b7c2b2e7bb871ba4 Mon Sep 17 00:00:00 2001 From: Armaan Bhojwani <3fb650a9-b47e-4604-a282-1dd91953b2ee@anonaddy.me> Date: Mon, 26 Oct 2020 16:56:34 -0400 Subject: [PATCH] about as detasked as it will be --- .gitmodules | 3 - CMakeLists.txt | 4 +- COPYING | 2 +- cmake/CXXSniffer.cmake | 2 +- src/diag.cpp | 10 +--- src/libshared/ChangeLog | 89 ---------------------------- src/libshared/cmake/CXXSniffer.cmake | 2 +- src/prompt.cpp | 6 +- 8 files changed, 8 insertions(+), 110 deletions(-) delete mode 100644 .gitmodules delete mode 100644 src/libshared/ChangeLog diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 675b3d4..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "src/libshared"] - path = src/libshared - url = https://git.tasktools.org/TM/libshared.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 44a96e8..a7661e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,9 +18,7 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/.git/index) execute_process (COMMAND git log -1 --pretty=format:%h WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE COMMIT) - configure_file ( ${CMAKE_SOURCE_DIR}/commit.h.in - ${CMAKE_SOURCE_DIR}/commit.h) - message ("-- Found SHA1 reference: ${COMMIT}") + message ("-- Found SHA1 reference: ${COMMIT}") endif (EXISTS ${CMAKE_SOURCE_DIR}/.git/index) set (PACKAGE "${PROJECT_NAME}") diff --git a/COPYING b/COPYING index c93df9c..3942ae9 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -gen-shell - a shell/frontend for the command line task list manager taskwarrior. +gen-shell - a generic shell based on taskshell Copyright 2006 - 2017, Paul Beckingham, Federico Hernandez, 2020 Armaan Bhojwani diff --git a/cmake/CXXSniffer.cmake b/cmake/CXXSniffer.cmake index 9606226..cf6482a 100644 --- a/cmake/CXXSniffer.cmake +++ b/cmake/CXXSniffer.cmake @@ -17,7 +17,7 @@ elseif (_HAS_GNU0X) message (WARNING "Enabling -std=gnu++0x draft compile flag. Your compiler does not support the standard '-std=c++11' option. Consider upgrading.") set (_CXX11_FLAGS "-std=gnu++0x") else (_HAS_CXX11) - message (FATAL_ERROR "C++11 support missing. Try upgrading your C++ compiler. If you have a good reason for using an outdated compiler, please let us know at support@taskwarrior.org.") + message (FATAL_ERROR "C++11 support missing. Try upgrading your C++ compiler.") endif (_HAS_CXX11) if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") diff --git a/src/diag.cpp b/src/diag.cpp index 9cbe9a7..54c5184 100644 --- a/src/diag.cpp +++ b/src/diag.cpp @@ -25,7 +25,6 @@ //////////////////////////////////////////////////////////////////////////////// #include -#include #include #include #include @@ -94,14 +93,7 @@ int cmdDiagnostics () << "\n\n"; std::cout << bold.colorize ("Build Features") - << "\n" - - // Build date. - << " " << "Built: " << __DATE__ << " " << __TIME__ << "\n" -#ifdef HAVE_COMMIT - << " " << "Commit: " << COMMIT << "\n" -#endif - << " CMake: " << CMAKE_VERSION << "\n"; + << "\n"; std::cout << "libreadline: " #ifdef HAVE_READLINE diff --git a/src/libshared/ChangeLog b/src/libshared/ChangeLog deleted file mode 100644 index 12ab900..0000000 --- a/src/libshared/ChangeLog +++ /dev/null @@ -1,89 +0,0 @@ -master/HEAD - -- TI-53 Fix musl-libc compatibility - (thanks to Toyam Cox). -- Define PATH_MAX if it's not defined - (thanks to Iain R. Learmonth). -- Removed 'std::' from stdtoimax call. - (thanks to fornwall). -- When Lexer::noOperator () is called, prevent ::isWord boundaries from being - comprised of operators. -- Added Pig::getCharacter, which was oddly missing. -- Added 'Tree' class. -- Added FS error handling for POSIX call failure. -- Updated Timer class to use std::chrono. -- Args now tolerates undeclared option queries. -- Added case (in)sentitive find functions. -- Pig no longer makes a copy of the input string. -- Fixed bug where Pig::getUntil included the terminator if it was the last - character. -- Table now uses the correct include latch. -- Migrated obfuscateText from Taskwarrior. -- Added unicodeHorizontalWhitespace and unicodeVerticalWhitespace. -- Added unicodePunctuation. -- Added unicodeAlpha. -- Added osName. -- Duration::formatVague can now pad all values to the same length. -- Combined JSON.h, JSON2.h, eliminated duplicate encode/decode implementations. -- Table::addRow{,Odd,Even} allows a user-specified notion of 'odd' row. -- Added isIPv4Address and isIPv6Address. -- Added PEG parser. -- Added Packrat parser. -- Datetime/Duration can now parse dates from an embedded string, with negative - lookahead. -- Table supports unwrapped columns. -- Table supports colored columns. - -tasksh-1.1.0 (2016-09-05) -anomaly-1.1.0 (2016-09-04) - -- TD-120 Missing cmakedefine for HAVE_GET_CURRENT_DIR_NAME - (Thanks to Jörg Krause, Ben Boeckel). -- TW-1845 Cygwin build fails, missing get_current_dir_name - (thanks to hosaka). -- Lexer can now disable individual token types. -- Pig is more careful about string bounds in ::peek. -- Pig can extract substrings. -- FS now has strict error handling, requiring that file existence is checked before - readability. - -timew-1.0.0 (2016-08-17) - -- TI-30 10:00am isn't recognized as date - (thanks to Yurї Videneev). -- Datetime::weekStart set to 1 (Monday), per ISO-8601. -- Datetime no longer users 23:59:59 as EOD, but 24:00:00. All date ranges should - therefore be [...) instead of [...]. -- Datetime now uses whole days, not 86400 seconds for calculating date offsets. -- Datetime now properly calculates day names when looking backwards. -- Datetime considerѕ forwards/backwards when calculating informal time. - -clog-1.3.0 (2016-06-27) - -- TW-1741 Warning "ignoring return value of ‘int ftruncate" while doing make on - xubuntu15.10 - (thanks to Sunil Joshi). -- TW-1807 dateformat lacks a flag to display day of week - (thanks to Ellington Santos). -- Bug '12pm' was getting 12 hours added because of the 'pm', which is wrong. -- Added 'juhannus' as a synonym for 'midsommarafton' - (thanks to Lynoure Braakman). -- Added 'join' function. -- Added 'str_replace' function. -- Added Datetime support for informal time, '8am', '2:30p'. -- Added 'JSON2' SAX parser. -- Introduced the new shared submodule. -- Added Datetime support for 'socq', 'eocq', 'socy', 'eocy'. -- Added Composite object. -- Added Palette object. -- Added Lexer object. -- Added Msg::set overload. - -Design completed 2015-12-XX -Project started 2015-11-29 - ------- current release --------------------------- - -Note: There are no releases. There are tags applied when a project is released. - ------- start ----------------------------------- diff --git a/src/libshared/cmake/CXXSniffer.cmake b/src/libshared/cmake/CXXSniffer.cmake index 9606226..cf6482a 100644 --- a/src/libshared/cmake/CXXSniffer.cmake +++ b/src/libshared/cmake/CXXSniffer.cmake @@ -17,7 +17,7 @@ elseif (_HAS_GNU0X) message (WARNING "Enabling -std=gnu++0x draft compile flag. Your compiler does not support the standard '-std=c++11' option. Consider upgrading.") set (_CXX11_FLAGS "-std=gnu++0x") else (_HAS_CXX11) - message (FATAL_ERROR "C++11 support missing. Try upgrading your C++ compiler. If you have a good reason for using an outdated compiler, please let us know at support@taskwarrior.org.") + message (FATAL_ERROR "C++11 support missing. Try upgrading your C++ compiler.") endif (_HAS_CXX11) if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") diff --git a/src/prompt.cpp b/src/prompt.cpp index 3d4eca0..6c98b7c 100644 --- a/src/prompt.cpp +++ b/src/prompt.cpp @@ -88,9 +88,9 @@ std::string composeContexts (bool pretty /* = false */) //////////////////////////////////////////////////////////////////////////////// std::string promptCompose () { - auto decoration = composeContexts (true); - if (decoration.length ()) - return "task " + decoration + "> "; +/* auto decoration = composeContexts (true); */ + // if (decoration.length ()) + // return "task " + decoration + "> "; return ">>>"; } -- 2.39.2