Skip to content

Commit

Permalink
Colorer update (#750)
Browse files Browse the repository at this point in the history
 new colorer by cycleg plus some changes (touch #692, close #648, touch #596, touch #531, touch #286)
  • Loading branch information
elfmz authored Oct 2, 2020
1 parent f1796e4 commit 327199f
Show file tree
Hide file tree
Showing 589 changed files with 21,513 additions and 47,085 deletions.
35 changes: 22 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,20 @@ matrix:
- os: osx
osx_image: xcode10
- os: linux
dist: trusty
dist: xenial
sudo: required
compiler: gcc
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.9
- g++-5
- cmake
- libwxgtk3.0-dev
- libxerces-c-dev
- libminizip-dev
- libspdlog-dev
- libglib2.0-dev
- libssh-dev
- libsmbclient-dev
Expand All @@ -26,22 +29,24 @@ matrix:
- gawk
- m4
- ninja-build
env: CXX=g++-4.9
env: CXX=g++-5
install:
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
- if [ "$CXX" = "g++" ]; then export CXX="g++-5" CC="gcc-5"; fi
- os: linux
dist: trusty
dist: xenial
sudo: required
compiler: gcc
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-5
- g++-6
- cmake
- libwxgtk3.0-dev
- libglib2.0-dev
- libxerces-c-dev
- libminizip-dev
- libspdlog-dev
- libssh-dev
- libsmbclient-dev
- libnfs-dev
Expand All @@ -50,11 +55,11 @@ matrix:
- gawk
- m4
- ninja-build
env: CXX=g++-5
env: CXX=g++-6
install:
- if [ "$CXX" = "g++" ]; then export CXX="g++-5" CC="gcc-5"; fi
- if [ "$CXX" = "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi
- os: linux
dist: trusty
dist: xenial
sudo: required
compiler: clang
addons:
Expand All @@ -66,7 +71,9 @@ matrix:
- clang-3.6
- cmake
- libwxgtk3.0-dev
- libglib2.0-dev
- libxerces-c-dev
- libminizip-dev
- libspdlog-dev
- libssh-dev
- libsmbclient-dev
- libnfs-dev
Expand All @@ -79,7 +86,7 @@ matrix:
install:
- if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.6" CC="clang-3.6"; fi
- os: linux
dist: trusty
dist: xenial
sudo: required
compiler: clang
addons:
Expand All @@ -91,7 +98,9 @@ matrix:
- clang-3.7
- cmake
- libwxgtk3.0-dev
- libglib2.0-dev
- libxerces-c-dev
- libminizip-dev
- libspdlog-dev
- libssh-dev
- libsmbclient-dev
- libnfs-dev
Expand Down
3 changes: 3 additions & 0 deletions Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ brew "gawk"
brew "ninja"
brew "pkg-config"
brew "wxmac"
brew "xerces-c"
brew "minizip"
brew "spdlog"
brew "wget"
brew "libssh"
brew "libnfs"
Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ Plug-ins that are currently working: NetRocks (SFTP/SCP/FTP/FTPS/SMB/NFS/WebDAV)
* gawk
* m4
* libwxgtk3.0-dev (or in Ubuntu 19.04+ - libwxgtk3.0-gtk3-dev)
* libxerces-c-dev
* libminizip-dev
* libspdlog-dev
* libssh-dev (needed for NetRocks/SFTP)
* libssl-dev (needed for NetRocks/FTPS)
* libsmbclient-dev (needed for NetRocks/SMB)
Expand All @@ -37,7 +40,8 @@ Plug-ins that are currently working: NetRocks (SFTP/SCP/FTP/FTPS/SMB/NFS/WebDAV)

#### Or simply on Debian/Ubuntu:
``` sh
apt-get install gawk m4 libwxgtk3.0-dev libssh-dev libssl-dev libsmbclient-dev libnfs-dev libneon27-dev libarchive-dev cmake g++ git
apt-get install gawk m4 libwxgtk3.0-dev libxerces-c-dev libminizip-dev libspdlog-dev libssh-dev libssl-dev libsmbclient-dev libnfs-dev libneon27-dev libarchive-dev cmake g++ git

```
(if in Ubuntu 19.04+ or other that has missing libwxgtk3.0-dev - try libwxgtk3.0-gtk3-dev)

Expand Down Expand Up @@ -87,7 +91,7 @@ brew install yurikoles/yurikoles/far2l --HEAD
##### Hard way OSX/MacOS install - with building from sources:
* Install required packages:
```sh
brew install cmake gawk ninja pkg-config wget wxmac libssh libnfs neon libarchive pcre
brew install cmake gawk ninja pkg-config wget wxmac xerces-c minizip spdlog libssh libnfs neon libarchive pcre
```
* Clone:
Expand Down
30 changes: 30 additions & 0 deletions cmake/modules/FindMinizip.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# - Find minizip
# Find the native MINIZIP includes and library
#
# MINIZIP_INCLUDE_DIR - where to find minizip.h, etc.
# MINIZIP_LIBRARIES - List of libraries when using minizip.
# MINIZIP_FOUND - True if minizip found.


IF (MINIZIP_INCLUDE_DIR)
# Already in cache, be silent
SET(MINIZIP_FIND_QUIETLY TRUE)
ENDIF (MINIZIP_INCLUDE_DIR)

FIND_PATH(MINIZIP_INCLUDE_DIR zip.h PATH_SUFFIXES minizip)

SET(MINIZIP_NAMES minizip)
FIND_LIBRARY(MINIZIP_LIBRARY NAMES ${MINIZIP_NAMES} )

# handle the QUIETLY and REQUIRED arguments and set MINIZIP_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(MiniZip DEFAULT_MSG MINIZIP_LIBRARY MINIZIP_INCLUDE_DIR)

IF(MINIZIP_FOUND)
SET( MINIZIP_LIBRARIES ${MINIZIP_LIBRARY} )
ELSE(MINIZIP_FOUND)
SET( MINIZIP_LIBRARIES )
ENDIF(MINIZIP_FOUND)

MARK_AS_ADVANCED( MINIZIP_LIBRARY MINIZIP_INCLUDE_DIR )
33 changes: 33 additions & 0 deletions cmake/modules/FindSpdlog.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# This module try to find spdlog lib
# Once done this will define
#
# Spdlog_FOUND - system has spdlog lib
# SPDLOG_INCLUDE_DIR - the spdlog include directory
#
# Available targets:
# Spdlog::Spdlog

find_path(SPDLOG_INCLUDE_DIR spdlog/spdlog.h
PATHS
ENV SPDLOG_ROOT
ENV SPDLOG_INCLUDE_DIR
${SPDLOG_ROOT}
/usr
/usr/local
$ENV{HOME}/.local
PATH_SUFFIXES
include
)
mark_as_advanced(SPDLOG_INCLUDE_DIR)

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Spdlog
REQUIRED_VARS SPDLOG_INCLUDE_DIR
)

if(Spdlog_FOUND AND NOT TARGET Spdlog::Spdlog)
add_library(Spdlog::Spdlog INTERFACE IMPORTED)
set_target_properties(Spdlog::Spdlog PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${SPDLOG_INCLUDE_DIR}"
)
endif()
63 changes: 63 additions & 0 deletions cmake/modules/FindXercesC.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# - Find Xerces-C
# The following setings are defined
# XERCESC_ROOT_DIR, the root of the include and lib directory
# XERCESC_INCLUDE_DIR, the full path of the include dir (ADVANCED)
# XERCESC_LIBRARIES, the name of the xerces-c library (ADVANCED)
#####
# Find Xerces-C

# taken from http://cartwheel.idyll.org/browser/trunk/FindXercesC.cmake

set(XERCESC_FIND_QUIETLY FALSE)

# Look for a root installation
FIND_PATH(XERCESC_ROOT_DIR include/xercesc/parsers/SAXParser.hpp
HINTS ENV XERCESC_ROOT
/usr

DOC "The root of an installed xerces-c installation"
)

# try to find the header
FIND_PATH(XERCESC_INCLUDE_DIR xercesc/parsers/SAXParser.hpp
${XERCESC_ROOT_DIR}/include
HINTS ENV XERCESC_ROOT
/usr/include
/usr/local/include
)

# Find the library
FIND_LIBRARY(XERCESC_LIBRARY
NAMES xerces-c
HINTS ENV XERCESC_ROOT
PATHS
${XERCESC_ROOT_DIR}/lib
/usr/lib
/usr/local/lib
DOC "The name of the xerces-c library"
)
IF (XERCESC_ROOT_DIR)
IF (XERCESC_INCLUDE_DIR AND XERCESC_LIBRARY)
SET (XERCESC_FOUND TRUE)
SET (XERCESC_LIBRARIES "${XERCESC_LIBRARY}")
# FIXME: There should be a better way of handling this?
# FIXME: How can we test to see if the lib dir isn't
# FIXME: one of the default dirs?
LINK_DIRECTORIES(${XERCESC_ROOT_DIR}/lib)
ENDIF (XERCESC_INCLUDE_DIR AND XERCESC_LIBRARY)
ENDIF (XERCESC_ROOT_DIR)

IF (XERCESC_FOUND)
IF (NOT XERCESC_FIND_QUIETLY)
MESSAGE (STATUS "Found Xerces-C: ${XERCESC_LIBRARY}")
ENDIF (NOT XERCESC_FIND_QUIETLY)
ELSE (XERCESC_FOUND)
IF (XERCESC_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find Xerces-C")
ENDIF (XERCESC_FIND_REQUIRED)
ENDIF (XERCESC_FOUND)

MARK_AS_ADVANCED(
XERCESC_INCLUDE_DIR
XERCESC_LIBRARY
)
43 changes: 43 additions & 0 deletions cmake/modules/Findfmt.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
find_path(fmt_INCLUDE_DIR NAMES fmt/format.h)

if(fmt_INCLUDE_DIR)
set(_fmt_version_file "${fmt_INCLUDE_DIR}/fmt/core.h")
if(NOT EXISTS "${_fmt_version_file}")
set(_fmt_version_file "${fmt_INCLUDE_DIR}/fmt/format.h")
endif()
if(EXISTS "${_fmt_version_file}")
# parse "#define FMT_VERSION 40100" to 4.1.0
file(STRINGS "${_fmt_version_file}" fmt_VERSION_LINE
REGEX "^#define[ \t]+FMT_VERSION[ \t]+[0-9]+$")
string(REGEX REPLACE "^#define[ \t]+FMT_VERSION[ \t]+([0-9]+)$"
"\\1" fmt_VERSION "${fmt_VERSION_LINE}")
foreach(ver "fmt_VERSION_PATCH" "fmt_VERSION_MINOR" "fmt_VERSION_MAJOR")
math(EXPR ${ver} "${fmt_VERSION} % 100")
math(EXPR fmt_VERSION "(${fmt_VERSION} - ${${ver}}) / 100")
endforeach()
set(fmt_VERSION
"${fmt_VERSION_MAJOR}.${fmt_VERSION_MINOR}.${fmt_VERSION_PATCH}")
endif()
endif()

find_library(fmt_LIBRARY NAMES fmt)

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(fmt
REQUIRED_VARS fmt_INCLUDE_DIR fmt_LIBRARY
VERSION_VAR fmt_VERSION)
mark_as_advanced(
fmt_INCLUDE_DIR
fmt_LIBRARY
fmt_VERSION_MAJOR
fmt_VERSION_MINOR
fmt_VERSION_PATCH
fmt_VERSION_STRING)

if(fmt_FOUND AND NOT (TARGET fmt::fmt))
add_library(fmt::fmt UNKNOWN IMPORTED)
set_target_properties(fmt::fmt PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${fmt_INCLUDE_DIR}"
IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
IMPORTED_LOCATION "${fmt_LIBRARY}")
endif()
Loading

0 comments on commit 327199f

Please sign in to comment.