modified cmake

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..9a787c4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,68 @@
+
+# Created by https://www.toptal.com/developers/gitignore/api/cmake,linux,c++
+# Edit at https://www.toptal.com/developers/gitignore?templates=cmake,linux,c++
+
+### C++ ###
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Executables
+*.exe
+*.out
+*.app
+gen-shell
+
+### CMake ###
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+CPackConfig.cmake
+CPackSourceConfig.cmake
+
+### CMake Patch ###
+# External projects
+*-prefix/
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+# End of https://www.toptal.com/developers/gitignore/api/cmake,linux,c++

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01081a809f8a0d896a9ce33e01423c8a31cc1ac4..44a96e8c862e951570c109f1249580d7c963e22f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,16 +52,10 @@ configure_file (
   ${CMAKE_SOURCE_DIR}/cmake.h)
 
 add_subdirectory (src)
-add_subdirectory (doc)
 if (EXISTS ${CMAKE_SOURCE_DIR}/test)
   add_subdirectory (test EXCLUDE_FROM_ALL)
 endif (EXISTS ${CMAKE_SOURCE_DIR}/test)
 
-set (doc_FILES NEWS ChangeLog INSTALL AUTHORS COPYING)
-foreach (doc_FILE ${doc_FILES})
-  install (FILES ${doc_FILE}  DESTINATION ${GEN-SHELL_DOCDIR})
-endforeach (doc_FILE)
-
 # ---
 
 set (CPACK_SOURCE_GENERATOR "TGZ")

diff --git a/cmake.h b/cmake.h
index 5b19e6cbb9c8fdea9f9131a26774921c036799be..53869b80c6604b3a3e65ebde9774e4c8f9888190 100644 (file)
--- a/cmake.h
+++ b/cmake.h
@@ -6,6 +6,7 @@
 /* Package information */
 #define PACKAGE           "gen-shell"
 #define VERSION           "0.0.1"
+#define PACKAGE_BUGREPORT ""
 #define PACKAGE_NAME      "gen-shell"
 #define PACKAGE_TARNAME   "gen-shell"
 #define PACKAGE_VERSION   "0.0.1"
@@ -22,11 +23,11 @@
 
 /* cmake information */
 #define HAVE_CMAKE
-#define CMAKE_VERSION "3.8.1"
+#define CMAKE_VERSION "3.18.4"
 
 /* Compiling platform */
-/* #undef LINUX */
-#define DARWIN
+#define LINUX
+/* #undef DARWIN */
 /* #undef CYGWIN */
 /* #undef FREEBSD */
 /* #undef OPENBSD */
@@ -38,7 +39,7 @@
 /* #undef UNKNOWN */
 
 /* Found the Readline library */
-#define HAVE_READLINE
+/* #undef HAVE_READLINE */
 
 /* Found the pthread library */
 /* #undef HAVE_LIBPTHREAD */

diff --git a/commit.h b/commit.h
index a968aef848805a9f7dda31266e0ae12e72b6655c..582da05779a430d6145d8291504f5c63fb34bb25 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -1,4 +1,4 @@
 /* commit.h.in. Creates commit.h during a cmake run */
 
 /* git information */
-#define COMMIT "e6d0532"
+#define COMMIT "eb1e18e"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 787640d3452dffd58b1f0e9e8e3d04a30fa71987..d9c9d54d8289b8ca0d44a0792e487fe14c726c05 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,7 +7,7 @@ include_directories (${CMAKE_SOURCE_DIR}
 set (tasksh_SRCS diag.cpp
                  help.cpp
                  prompt.cpp
-                 review.cpp
+                 # review.cpp
                  shell.cpp)
 
 set (libshared_SRCS libshared/src/Color.cpp         libshared/src/Color.h
@@ -28,7 +28,6 @@ add_executable (tasksh_executable main.cpp)
 
 target_link_libraries (tasksh_executable tasksh libshared ${TASKSH_LIBRARIES})
 
-set_property (TARGET tasksh_executable PROPERTY OUTPUT_NAME "tasksh")
+set_property (TARGET tasksh_executable PROPERTY OUTPUT_NAME "gen-shell")
 
 install (TARGETS tasksh_executable DESTINATION ${TASKSH_BINDIR})
-

diff --git a/src/help.cpp b/src/help.cpp
index 6571ce2284bd907f5d46bc5ed26ebb27b8929c34..be2ede26877f24471d7d7f33739c5c6269250436 100644 (file)
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -31,7 +31,7 @@
 int cmdHelp ()
 {
   std::cout << '\n'
-            << "A generic shell"
+            << "A generic shell";
   return 0;
 }
 

diff --git a/src/liblibshared.a b/src/liblibshared.a
index fe9bdc806de506694984b28eb6b136c2133b0825..39ece94b97dd68ab16239267853be231b4561d9b 100644 (file)
Binary files a/src/liblibshared.a and b/src/liblibshared.a differ

diff --git a/src/libtasksh.a b/src/libtasksh.a
index 385a8c1e89c90e95ebb0434449aed29b63b5e006..236d665237477f6c643c820bbb78d438a5692a0d 100644 (file)
Binary files a/src/libtasksh.a and b/src/libtasksh.a differ

diff --git a/src/main.cpp b/src/main.cpp
index 269d7394fe5868a86770ae7c9b7a53ac9b8c43f9..bdac9343c39510adee35ca325bf41ee5b77acd87 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -42,7 +42,7 @@
 // tasksh commands.
 int cmdHelp ();
 int cmdDiagnostics ();
-int cmdReview (const std::vector <std::string>&, bool);
+// int cmdReview (const std::vector <std::string>&, bool);
 int cmdShell (const std::vector <std::string>&);
 std::string promptCompose ();
 std::string findTaskwarrior ();
@@ -117,7 +117,7 @@ static int commandLoop (bool autoClear)
     else if (closeEnough ("quit",        args[0], 3)) status = -1;
     else if (closeEnough ("help",        args[0], 3)) status = cmdHelp ();
     else if (closeEnough ("diagnostics", args[0], 3)) status = cmdDiagnostics ();
-    else if (closeEnough ("review",      args[0], 3)) status = cmdReview (args, autoClear);
+    // else if (closeEnough ("review",      args[0], 3)) status = cmdReview (args, autoClear);
     else if (closeEnough ("exec",        args[0], 3) ||
              args[0][0] == '!')                       status = cmdShell (args);
     else if (command != "")