From be8cf523e9673be11b1c33ebfe22698ca1cb2b23 Mon Sep 17 00:00:00 2001 From: Martin Dvorak Date: Mon, 30 Jul 2018 18:29:42 +0200 Subject: [PATCH] HSTR can be build w/ qmake, polishing copyright years. --- .gitignore | 1 + .travis.yml | 16 +++++++++++- PKGBUILD | 2 +- configure.ac | 2 +- hstr.pro | 46 +++++++++++++++++++++++++++++++++++ pad.xml | 2 +- src/hashset.c | 2 +- src/hstr.c | 3 ++- src/hstr_blacklist.c | 2 +- src/hstr_curses.c | 2 +- src/hstr_favorites.c | 2 +- src/hstr_history.c | 2 +- src/hstr_regexp.c | 2 +- src/hstr_utils.c | 2 +- src/include/hashset.h | 2 +- src/include/hstr_blacklist.h | 2 +- src/include/hstr_curses.h | 2 +- src/include/hstr_favorites.h | 2 +- src/include/hstr_history.h | 2 +- src/include/hstr_regexp.h | 2 +- src/include/hstr_utils.h | 2 +- src/include/radixsort.h | 2 +- src/radixsort.c | 2 +- tests/src/test_args.c | 2 +- tests/src/test_curses_keyb.c | 2 +- tests/src/test_escape_chars.c | 2 +- tests/src/test_favorites.c | 2 +- tests/src/test_getopt.c | 2 +- tests/src/test_hashset.c | 2 +- tests/src/test_keyb.c | 2 +- tests/src/test_ranking.c | 2 +- tests/src/test_regexp.c | 2 +- tests/src/test_utf8.c | 2 +- 33 files changed, 93 insertions(+), 31 deletions(-) create mode 100644 hstr.pro diff --git a/.gitignore b/.gitignore index f94a913..b0fced7 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ Makefile Makefile.in *.o *.snap +hstr.pro.user diff --git a/.travis.yml b/.travis.yml index dcffe14..0a03034 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,18 @@ -# .travis.yml for HSTR +# .travis.yml Travis CI configuration file for HSTR +# +# Copyright (C) 2014-2018 Martin Dvorak +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. language: c diff --git a/PKGBUILD b/PKGBUILD index 128e817..ae33952 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Filip SzymaƄski pkgname=hstr -pkgver=1.25 +pkgver=1.27 pkgrel=1 pkgdesc="A command line utility that brings improved BASH command completion from the history. It aims to make completion easier and more efficient than Ctrl-r." arch=('any') diff --git a/configure.ac b/configure.ac index 2141b75..c439eb5 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ AC_PREREQ([2.69]) -AC_INIT(hh, 1.25, martin.dvorak@mindforger.com) +AC_INIT(hh, 1.27.0, martin.dvorak@mindforger.com) AC_CONFIG_FILES([Makefile src/Makefile man/Makefile]) # Checks for src dir existence. diff --git a/hstr.pro b/hstr.pro new file mode 100644 index 0000000..fd3dcb5 --- /dev/null +++ b/hstr.pro @@ -0,0 +1,46 @@ +# hstr.pro Qt project file for HSTR +# +# Copyright (C) 2014-2018 Martin Dvorak +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +TEMPLATE = app +CONFIG += console +CONFIG -= app_bundle +CONFIG -= qt + +QMAKE_CXX = ccache g++ + +# -L where to look for library, -l link the library +LIBS += -lm -lreadline -lncursesw + +SOURCES += \ + src/hashset.c \ + src/hstr_blacklist.c \ + src/hstr_curses.c \ + src/hstr_favorites.c \ + src/hstr_history.c \ + src/hstr_regexp.c \ + src/hstr_utils.c \ + src/hstr.c \ + src/radixsort.c + +HEADERS += \ + src/include/hashset.h \ + src/include/hstr_blacklist.h \ + src/include/hstr_curses.h \ + src/include/hstr_favorites.h \ + src/include/hstr_history.h \ + src/include/hstr_regexp.h \ + src/include/hstr_utils.h \ + src/include/radixsort.h diff --git a/pad.xml b/pad.xml index 869dab5..deff455 100644 --- a/pad.xml +++ b/pad.xml @@ -2,7 +2,7 @@