ObjFW  Check-in [5f8ebdf8b0]

Overview
Comment:Remove fish completions

I only tried fish for a brief while and am not actively using it or
maintaining the completions.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 5f8ebdf8b04986b9944ac466654dd06cadc61d1ce7e17e804dfec6e851467773
User & Date: js on 2023-01-05 17:46:26
Other Links: manifest | tags
Context
2023-01-05
18:35
Don't use -static-libgcc on Windows check-in: b87dab1361 user: js tags: trunk
17:46
Remove fish completions check-in: 5f8ebdf8b0 user: js tags: trunk
2022-12-30
00:02
configure: Include package URL check-in: e91657d46b user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified configure.ac from [8e0fb73686] to [af30c6b6de].

︙︙
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273


		AS_IF([test x"$wiiload" != x""], [
			AC_SUBST(WRAPPER, "$wiiload")
		])
	])
])

AC_ARG_WITH(fish_completions,
	AS_HELP_STRING([--with-fish-completions],
		[install completions for the fish shell]))
AS_IF([test x"$with_fish_completions" = x""], [
	AC_CHECK_PROG(FISH, fish, fish)
	AS_IF([test x"$FISH" != x""], [with_fish_completions="yes"])
])
AS_IF([test x"$with_fish_completions" = x"yes"], [
	AC_SUBST(FISH_COMPLETIONS, fish)
])

dnl We don't call AC_PROG_CPP, but only AC_PROG_OBJCPP and set CPP to OBJCPP
dnl and add OBJCPPFLAGS to CPPFLAGS, thus we need to AC_SUBST these ourself.
AC_SUBST(CPP)
AC_SUBST(CPPFLAGS)
dnl We use the ObjC compiler as our assembler
AC_SUBST(AS, $OBJC)
AC_SUBST(ASFLAGS)








<
<
<
<
<
<
<
<
<
<
<








2249
2250
2251
2252
2253
2254
2255











2256
2257
2258
2259
2260
2261
2262


		AS_IF([test x"$wiiload" != x""], [
			AC_SUBST(WRAPPER, "$wiiload")
		])
	])
])












dnl We don't call AC_PROG_CPP, but only AC_PROG_OBJCPP and set CPP to OBJCPP
dnl and add OBJCPPFLAGS to CPPFLAGS, thus we need to AC_SUBST these ourself.
AC_SUBST(CPP)
AC_SUBST(CPPFLAGS)
dnl We use the ObjC compiler as our assembler
AC_SUBST(AS, $OBJC)
AC_SUBST(ASFLAGS)
︙︙

Modified extra.mk.in from [8e59637d10] to [44ae1c186b].

︙︙
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39

BRIDGE = @BRIDGE@
CVINCLUDE_INLINE_H = @CVINCLUDE_INLINE_H@
ENCODINGS_A = @ENCODINGS_A@
ENCODINGS_LIB_A = @ENCODINGS_LIB_A@
ENCODINGS_SRCS = @ENCODINGS_SRCS@
EXCEPTIONS_A = @EXCEPTIONS_A@
EXCEPTIONS_LIB_A = @EXCEPTIONS_LIB_A@
FISH_COMPLETIONS = @FISH_COMPLETIONS@
FORWARDING_A = @FORWARDING_A@
FORWARDING_LIB_A = @FORWARDING_LIB_A@
LIBBASES_M = @LIBBASES_M@
LIBOBJFWRT_DEP = @LIBOBJFWRT_DEP@
LIBOBJFWRT_DEP_LVL2 = @LIBOBJFWRT_DEP_LVL2@
LIBOBJFW_DEP = @LIBOBJFW_DEP@
LIBOBJFW_DEP_LVL2 = @LIBOBJFW_DEP_LVL2@








<








25
26
27
28
29
30
31

32
33
34
35
36
37
38

BRIDGE = @BRIDGE@
CVINCLUDE_INLINE_H = @CVINCLUDE_INLINE_H@
ENCODINGS_A = @ENCODINGS_A@
ENCODINGS_LIB_A = @ENCODINGS_LIB_A@
ENCODINGS_SRCS = @ENCODINGS_SRCS@
EXCEPTIONS_A = @EXCEPTIONS_A@
EXCEPTIONS_LIB_A = @EXCEPTIONS_LIB_A@

