Skip to content

Commit 86bd92b

Browse files
johnsonjhjohnsonjh
committed
Update documentation, install man pages, bump to version 7.0.3
1 parent 52576a5 commit 86bd92b

File tree

12 files changed

+64
-1485
lines changed

12 files changed

+64
-1485
lines changed

‎ChangeLog‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
OpenVi 7.0.2 -> OpenVi 7.0.3 (Unreleased): Wed Jan 26 04:51:48 2022
1+
OpenVi 7.0.2 -> OpenVi 7.0.3: Wed Jan 26 08:31:28 2022
2+
+ GNUmakefile "install" targets now install documentation (man pages)
23
+ Remove 'docs/internals/cscope.NOTES' and documentation references
34
+ General GNUmakefile, portability, and code readability improvements
45
+ Relicense new contributions under the same 3-clause BSD license

‎GNUmakefile‎

Lines changed: 59 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -255,57 +255,57 @@ endif # DEBUG
255255

256256
###############################################################################
257257

258-
all: vi ex view
258+
all: vi ex view docs/USD.doc/vi.man/vi.1
259259

260260
###############################################################################
261261

262262
ex/ex_def.h: ex/ex.awk ex/ex_cmd.c
263-
$(RMF) ./ex/ex_def.h; \
264-
$(AWK) -f ./ex/ex.awk ./ex/ex_cmd.c \
265-
> ./ex/ex_def.h && $(TEST) -f ./ex/ex_def.h
263+
$(RMF) "./ex/ex_def.h"; \
264+
$(AWK) -f "./ex/ex.awk" "./ex/ex_cmd.c" \
265+
> "./ex/ex_def.h" && $(TEST) -f "./ex/ex_def.h"
266266

267267
###############################################################################
268268

269269
common/options_def.h: common/options.awk common/options.c ex/ex_def.h
270-
$(RMF) ./common/options_def.h; \
271-
$(AWK) -f ./common/options.awk ./common/options.c \
272-
> ./common/options_def.h && $(TEST) -f ./common/options_def.h
270+
$(RMF) "./common/options_def.h"; \
271+
$(AWK) -f "./common/options.awk" "./common/options.c" \
272+
> "./common/options_def.h" && $(TEST) -f "./common/options_def.h"
273273

274274
###############################################################################
275275

276276
clean distclean realclean mostlyclean:
277-
$(RMF) ./common/options_def.h ./ex/ex_def.h
277+
$(RMF) "./common/options_def.h" "./ex/ex_def.h"
278278
$(RMF) $(OBJS)
279279
$(RMF) $(DEPZ)
280-
$(TEST) -f ./bin/vi && $(RMF) ./bin/vi || $(TRUE)
281-
$(TEST) -e ./bin/ex && $(RMF) ./bin/ex || $(TRUE)
282-
$(TEST) -h ./bin/ex && $(RMF) ./bin/ex || $(TRUE)
283-
$(TEST) -e ./bin/view && $(RMF) ./bin/view || $(TRUE)
284-
$(TEST) -h ./bin/view && $(RMF) ./bin/view || $(TRUE)
285-
$(TEST) -d ./bin && $(RMDIR) ./bin || $(TRUE)
286-
-@$(TEST) -d ./bin && $(PRINTF) '%s\n' \
280+
$(TEST) -f "./bin/vi" && $(RMF) "./bin/vi" || $(TRUE)
281+
$(TEST) -e "./bin/ex" && $(RMF) "./bin/ex" || $(TRUE)
282+
$(TEST) -h "./bin/ex" && $(RMF) "./bin/ex" || $(TRUE)
283+
$(TEST) -e "./bin/view" && $(RMF) "./bin/view" || $(TRUE)
284+
$(TEST) -h "./bin/view" && $(RMF) "./bin/view" || $(TRUE)
285+
$(TEST) -d "./bin" && $(RMDIR) "./bin" || $(TRUE)
286+
-@$(TEST) -d "./bin" && $(PRINTF) '%s\n' \
287287
"WARNING: Build directory './bin' could not be removed." || $(TRUE)
288288

289289
###############################################################################
290290

291291
maintainer-clean:
292-
@$(PRINTF) '%s\n' \
292+
@$(PRINTF) '%s\n' \
293293
'WARNING: This command is intended for maintainer use only!'
294-
@$(PRINTF) '%s\n' \
294+
@$(PRINTF) '%s\n' \
295295
'It may delete files that require special tools to rebuild.'
296296
@$(SLEEP) 5
297297
$(MAKE) -C "." "distclean"
298298

299299
###############################################################################
300300

301301
%.o: %.c common/options_def.h ex/ex_def.h
302-
$(CC) -c -o $@ $< $(CFLAGS)
302+
$(CC) -c -o "$@" "$<" $(CFLAGS)
303303

304304
###############################################################################
305305

306306
bin/vi: $(OBJS)
307-
$(TEST) -d ./bin || $(MKDIR) ./bin
308-
$(CC) -o $@ $^ $(LDFLAGS)
307+
$(TEST) -d "./bin" || $(MKDIR) "./bin"
308+
$(CC) -o "$@" $^ $(LDFLAGS)
309309

310310
.PHONY: vi
311311
vi: bin/vi
@@ -314,7 +314,7 @@ vi: bin/vi
314314
###############################################################################
315315

316316
bin/ex: vi
317-
$(LNS) vi ./bin/ex
317+
$(LNS) "vi" "./bin/ex"
318318

