File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1+ #! /usr/bin/env bash
2+
3+ git_root () {
4+ git rev-parse --show-toplevel 2> /dev/null
5+ }
6+
7+ git_head_commit () {
8+ git rev-parse --short=12 HEAD
9+ }
10+
11+ git_head_tag () {
12+ echo -n $( git describe --exact-match HEAD 2> /dev/null)
13+ }
Original file line number Diff line number Diff line change 1+ #! /usr/bin/env bash
2+
3+ # Based on realpath.sh written by Michael Kropat
4+ # Found at: https://github.com/mkropat/sh-realpath/blob/65512368b8155b176b67122aa395ac580d9acc5b/realpath.sh
5+
6+ bash_realpath () {
7+ canonicalize_path " $( resolve_symlinks " $1 " ) "
8+ }
9+
10+ resolve_symlinks () {
11+ _resolve_symlinks " $1 "
12+ }
13+
14+ _resolve_symlinks () {
15+ _assert_no_path_cycles " $@ " || return
16+
17+ local dir_context path
18+ if path=$( readlink -- " $1 " ) ; then
19+ dir_context=$( dirname -- " $1 " )
20+ _resolve_symlinks " $( _prepend_dir_context_if_necessary " $dir_context " " $path " ) " " $@ "
21+ else
22+ printf ' %s\n' " $1 "
23+ fi
24+ }
25+
26+ _prepend_dir_context_if_necessary () {
27+ if [ " $1 " = . ]; then
28+ printf ' %s\n' " $2 "
29+ else
30+ _prepend_path_if_relative " $1 " " $2 "
31+ fi
32+ }
33+
34+ _prepend_path_if_relative () {
35+ case " $2 " in
36+ /* ) printf ' %s\n' " $2 " ;;
37+ * ) printf ' %s\n' " $1 /$2 " ;;
38+ esac
39+ }
40+
41+ _assert_no_path_cycles () {
42+ local target path
43+
44+ target=$1
45+ shift
46+
47+ for path in " $@ " ; do
48+ if [ " $path " = " $target " ]; then
49+ return 1
50+ fi
51+ done
52+ }
53+
54+ canonicalize_path () {
55+ if [ -d " $1 " ]; then
56+ _canonicalize_dir_path " $1 "
57+ else
58+ _canonicalize_file_path " $1 "
59+ fi
60+ }
61+
62+ _canonicalize_dir_path () {
63+ (cd " $1 " 2> /dev/null && pwd -P)
64+ }
65+
66+ _canonicalize_file_path () {
67+ local dir file
68+ dir=$( dirname -- " $1 " )
69+ file=$( basename -- " $1 " )
70+ (cd " $dir " 2> /dev/null && printf ' %s/%s\n' " $( pwd -P) " " $file " )
71+ }
Original file line number Diff line number Diff line change @@ -8,7 +8,6 @@ set(QT_COMPONENTS
88 Gui
99 Network
1010 Svg
11- WebSockets
1211 SvgWidgets
1312)
1413
@@ -140,7 +139,6 @@ target_include_directories(feather PUBLIC
140139 ${QtSvg_INCLUDE_DIRS}
141140 ${QtSvgWidgets_INCLUDE_DIRS}
142141 ${QtXml_INCLUDE_DIRS}
143- ${QtWebSockets_INCLUDE_DIRS}
144142 ${LIBZIP_INCLUDE_DIRS}
145143 ${ZLIB_INCLUDE_DIRS}
146144 ${POLYSEED_INCLUDE_DIR}
@@ -195,7 +193,6 @@ target_compile_definitions(feather
195193 ${QtSvg_DEFINITIONS}
196194 ${QtSvgWidgets_DEFINITIONS}
197195 ${QtXml_DEFINITIONS}
198- ${QtWebSockets_DEFINITIONS}
199196)
200197
201198if (WITH_SCANNER)
@@ -223,7 +220,6 @@ target_link_libraries(feather PRIVATE
223220 Qt::Gui
224221 Qt::Network
225222 Qt::Svg
226- Qt::WebSockets
227223 Qt::SvgWidgets
228224 Threads::Threads
229225 ${QRENCODE_LIBRARY}
You can’t perform that action at this time.
0 commit comments