FORWARDING_A = @FORWARDING_A@
FORWARDING_LIB_A = @FORWARDING_LIB_A@
LIBBASES_M = @LIBBASES_M@
LIBOBJFWRT_DEP = @LIBOBJFWRT_DEP@
LIBOBJFWRT_DEP_LVL2 = @LIBOBJFWRT_DEP_LVL2@
LIBOBJFW_DEP = @LIBOBJFW_DEP@
LIBOBJFW_DEP_LVL2 = @LIBOBJFW_DEP_LVL2@
︙︙

Modified objfw.spec from [19477688a2] to [77fa467494].

︙︙
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158

modern terminal-based UI, etc.

%prep
%autosetup
./autogen.sh

%build
%configure OBJC=clang --disable-rpath --with-fish-completions
%make_build

%install
%make_install

%check
make -C tests run








|








144
145
146
147
148
149
150
151
152
153
154
155
156
157
158

modern terminal-based UI, etc.

%prep
%autosetup
./autogen.sh

%build
%configure OBJC=clang --disable-rpath
%make_build

%install
%make_install

%check
make -C tests run
︙︙
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195

%license LICENSE.GPLv2
%license LICENSE.GPLv3
%license LICENSE.QPL
%{_bindir}/objfw-compile
%{_bindir}/objfw-config
%{_bindir}/objfw-embed
%{_bindir}/objfw-new
%{_datadir}/fish/vendor_completions.d/objfw-compile.fish
%{_datadir}/fish/vendor_completions.d/objfw-config.fish
%{_includedir}/ObjFW
%{_libdir}/libobjfw.so

%files -n %{libobjfwrt_pkgname}
%license LICENSE.GPLv2
%license LICENSE.GPLv3
%license LICENSE.QPL








<
<








180
181
182
183
184
185
186


187
188
189
190
191
192
193

%license LICENSE.GPLv2
%license LICENSE.GPLv3
%license LICENSE.QPL
%{_bindir}/objfw-compile
%{_bindir}/objfw-config
%{_bindir}/objfw-embed
%{_bindir}/objfw-new


%{_includedir}/ObjFW
%{_libdir}/libobjfw.so

%files -n %{libobjfwrt_pkgname}
%license LICENSE.GPLv2
%license LICENSE.GPLv3
%license LICENSE.QPL
︙︙
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250

%{_libdir}/libobjfwtls.so

%files -n ofarc
%license LICENSE.GPLv2
%license LICENSE.GPLv3
%license LICENSE.QPL
%{_bindir}/ofarc
%{_datadir}/fish/vendor_completions.d/ofarc.fish
%{_datadir}/ofarc

%files -n ofdns
%license LICENSE.GPLv2
%license LICENSE.GPLv3
%license LICENSE.QPL
%{_bindir}/ofdns
%{_datadir}/fish/vendor_completions.d/ofdns.fish
%{_datadir}/ofdns

%files -n ofhash
%license LICENSE.GPLv2
%license LICENSE.GPLv3
%license LICENSE.QPL
%{_bindir}/ofhash
%{_datadir}/fish/vendor_completions.d/ofhash.fish
%{_datadir}/ofhash

%files -n ofhttp
%license LICENSE.GPLv2
%license LICENSE.GPLv3
%license LICENSE.QPL
%{_bindir}/ofhttp
%{_datadir}/fish/vendor_completions.d/ofhttp.fish
%{_datadir}/ofhttp








<







<







<







<


216
217
218
219
220
221
222

223
224
225
226
227
228
229

230
231
232
233
234
235
236

237
238
239
240
241
242
243

244

%{_libdir}/libobjfwtls.so

%files -n ofarc
%license LICENSE.GPLv2
%license LICENSE.GPLv3
%license LICENSE.QPL
%{_bindir}/ofarc

%{_datadir}/ofarc

%files -n ofdns
%license LICENSE.GPLv2
%license LICENSE.GPLv3
%license LICENSE.QPL
%{_bindir}/ofdns

%{_datadir}/ofdns

%files -n ofhash
%license LICENSE.GPLv2
%license LICENSE.GPLv3
%license LICENSE.QPL
%{_bindir}/ofhash

%{_datadir}/ofhash

%files -n ofhttp
%license LICENSE.GPLv2
%license LICENSE.GPLv3
%license LICENSE.QPL
%{_bindir}/ofhttp

%{_datadir}/ofhttp

Modified utils/Makefile from [d5d46e8aaf] to [7fdfbaff17]. 

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15

include ../extra.mk