319319
.PHONY: ex
320320
ex: bin/ex
@@ -323,53 +323,62 @@ ex: bin/ex
323323
###############################################################################
324324

325325
bin/view: vi
326-
$(LNS) vi ./bin/view
326+
$(LNS) "vi" "./bin/view"
327327

328328
.PHONY: view
329329
view: bin/view
330330
@$(TRUE)
331331

332332
###############################################################################
333333

334-
install: vi ex view virecover
335-
$(TEST) -d /tmp/vi.recover || \
336-
$(MKDIR) /tmp/vi.recover
337-
$(TEST) -d /tmp/vi.recover && \
338-
$(CHOWN) $(IUSGR) /tmp/vi.recover && \
339-
$(CHMOD) 1777 /tmp/vi.recover
340-
$(TEST) -d $(PREFIX)/bin || \
341-
$(MKDIR) $(PREFIX)/bin
342-
$(TEST) -d $(PREFIX)/libexec || \
343-
$(MKDIR) $(PREFIX)/libexec
344-
$(CP) ./bin/vi $(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX) && \
345-
$(CHOWN) $(IUSGR) $(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX) && \
346-
$(CHMOD) $(IPERM) $(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)
347-
$(TEST) -x $(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX) && \
348-
$(LNS) $(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX) \
349-
$(PREFIX)/bin/$(BINPREFIX)ex$(BINSUFFIX)
350-
$(TEST) -x $(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX) && \
351-
$(LNS) $(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX) \
352-
$(PREFIX)/bin/$(BINPREFIX)view$(BINSUFFIX)
353-
$(CP) ./build/virecover \
354-
$(PREFIX)/libexec/$(BINPREFIX)vi.recover$(BINSUFFIX) && \
355-
$(CHMOD) $(IPERM) $(PREFIX)/libexec/$(BINPREFIX)vi.recover$(BINSUFFIX)
334+
install: vi ex view virecover docs/USD.doc/vi.man/vi.1
335+
$(TEST) -d "/tmp/vi.recover" || \
336+
$(MKDIR) "/tmp/vi.recover"
337+
$(TEST) -d "/tmp/vi.recover" && \
338+
$(CHOWN) "$(IUSGR)" "/tmp/vi.recover" && \
339+
$(CHMOD) "1777" "/tmp/vi.recover"
340+
$(TEST) -d "$(PREFIX)/bin" || \
341+
$(MKDIR) "$(PREFIX)/bin"
342+
$(TEST) -d "$(PREFIX)/libexec" || \
343+
$(MKDIR) "$(PREFIX)/libexec"
344+
$(TEST) -d "$(PREFIX)/man/man1" && \
345+
$(MKDIR) "$(PREFIX)/man/man1"
346+
$(CP) "./bin/vi" "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)" && \
347+
$(CHOWN) "$(IUSGR)" "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)" && \
348+
$(CHMOD) "$(IPERM)" "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)"
349+
$(TEST) -x "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)" && \
350+
$(LNS) "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)" \
351+
"$(PREFIX)/bin/$(BINPREFIX)ex$(BINSUFFIX)"
352+
$(TEST) -x "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)" && \
353+
$(LNS) "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)" \
354+
"$(PREFIX)/bin/$(BINPREFIX)view$(BINSUFFIX)"
355+
$(CP) "./build/virecover" \
356+
"$(PREFIX)/libexec/$(BINPREFIX)vi.recover$(BINSUFFIX)" && \
357+
$(CHMOD) "$(IPERM)" \
358+
"$(PREFIX)/libexec/$(BINPREFIX)vi.recover$(BINSUFFIX)"
359+
$(CP) "docs/USD.doc/vi.man/vi.1" \
360+
"$(PREFIX)/man/man1/$(BINPREFIX)vi$(BINSUFFIX).1" && \
361+
$(LNS) "$(PREFIX)/man/man1/$(BINPREFIX)vi$(BINSUFFIX).1" \
362+
"$(PREFIX)/man/man1/$(BINPREFIX)view$(BINSUFFIX).1" && \
363+
$(LNS) "$(PREFIX)/man/man1/$(BINPREFIX)vi$(BINSUFFIX).1" \
364+
"$(PREFIX)/man/man1/$(BINPREFIX)ex$(BINSUFFIX).1"
356365

357366
###############################################################################
358367

359368
install-strip: install
360-
$(STRIP) $(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)
369+
$(STRIP) "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)"
361370

362371
###############################################################################
363372

364373
strip: vi
365-
$(STRIP) ./bin/vi
374+
$(STRIP) "./bin/vi"
366375

367376
###############################################################################
368377

369378
uninstall:
370-
$(RMF) $(PREFIX)/libexec/$(BINPREFIX)vi.recover$(BINSUFFIX)
371-
$(RMF) $(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)
372-
$(RMF) $(PREFIX)/bin/$(BINPREFIX)ex$(BINSUFFIX)
373-
$(RMF) $(PREFIX)/bin/$(BINPREFIX)view$(BINSUFFIX)
379+
$(RMF) "$(PREFIX)/libexec/$(BINPREFIX)vi.recover$(BINSUFFIX)"
380+
$(RMF) "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)"
381+
$(RMF) "$(PREFIX)/bin/$(BINPREFIX)ex$(BINSUFFIX)"
382+
$(RMF) "$(PREFIX)/bin/$(BINPREFIX)view$(BINSUFFIX)"
374383

375384
###############################################################################

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994
1+
Copyright (c) 1980, 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994
22
The Regents of the University of California
33
Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
44
Keith Bostic

0 commit comments

Comments
 (0)