debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Automate versioning for CDE, set current version to 2.4.0b

Browse Source 
Previously in the imake world, changing the CDE version required hand
editing a handful of files.

This commit makes these files into ".in" files.  configure.ac now
holds CDE version information -- both in the AC_INIT() call and in the
CDE_VERSION_* variables a few lines down.

Changing the CDE version now involves editing those two locations in
configure.ac only.

Thereafter, a configure run will replace version information in the
following files with the current CDE version:

copyright
doc/common/help/HELPEnt.sgm
include/Dt/Dt.h
lib/tt/bin/ttauth/ttauth.man

This also causes a catch-22 problem with ToolTalk.  So the
tooltalk.inc file is gone and the relevant TT Makefiles have been
modified to set and define the TT version in those Makefiles that
actually use it.
This commit is contained in:
Jon Trulson
2021-12-13 11:46:25 -07:00
parent a2d3491150
commit a5a2d937cb
24 changed files with 61 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cde/lib/tt/bin/dbck/Makefile.am
View File

@@ -1,6 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
include ../../tooltalk.inc
TT_VERSION = "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
bin_PROGRAMS = ttdbck

3
cde/lib/tt/bin/scripts/Makefile.am
View File

@@ -1,6 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
include ../../tooltalk.inc
TT_VERSION = "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
noinst_SCRIPTS = ttce2xdr
BUILT_SOURCES = ttce2xdr

3
cde/lib/tt/bin/shell/Makefile.am
View File

@@ -1,6 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
include ../../tooltalk.inc
TT_VERSION = "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
bin_PROGRAMS = ttmv ttrm ttcp ttrmdir

3
cde/lib/tt/bin/tt_type_comp/Makefile.am
View File

@@ -1,6 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
include ../../tooltalk.inc
TT_VERSION = "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
BUILT_SOURCES = mp_types_gram.h
CLEANFILES = mp_types_gram.h

2
cde/lib/tt/bin/ttauth/ttauth.man → cde/lib/tt/bin/ttauth/ttauth.man.in
View File

@@ -18,7 +18,7 @@
.\" not be used in advertising or otherwise to promote the sale, use or
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.TH TTAUTH 1 "Release 2.4.0a" "CDE"
.TH TTAUTH 1 "Release @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@" "CDE"
.SH NAME
ttauth \- ToolTalk authority file utility
.SH SYNOPSIS

3
cde/lib/tt/bin/ttdbserverd/Makefile.am
View File

@@ -1,6 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
include ../../tooltalk.inc
TT_VERSION = "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
bin_PROGRAMS = rpc.ttdbserver

3
cde/lib/tt/bin/ttsession/Makefile.am
View File

@@ -1,6 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
include ../../tooltalk.inc
TT_VERSION = "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
bin_PROGRAMS = ttsession

3
cde/lib/tt/bin/tttar/Makefile.am
View File

@@ -1,6 +1,7 @@
MAINTAINERCLENAFILES = Makefile.in
include ../../tooltalk.inc
TT_VERSION = "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
bin_PROGRAMS = tttar

2
cde/lib/tt/bin/tttrace/Makefile.am
View File

@@ -1,7 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
include ../../tooltalk.inc
bin_PROGRAMS = tttrace
tttrace_CXXFLAGS = -I../../lib

1
cde/lib/tt/lib/Makefile.am
View File

@@ -2,7 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = api db mp util tttk
include ../tooltalk.inc
lib_LTLIBRARIES = libtt.la

2
cde/lib/tt/lib/api/c/Makefile.am
View File

@@ -2,8 +2,6 @@ ttdir = ${includedir}/Tt
MAINTAINERCLEANFILES = Makefile.in
include ../../../tooltalk.inc
noinst_LTLIBRARIES = libapi.la
libapi_la_CXXFLAGS = -I../../../lib

2
cde/lib/tt/lib/api/dnd/Makefile.am
View File

@@ -1,7 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
include ../../../tooltalk.inc
noinst_LTLIBRARIES = libdnd.la
libdnd_la_CFLAGS = -I../..

2
cde/lib/tt/lib/db/Makefile.am
View File

@@ -1,7 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
include ../../tooltalk.inc
noinst_LTLIBRARIES = libdb.la
libdb_la_CXXFLAGS = -I../../lib -I../../mini_isam

2
cde/lib/tt/lib/mp/Makefile.am
View File

@@ -1,7 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
include ../../tooltalk.inc
noinst_LTLIBRARIES = libmp.la
libmp_la_CXXFLAGS = -I../../lib -I../../mini_isam

5
cde/lib/tt/lib/tttk/Makefile.am
View File

@@ -1,8 +1,7 @@
headerdir = ${prefix}/share/include/Tt
MAINTAINERCLEANFILES = Makefile.in
include ../../tooltalk.inc
TT_VERSION = "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
noinst_LTLIBRARIES = libtttk.la

3
cde/lib/tt/lib/util/Makefile.am
View File

@@ -1,6 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
include ../../tooltalk.inc
TT_VERSION = "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
noinst_LTLIBRARIES = libutil.la

3
cde/lib/tt/mini_isam/Makefile.am
View File

@@ -1,6 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
include ../tooltalk.inc
TT_VERSION = "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
noinst_LIBRARIES= libisam.a

2
cde/lib/tt/slib/Makefile.am
View File

@@ -1,7 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
include ../tooltalk.inc
noinst_LIBRARIES = libstt.a
libstt_a_CXXFLAGS = $(TIRPC_DEFINES) -I../lib

13
cde/lib/tt/tooltalk.inc
View File

@@ -1,13 +0,0 @@
# This file is imbedded near the top of every ToolTalk Imakefile.
# It contains definitions and redefinitions that are common to all
# of ToolTalk but which aren't referred to anywhere else in the
# build.
# It should match tooltalk.tmpl in terms of definitions...
# TT_VERSION defines the version string which is imbedded in all the
# binaries and shipped libraries.
TT_VERSION = "CDE Version 2.4.0a"
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"