SUBDIRS += ${OBJFW_NEW}	\
	   ${OFARC}	\
	   ${OFDNS}	\
	   ${OFHASH}	\
	   ${OFHTTP}	\
	   completions

include ../buildsys.mk

DISTCLEAN = objfw-config

install-extra: objfw-config objfw-compile objfw-embed
	for i in objfw-config objfw-compile objfw-embed; do \







|
<








1
2
3
4
5
6
7

8
9
10
11
12
13
14

include ../extra.mk

SUBDIRS += ${OBJFW_NEW}	\
	   ${OFARC}	\
	   ${OFDNS}	\
	   ${OFHASH}	\
	   ${OFHTTP}


include ../buildsys.mk

DISTCLEAN = objfw-config

install-extra: objfw-config objfw-compile objfw-embed
	for i in objfw-config objfw-compile objfw-embed; do \
︙︙

Deleted utils/completions/Makefile version [53ed45f23f]. 

1
2
3
4
5

include ../../extra.mk

SUBDIRS = ${FISH_COMPLETIONS}

include ../../buildsys.mk

<
<
<
<
<

Deleted utils/completions/fish/Makefile version [6569e87046]. 

1
2
3
4
5
6
7
8
9
10

DATA = objfw-compile.fish	\
       objfw-config.fish	\
       ofarc.fish		\
       ofdns.fish		\
       ofhash.fish		\
       ofhttp.fish

include ../../../buildsys.mk

PACKAGE_NAME = fish/vendor_completions.d

<
<
<
<
<
<
<
<
<
<

Deleted utils/completions/fish/objfw-compile.fish version [e113a8c395]. 

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28

complete -c objfw-compile -s o -x -d 'Specify the output name (not file name!)'
complete -c objfw-compile -l arc -d 'Use automatic reference counting'
complete -c objfw-compile -l lib -x -d \
    'Compile a library (with the specified version) instead of an application'
complete -c objfw-compile -l plugin \
    -d 'Compile a plugin instead of an application'
complete -c objfw-compile -l package -x -d 'Use the specified package'
complete -c objfw-compile -l builddir -r \
    -d 'Place built objects into the specified directory'
complete -c objfw-compile -s D -x -d 'Pass the specified define to the compiler'
complete -c objfw-compile -o framework -x \
    -d 'Pass the specified -framework argument to the linker (macOS / iOS only)'
# -f* cannot be represented.
complete -c objfw-compile -s F -x \
    -d 'Pass the specified -F flag to the linker (macOS / iOS only)'
# -g* cannot be represented.
complete -c objfw-compile -s I -x \
    -d 'Pass the specified -I flag to the compiler'
complete -c objfw-compile -s l -x -d 'Pass the specified -l flag to the linker'
complete -c objfw-compile -s L -x -d 'Pass the specified -L flag to the linker'
# -m* cannot be represented.
# -O* cannot be represented.
complete -c objfw-compile -o pthread \
    -d 'Pass -pthread to the compiler and linker'
# -std=* cannot be represented.
# -Wl,* cannot be represented.
# -W* cannot be represented.
complete -c objfw-compile -l help -d 'Show this help'

<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<

Deleted utils/completions/fish/objfw-config.fish version [a2dae654a7]. 

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33

complete -c objfw-config -l all -d 'Outputs all flags + libs'
complete -c objfw-config -l arc -d 'Outputs the required OBJCFLAGS to use ARC'
complete -c objfw-config -l cflags -d 'Outputs the required CFLAGS'
complete -c objfw-config -l cppflags -d 'Outputs the required CPPFLAGS'
complete -c objfw-config -l cxxflags -d 'Outputs the required CXXFLAGS'
complete -c objfw-config -l framework-libs \
    -d 'Outputs the required LIBS, preferring frameworks'
complete -c objfw-config -l help -d 'Print help'
complete -c objfw-config -l ldflags -d 'Outputs the required LDFLAGS'
complete -c objfw-config -l libs -d 'Outputs the required LIBS'
complete -c objfw-config -l lib-cflags \
    -d 'Outputs CFLAGS for building a library'
complete -c objfw-config -l lib-ldflags \
    -d 'Outputs LDFLAGS for building a library'
complete -c objfw-config -l lib-prefix -d 'Outputs the prefix for libraries'
complete -c objfw-config -l lib-suffix -d 'Outputs the suffix for libraries'
complete -c objfw-config -l objc -d 'Outputs the OBJC used to compile ObjFW'
complete -c objfw-config -l objcflags -d 'Outputs the required OBJCFLAGS'
complete -c objfw-config -l package -x \
    -d 'Additionally outputs the flags for the specified package'
