From: Armaan Bhojwani <3fb650a9-b47e-4604-a282-1dd91953b2ee@anonaddy.me> Date: Tue, 27 Oct 2020 13:59:06 +0000 (-0400) Subject: finally removed all hints of tasksh X-Git-Url: https://git.armaanb.net/?p=gen-shell.git;a=commitdiff_plain;h=26b1d23d53c98fd02c3419d889ec852c1f0fc41c finally removed all hints of tasksh --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9d48f22..ab64b0f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,28 +2,15 @@ cmake_minimum_required (VERSION 2.8) include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/libshared/src - ${TASKSH_INCLUDE_DIRS}) + ${GEN-SHELL_INCLUDE_DIRS}) -set (tasksh_SRCS prompt.cpp) +set (gen-shell_SRCS prompt.cpp) +add_library (gen-shell STATIC ${gen-shell_SRCS}) -# set (libshared_SRCS libshared/src/Color.cpp libshared/src/Color.h - # libshared/src/Datetime.cpp libshared/src/Datetime.h - # libshared/src/Duration.cpp libshared/src/Duration.h - # libshared/src/FS.cpp libshared/src/FS.h - # libshared/src/Lexer.cpp libshared/src/Lexer.h - # libshared/src/Pig.cpp libshared/src/Pig.h - # libshared/src/shared.cpp libshared/src/shared.h - # libshared/src/format.cpp libshared/src/format.h - # libshared/src/unicode.cpp libshared/src/unicode.h - # libshared/src/utf8.cpp libshared/src/utf8.h - # libshared/src/wcwidth6.cpp) +add_executable (gen-shell_executable main.cpp) -add_library (tasksh STATIC ${tasksh_SRCS}) -# add_library (libshared STATIC ${libshared_SRCS}) -add_executable (gen-sh_executable main.cpp) +target_link_libraries (gen-shell_executable gen-shell ${GEN-SHELL_LIBRARIES}) -target_link_libraries (gen-sh_executable tasksh ${GEN-SHELL_LIBRARIES}) +set_property (TARGET gen-shell_executable PROPERTY OUTPUT_NAME "gen-shell") -set_property (TARGET gen-sh_executable PROPERTY OUTPUT_NAME "gen-shell") - -install (TARGETS gen-sh_executable DESTINATION ${TASKSH_BINDIR}) +install (TARGETS gen-shell_executable DESTINATION ${GEN-SHELL_BINDIR}) diff --git a/src/main.cpp b/src/main.cpp index 8c76833..fa4bad3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -83,7 +83,6 @@ static int commandLoop (bool autoClear) // Display prompt, get input. auto command = getResponse (prompt); - // Obey Taskwarrior's rc.tasksh.autoclear. if (autoClear) std::cout << "\033[2J\033[0;0H";