gflags -> cxxopt (#206)

* gflags -> cxxopt * fix verbose flag
MisterTea · Jul 24, 2019 · f601aab · f601aab
1 parent 4261a57
commit f601aab
Show file tree

Hide file tree

Showing 8 changed files with 222 additions and 234 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -25,13 +25,13 @@ jobs:
           command: mkdir build; cd build; cmake ../; make -j4
       - run:
           name: Connect new -> old
-          command: ../root_version/build/etserver --daemon; cp ../root_version/build/etterminal /usr/bin/etterminal; sleep 1; build/et -c "ls" localhost --logtostdout --v=9
+          command: ../root_version/build/etserver --daemon; cp ../root_version/build/etterminal /usr/bin/etterminal; sleep 1; build/et -c "ls" localhost --logtostdout --verbose=9
       - run:
           name: Kill server
           command: pkill etserver
       - run:
           name: Connect old -> new
-          command: export TERM=xterm-256color; build/etserver --daemon; cp build/etterminal /usr/bin/etterminal; sleep 1; ../root_version/build/et -c "ls" localhost --logtostdout --v=9
+          command: export TERM=xterm-256color; build/etserver --daemon; cp build/etterminal /usr/bin/etterminal; sleep 1; ../root_version/build/et -c "ls" localhost --logtostdout --verbose=9
       - run:
           name: Kill server
           command: pkill etserver

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,7 +35,6 @@ LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 # Required packages
 find_package(Threads REQUIRED)
-find_package(GFlags REQUIRED)
 find_package(Protobuf REQUIRED)
 find_package(Sodium REQUIRED)
 
@@ -101,7 +100,6 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CURSES_INCLUDE_DIR}
   ${sodium_INCLUDE_DIR}
-  ${GFLAGS_INCLUDE_DIRS}
   ${SELINUX_INCLUDE_DIR}
   ${UTEMPTER_INCLUDE_DIR}
   )
@@ -168,7 +166,6 @@ target_link_libraries (
   et-lib
   ${CMAKE_THREAD_LIBS_INIT}
   ${PROTOBUF_LIBRARIES}
-  ${GFLAGS_LIBRARIES}
   ${sodium_LIBRARY_RELEASE}
   ${SELINUX_LIBRARIES}
   ${UTEMPTER_LIBRARIES}
@@ -187,7 +184,6 @@ target_link_libraries (
   et-lib
   ${CMAKE_THREAD_LIBS_INIT}
   ${PROTOBUF_LIBRARIES}
-  ${GFLAGS_LIBRARIES}
   ${sodium_LIBRARY_RELEASE}
   ${SELINUX_LIBRARIES}
   ${UTEMPTER_LIBRARIES}
@@ -206,7 +202,6 @@ target_link_libraries (
     et-lib
     ${CMAKE_THREAD_LIBS_INIT}
     ${PROTOBUF_LIBRARIES}
-    ${GFLAGS_LIBRARIES}
     ${sodium_LIBRARY_RELEASE}
     ${UTEMPTER_LIBRARIES}
     ${CORE_LIBRARIES}
@@ -243,8 +238,6 @@ target_link_libraries (
   et-lib
   ${CMAKE_THREAD_LIBS_INIT}
   ${PROTOBUF_LIBRARIES}
-  ${GLOG_LIBRARIES}
-  ${GFLAGS_LIBRARIES}
   ${sodium_LIBRARY_RELEASE}
   ${SELINUX_LIBRARIES}
   ${UTEMPTER_LIBRARIES}
@@ -265,8 +258,6 @@ target_link_libraries (
   et-lib
   ${CMAKE_THREAD_LIBS_INIT}
   ${PROTOBUF_LIBRARIES}
-  ${GLOG_LIBRARIES}
-  ${GFLAGS_LIBRARIES}
   ${sodium_LIBRARY_RELEASE}
   ${SELINUX_LIBRARIES}
   ${UTEMPTER_LIBRARIES}
@@ -294,7 +285,6 @@ target_link_libraries(
   et-lib
   ${CMAKE_THREAD_LIBS_INIT}
   ${PROTOBUF_LIBRARIES}
-  ${GFLAGS_LIBRARIES}
   ${sodium_LIBRARY_RELEASE}
   ${SELINUX_LIBRARIES}
   ${UTEMPTER_LIBRARIES}

diff --git a/src/base/Headers.hpp b/src/base/Headers.hpp
@@ -55,12 +55,11 @@
 #include <unordered_set>
 #include <vector>
 
-#include <gflags/gflags.h>
-
 #include <google/protobuf/message.h>
 #include "ET.pb.h"
 #include "easylogging++.h"
 
+#include <cxxopts.hpp>
 #include "base64.hpp"
 #include "json.hpp"
 #include "sole.hpp"

diff --git a/src/htm/HtmClientMain.cpp b/src/htm/HtmClientMain.cpp
@@ -10,8 +10,6 @@
 
 using namespace et;
 
-DEFINE_bool(x, false, "flag to kill all old sessions belonging to the user");
-
 termios terminal_backup;
 
 void term(int signum) {
@@ -25,11 +23,25 @@ void term(int signum) {
 }
 
 int main(int argc, char** argv) {
-  // Version string need to be set before GFLAGS parse arguments
-  SetVersionString(string(ET_VERSION));
   GOOGLE_PROTOBUF_VERIFY_VERSION;
   srand(1);
 
+  // Parse command line arguments
+  cxxopts::Options options("htm", "Headless terminal multiplexer");
+  options.allow_unrecognised_options();
+
+  options.add_options()       //
+      ("help", "Print help")  //
+      ("x,kill-other-sessions",
+       "kill all old sessions belonging to the user")  //
+      ;
+
+  auto result = options.parse(argc, argv);
+  if (result.count("help")) {
+    cout << options.help({}) << endl;
+    exit(0);
+  }
+
   setvbuf(stdin, NULL, _IONBF, 0);   // turn off buffering
   setvbuf(stdout, NULL, _IONBF, 0);  // turn off buffering
 
@@ -59,11 +71,8 @@ int main(int argc, char** argv) {
   // Reconfigure default logger to apply settings above
   el::Loggers::reconfigureLogger("default", defaultConf);
 
-  // GFLAGS parse command line arguments
-  gflags::ParseCommandLineFlags(&argc, &argv, true);
-
   uid_t myuid = getuid();
-  if (FLAGS_x) {
+  if (result.count("x")) {
     LOG(INFO) << "Killing previous htmd";
     // Kill previous htm daemon
     string command =

diff --git a/src/htm/HtmServerMain.cpp b/src/htm/HtmServerMain.cpp
@@ -8,7 +8,6 @@ using namespace et;
 
 int main(int argc, char **argv) {
   // Version string need to be set before GFLAGS parse arguments
-  SetVersionString(string(ET_VERSION));
   GOOGLE_PROTOBUF_VERIFY_VERSION;
   srand(1);
 
@@ -26,9 +25,6 @@ int main(int argc, char **argv) {
   // Reconfigure default logger to apply settings above
   el::Loggers::reconfigureLogger("default", defaultConf);
 
-  // GFLAGS parse command line arguments
-  gflags::ParseCommandLineFlags(&argc, &argv, true);
-
   shared_ptr<SocketHandler> socketHandler(new PipeSocketHandler());
   HtmServer htm(socketHandler, SocketEndpoint(HtmServer::getPipeName()));
   htm.run();