complete -c objfw-config -l packages-dir \
    -d 'Outputs the directory where flags for packages are stored'
complete -c objfw-config -l plugin-cflags \
    -d 'Outputs CFLAGS for building a plugin'
complete -c objfw-config -l plugin-ldflags \
    -d 'Outputs LDFLAGS for building a plugin'
complete -c objfw-config -l plugin-suffix -d 'Outputs the suffix for plugins'
complete -c objfw-config -l prog-suffix -d 'Outputs the suffix for binaries'
complete -c objfw-config -l reexport -d 'Outputs LDFLAGS to reexport ObjFW'
complete -c objfw-config -l rpath -d 'Outputs LDFLAGS for using rpath'
complete -c objfw-config -l static-libs \
    -d 'Outputs the required LIBS to link ObjFW statically'
complete -c objfw-config -l version -d 'Outputs the installed version'

<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<

Deleted utils/completions/fish/ofarc.fish version [1ed287a4cf]. 

1
2
3
4
5
6
7
8
9
10
11
12
13
14

complete -c ofarc -s a -l append -d 'Append to archive'
complete -c ofarc -s c -l create -d 'Create archive'
complete -c ofarc -s C -l directory -r -d 'Extract into the specified directory'
complete -c ofarc -s E -l encoding -x \
    -d 'The encoding used by the archive (only tar files)'
complete -c ofarc -s f -l force -d 'Force / overwrite files'
complete -c ofarc -s h -l help -d 'Show help'
complete -c ofarc -s l -l list -d 'List all files in the archive'
complete -c ofarc -s n -l no-clobber -d 'Never overwrite files'
complete -c ofarc -s p -l print -d 'Print one or more files from the archive'
complete -c ofarc -s q -l quiet -d 'Quiet mode (no output, except errors)'
complete -c ofarc -s t -l type -x -a 'gz lha tar tgz zip' -d 'Archive type'
complete -c ofarc -s v -l verbose -d 'Verbose output for file list'
complete -c ofarc -s x -l extract -d 'Extract files'

<
<
<
<
<
<
<
<
<
<
<
<
<
<

Deleted utils/completions/fish/ofdns.fish version [5080d1ffbb]. 

1
2
3
4
5

complete -c ofdns -s c -l class -x -d 'The DNS class to query (defaults to IN)'
complete -c ofdns -s h -l help -d 'Show help'
complete -c ofdns -s s -l server -x -d 'The server to query'
complete -c ofdns -s t -l type -x \
    -d 'The record type to query (defaults to ALL, can be repeated)'

<
<
<
<
<

Deleted utils/completions/fish/ofhash.fish version [ffdc6cdbcf]. 

1
2
3
4
5
6
7

complete -c ofhash --long-option md5
complete -c ofhash --long-option ripemd160
complete -c ofhash --long-option sha1
complete -c ofhash --long-option sha224
complete -c ofhash --long-option sha256
complete -c ofhash --long-option sha384
complete -c ofhash --long-option sha256

<
<
<
<
<
<
<

Deleted utils/completions/fish/ofhttp.fish version [99fd9b7109]. 

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15

complete -c ofhttp -x
complete -c ofhttp -s b -l body -r -d 'Specify the file to send as body'
complete -c ofhttp -s c -l continue -d 'Continue download of existing file'
complete -c ofhttp -s f -l force -d 'Force / overwrite existing file'
complete -c ofhttp -s h -l help -d 'Show help'
complete -c ofhttp -s H -l header -x -d 'Add a header (e.g. X-Foo:Bar)'
complete -c ofhttp -s m -l method -x -d 'Set the method of the HTTP request'
complete -c ofhttp -s o -l output -r -d 'Specify output file name'
complete -c ofhttp -s O -l detect-filename \
    -d 'Do a HEAD request to detect the file name'
complete -c ofhttp -s P -l proxy -x -d 'Specify SOCKS5 proxy'
complete -c ofhttp -s q -l quiet -d 'Quiet mode (no output, except errors)'
complete -c ofhttp -s v -l verbose -d 'Verbose mode (print headers)'
complete -c ofhttp -l insecure \
    -d 'Ignore TLS errors and allow insecure redirects'

<
<
<
<
<
<
<
<
<
<
<
<
<
<
<