From a5a2d937cbe5a01d7251e2a0508accd0d15bbc51 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Mon, 13 Dec 2021 11:46:25 -0700 Subject: [PATCH] Automate versioning for CDE, set current version to 2.4.0b 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. --- cde/.gitignore | 7 ++++ cde/configure.ac | 38 +++++++++++++------ cde/{copyright => copyright.in} | 2 +- .../help/{HELPEnt.sgm => HELPEnt.sgm.in} | 4 +- cde/include/Dt/{Dt.h => Dt.h.in} | 8 ++-- cde/lib/tt/bin/dbck/Makefile.am | 3 +- cde/lib/tt/bin/scripts/Makefile.am | 3 +- cde/lib/tt/bin/shell/Makefile.am | 3 +- cde/lib/tt/bin/tt_type_comp/Makefile.am | 3 +- .../bin/ttauth/{ttauth.man => ttauth.man.in} | 2 +- cde/lib/tt/bin/ttdbserverd/Makefile.am | 3 +- cde/lib/tt/bin/ttsession/Makefile.am | 3 +- cde/lib/tt/bin/tttar/Makefile.am | 3 +- cde/lib/tt/bin/tttrace/Makefile.am | 2 - cde/lib/tt/lib/Makefile.am | 1 - cde/lib/tt/lib/api/c/Makefile.am | 2 - cde/lib/tt/lib/api/dnd/Makefile.am | 2 - cde/lib/tt/lib/db/Makefile.am | 2 - cde/lib/tt/lib/mp/Makefile.am | 2 - cde/lib/tt/lib/tttk/Makefile.am | 5 +-- cde/lib/tt/lib/util/Makefile.am | 3 +- cde/lib/tt/mini_isam/Makefile.am | 3 +- cde/lib/tt/slib/Makefile.am | 2 - cde/lib/tt/tooltalk.inc | 13 ------- 24 files changed, 61 insertions(+), 58 deletions(-) rename cde/{copyright => copyright.in} (70%) rename cde/doc/common/help/{HELPEnt.sgm => HELPEnt.sgm.in} (87%) rename cde/include/Dt/{Dt.h => Dt.h.in} (89%) rename cde/lib/tt/bin/ttauth/{ttauth.man => ttauth.man.in} (98%) delete mode 100644 cde/lib/tt/tooltalk.inc diff --git a/cde/.gitignore b/cde/.gitignore index 4bbcdacad..0adc5ca49 100644 --- a/cde/.gitignore +++ b/cde/.gitignore @@ -2314,3 +2314,10 @@ programs/localized/util/MsgCat.c programs/fontaliases/linux/en_US.UTF-8/fonts.alias programs/fontaliases/linux/en_US.UTF-8/mk_fonts_alias programs/fontaliases/linux/en_US.UTF-8/test_fonts_alias + +# files that are modified by configure for version information +copyright +doc/common/help/HELPEnt.sgm +include/Dt/Dt.h +lib/tt/bin/ttauth/ttauth.man +lib/tt/tooltalk.inc diff --git a/cde/configure.ac b/cde/configure.ac index 55934f535..be5ea149a 100644 --- a/cde/configure.ac +++ b/cde/configure.ac @@ -1,7 +1,27 @@ -AC_INIT([cde-desktop], [2.4.0a], [https://sourceforge.net/projects/cdesktopenv]) +dnl When changing the version below, also change the CDE_VERSION_* macros +dnl to match further below +AC_INIT([Common Desktop Environment], + [2.4.0b], + [https://sourceforge.net/projects/cdesktopenv], + [cde], + [https://sourceforge.net/projects/cdesktopenv]) AC_CONFIG_HEADERS([include/autotools_config.h]) AC_CONFIG_MACRO_DIRS([m4]) -AM_INIT_AUTOMAKE([foreign subdir-objects]) +AM_INIT_AUTOMAKE([foreign subdir-objects no-define]) + +dnl global CDE versioning + +CDE_VERSION_MAJOR=2 +CDE_VERSION_MINOR=4 +CDE_VERSION_MICRO=0 +dnl this is blank for a release, or contains an alpha character to indicate a +dnl dev release. +CDE_VERSION_DEV=b + +AC_SUBST(CDE_VERSION_MAJOR) +AC_SUBST(CDE_VERSION_MINOR) +AC_SUBST(CDE_VERSION_MICRO) +AC_SUBST(CDE_VERSION_DEV) dnl These must be up here for the compiler search list to actually work AC_PROG_CC([cc gcc clang]) @@ -20,16 +40,6 @@ dnl AC_PREREQ() AC_CANONICAL_HOST AC_CANONICAL_BUILD -dnl global CDE versioning - -CDE_VERSION_MAJOR=2 -CDE_VERSION_MINOR=3 -CDE_VERSION_MICRO=0 - -AC_SUBST(CDE_VERSION_MAJOR) -AC_SUBST(CDE_VERSION_MINOR) -AC_SUBST(CDE_VERSION_MICRO) - dnl SOURCE_DEFINES - start with CDE project default SOURCE_CPP_DEFINES="-DANSICPP -DMULTIBYTE -DNLS16" @@ -848,6 +858,10 @@ doc/it_IT.ISO8859-1/help/Makefile include/Makefile +copyright +doc/common/help/HELPEnt.sgm +include/Dt/Dt.h +lib/tt/bin/ttauth/ttauth.man ]) AC_OUTPUT diff --git a/cde/copyright b/cde/copyright.in similarity index 70% rename from cde/copyright rename to cde/copyright.in index a135c2d00..d280e349f 100644 --- a/cde/copyright +++ b/cde/copyright.in @@ -1,7 +1,7 @@ - Common Desktop Environment Version 2.4.0a + Common Desktop Environment Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@ (c) Copyright 1993-2012 The Open Group (c) Copyright 2012-2022 CDE Project contributors, see CONTRIBUTORS for details diff --git a/cde/doc/common/help/HELPEnt.sgm b/cde/doc/common/help/HELPEnt.sgm.in similarity index 87% rename from cde/doc/common/help/HELPEnt.sgm rename to cde/doc/common/help/HELPEnt.sgm.in index b1bf3a87b..4a34bb1ac 100644 --- a/cde/doc/common/help/HELPEnt.sgm +++ b/cde/doc/common/help/HELPEnt.sgm.in @@ -1,8 +1,8 @@ -Common Desktop Environment 2.4.0a, +Common Desktop Environment @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@, © Copyright 1993-2012 The Open Group -© Copyright 2012-2020 CDE Project contributors, see CONTRIBUTORS for details +© Copyright 2012-2023 CDE Project contributors, see CONTRIBUTORS for details Project Website: http://cdesktopenv.sourceforge.net/ diff --git a/cde/include/Dt/Dt.h b/cde/include/Dt/Dt.h.in similarity index 89% rename from cde/include/Dt/Dt.h rename to cde/include/Dt/Dt.h.in index 3dfbfa23d..4e5cf4e7e 100644 --- a/cde/include/Dt/Dt.h +++ b/cde/include/Dt/Dt.h.in @@ -50,15 +50,15 @@ extern "C" { /* CDE Version information */ -#define DtVERSION 2 -#define DtREVISION 4 -#define DtUPDATE_LEVEL 0 +#define DtVERSION @CDE_VERSION_MAJOR@ +#define DtREVISION @CDE_VERSION_MINOR@ +#define DtUPDATE_LEVEL @CDE_VERSION_MICRO@ #define DtVERSION_NUMBER (DtVERSION * 10000 + \ DtREVISION * 100 + \ DtUPDATE_LEVEL) -#define DtVERSION_STRING "CDE Version 2.4.0a" +#define DtVERSION_STRING "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@" /* diff --git a/cde/lib/tt/bin/dbck/Makefile.am b/cde/lib/tt/bin/dbck/Makefile.am index e86ff1126..905fae751 100644 --- a/cde/lib/tt/bin/dbck/Makefile.am +++ b/cde/lib/tt/bin/dbck/Makefile.am @@ -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 diff --git a/cde/lib/tt/bin/scripts/Makefile.am b/cde/lib/tt/bin/scripts/Makefile.am index 490104a5d..fe31af94b 100644 --- a/cde/lib/tt/bin/scripts/Makefile.am +++ b/cde/lib/tt/bin/scripts/Makefile.am @@ -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 diff --git a/cde/lib/tt/bin/shell/Makefile.am b/cde/lib/tt/bin/shell/Makefile.am index a66327187..37cc642ad 100644 --- a/cde/lib/tt/bin/shell/Makefile.am +++ b/cde/lib/tt/bin/shell/Makefile.am @@ -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 diff --git a/cde/lib/tt/bin/tt_type_comp/Makefile.am b/cde/lib/tt/bin/tt_type_comp/Makefile.am index 5d334795b..c9e3dbf7e 100644 --- a/cde/lib/tt/bin/tt_type_comp/Makefile.am +++ b/cde/lib/tt/bin/tt_type_comp/Makefile.am @@ -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 diff --git a/cde/lib/tt/bin/ttauth/ttauth.man b/cde/lib/tt/bin/ttauth/ttauth.man.in similarity index 98% rename from cde/lib/tt/bin/ttauth/ttauth.man rename to cde/lib/tt/bin/ttauth/ttauth.man.in index c065f57ee..49375b244 100644 --- a/cde/lib/tt/bin/ttauth/ttauth.man +++ b/cde/lib/tt/bin/ttauth/ttauth.man.in @@ -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 diff --git a/cde/lib/tt/bin/ttdbserverd/Makefile.am b/cde/lib/tt/bin/ttdbserverd/Makefile.am index fb9c08f25..f3fdb882d 100644 --- a/cde/lib/tt/bin/ttdbserverd/Makefile.am +++ b/cde/lib/tt/bin/ttdbserverd/Makefile.am @@ -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 diff --git a/cde/lib/tt/bin/ttsession/Makefile.am b/cde/lib/tt/bin/ttsession/Makefile.am index cad1b8734..b60031af9 100644 --- a/cde/lib/tt/bin/ttsession/Makefile.am +++ b/cde/lib/tt/bin/ttsession/Makefile.am @@ -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 diff --git a/cde/lib/tt/bin/tttar/Makefile.am b/cde/lib/tt/bin/tttar/Makefile.am index bfbbdf9fe..cea7ade71 100644 --- a/cde/lib/tt/bin/tttar/Makefile.am +++ b/cde/lib/tt/bin/tttar/Makefile.am @@ -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 diff --git a/cde/lib/tt/bin/tttrace/Makefile.am b/cde/lib/tt/bin/tttrace/Makefile.am index ad67998f5..e04215fbf 100644 --- a/cde/lib/tt/bin/tttrace/Makefile.am +++ b/cde/lib/tt/bin/tttrace/Makefile.am @@ -1,7 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in -include ../../tooltalk.inc - bin_PROGRAMS = tttrace tttrace_CXXFLAGS = -I../../lib diff --git a/cde/lib/tt/lib/Makefile.am b/cde/lib/tt/lib/Makefile.am index ebb9eeebc..8bfc00261 100644 --- a/cde/lib/tt/lib/Makefile.am +++ b/cde/lib/tt/lib/Makefile.am @@ -2,7 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in SUBDIRS = api db mp util tttk -include ../tooltalk.inc lib_LTLIBRARIES = libtt.la diff --git a/cde/lib/tt/lib/api/c/Makefile.am b/cde/lib/tt/lib/api/c/Makefile.am index 55dbfd359..8d6e36600 100644 --- a/cde/lib/tt/lib/api/c/Makefile.am +++ b/cde/lib/tt/lib/api/c/Makefile.am @@ -2,8 +2,6 @@ ttdir = ${includedir}/Tt MAINTAINERCLEANFILES = Makefile.in -include ../../../tooltalk.inc - noinst_LTLIBRARIES = libapi.la libapi_la_CXXFLAGS = -I../../../lib diff --git a/cde/lib/tt/lib/api/dnd/Makefile.am b/cde/lib/tt/lib/api/dnd/Makefile.am index 13fc308b6..c09d824bd 100644 --- a/cde/lib/tt/lib/api/dnd/Makefile.am +++ b/cde/lib/tt/lib/api/dnd/Makefile.am @@ -1,7 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in -include ../../../tooltalk.inc - noinst_LTLIBRARIES = libdnd.la libdnd_la_CFLAGS = -I../.. diff --git a/cde/lib/tt/lib/db/Makefile.am b/cde/lib/tt/lib/db/Makefile.am index 47701fe2e..5743db487 100644 --- a/cde/lib/tt/lib/db/Makefile.am +++ b/cde/lib/tt/lib/db/Makefile.am @@ -1,7 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in -include ../../tooltalk.inc - noinst_LTLIBRARIES = libdb.la libdb_la_CXXFLAGS = -I../../lib -I../../mini_isam diff --git a/cde/lib/tt/lib/mp/Makefile.am b/cde/lib/tt/lib/mp/Makefile.am index 33189b540..1ff8ddd73 100644 --- a/cde/lib/tt/lib/mp/Makefile.am +++ b/cde/lib/tt/lib/mp/Makefile.am @@ -1,7 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in -include ../../tooltalk.inc - noinst_LTLIBRARIES = libmp.la libmp_la_CXXFLAGS = -I../../lib -I../../mini_isam diff --git a/cde/lib/tt/lib/tttk/Makefile.am b/cde/lib/tt/lib/tttk/Makefile.am index 0a11019a5..acf8a90dd 100644 --- a/cde/lib/tt/lib/tttk/Makefile.am +++ b/cde/lib/tt/lib/tttk/Makefile.am @@ -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 diff --git a/cde/lib/tt/lib/util/Makefile.am b/cde/lib/tt/lib/util/Makefile.am index db05b9498..7d08584d3 100644 --- a/cde/lib/tt/lib/util/Makefile.am +++ b/cde/lib/tt/lib/util/Makefile.am @@ -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 diff --git a/cde/lib/tt/mini_isam/Makefile.am b/cde/lib/tt/mini_isam/Makefile.am index 244fa668f..19453f8da 100644 --- a/cde/lib/tt/mini_isam/Makefile.am +++ b/cde/lib/tt/mini_isam/Makefile.am @@ -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 diff --git a/cde/lib/tt/slib/Makefile.am b/cde/lib/tt/slib/Makefile.am index a6499ca01..a987b2aaf 100644 --- a/cde/lib/tt/slib/Makefile.am +++ b/cde/lib/tt/slib/Makefile.am @@ -1,7 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in -include ../tooltalk.inc - noinst_LIBRARIES = libstt.a libstt_a_CXXFLAGS = $(TIRPC_DEFINES) -I../lib diff --git a/cde/lib/tt/tooltalk.inc b/cde/lib/tt/tooltalk.inc deleted file mode 100644 index 494645c35..000000000 --- a/cde/lib/tt/tooltalk.inc +++ /dev/null @@ -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)\" -