From 28d8445c8c2c2e1b1a30ddef30fc9c5555645aeb Mon Sep 17 00:00:00 2001 From: Armaan Bhojwani <3fb650a9-b47e-4604-a282-1dd91953b2ee@anonaddy.me> Date: Mon, 26 Oct 2020 17:58:36 -0400 Subject: [PATCH] made nice --- CMakeLists.txt | 23 ----------------------- README.md | 2 ++ cmake.h | 6 +++--- src/CMakeLists.txt | 1 - 4 files changed, 5 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a7661e4..40a3ead 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,10 @@ cmake_minimum_required (VERSION 2.8) -set (CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") set (HAVE_CMAKE true) project (gen-shell) include (CXXSniffer) -set (PROJECT_VERSION "0.0.1") - include (CheckFunctionExists) include (CheckStructHasMember) include (CheckCXXCompilerFlag) @@ -22,15 +19,8 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/.git/index) endif (EXISTS ${CMAKE_SOURCE_DIR}/.git/index) set (PACKAGE "${PROJECT_NAME}") -set (VERSION "${PROJECT_VERSION}") set (PACKAGE_NAME "${PACKAGE}") set (PACKAGE_TARNAME "${PACKAGE}") -set (PACKAGE_VERSION "${VERSION}") -set (PACKAGE_STRING "${PACKAGE} ${VERSION}") - -SET (GEN-SHELL_DOCDIR share/doc/gen-shell CACHE STRING "Installation directory for doc files") -SET (GEN-SHELL_RCDIR "${GEN-SHELL_DOCDIR}/rc" CACHE STRING "Installation directory for configuration files") -SET (GEN-SHELL bin CACHE STRING "Installation directory for the binary") # include the readline library finder module set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules") @@ -50,16 +40,3 @@ configure_file ( ${CMAKE_SOURCE_DIR}/cmake.h) add_subdirectory (src) -if (EXISTS ${CMAKE_SOURCE_DIR}/test) - add_subdirectory (test EXCLUDE_FROM_ALL) -endif (EXISTS ${CMAKE_SOURCE_DIR}/test) - -# --- - -set (CPACK_SOURCE_GENERATOR "TGZ") -set (CPACK_SOURCE_PACKAGE_FILE_NAME ${PACKAGE_NAME}-${PACKAGE_VERSION}) -set (CPACK_SOURCE_IGNORE_FILES "CMakeCache" "CMakeFiles" "CPackConfig" "CPackSourceConfig" - "_CPack_Packages" "cmake_install" "install_manifest" "Makefile$" - "test" "package-config" "misc/*" "src/gen-shell$" "README.md" - "/\\\\.gitignore" "/\\\\.git/" "swp$") -include (CPack) diff --git a/README.md b/README.md index 953d7c7..d6f057c 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # gen-shell +![Jenkins](https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fbuild.bhojwani.org%2Fjob%2Fgen-shell%2F) + A work in progress generic shell forked form [taskshell](https://github.com/GothenburgBitFactory/taskshell) diff --git a/cmake.h b/cmake.h index cf39861..bce1188 100644 --- a/cmake.h +++ b/cmake.h @@ -5,12 +5,12 @@ /* Package information */ #define PACKAGE "gen-shell" -#define VERSION "0.0.1" +#define VERSION "" #define PACKAGE_BUGREPORT "" #define PACKAGE_NAME "gen-shell" #define PACKAGE_TARNAME "gen-shell" -#define PACKAGE_VERSION "0.0.1" -#define PACKAGE_STRING "gen-shell 0.0.1" +#define PACKAGE_VERSION "" +#define PACKAGE_STRING "" #define CMAKE_BUILD_TYPE "" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f6c2c09..d16e986 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,7 +7,6 @@ include_directories (${CMAKE_SOURCE_DIR} set (tasksh_SRCS diag.cpp help.cpp prompt.cpp - # review.cpp shell.cpp) set (libshared_SRCS libshared/src/Color.cpp libshared/src/Color.h -- 2.39.2