external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues 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

7
cde/.gitignore vendored
View file

@ -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/fonts.alias
programs/fontaliases/linux/en_US.UTF-8/mk_fonts_alias programs/fontaliases/linux/en_US.UTF-8/mk_fonts_alias
programs/fontaliases/linux/en_US.UTF-8/test_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

38
cde/configure.ac
View file

@ -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_HEADERS([include/autotools_config.h])
AC_CONFIG_MACRO_DIRS([m4]) 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 dnl These must be up here for the compiler search list to actually work
AC_PROG_CC([cc gcc clang]) AC_PROG_CC([cc gcc clang])
@ -20,16 +40,6 @@ dnl AC_PREREQ()
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_CANONICAL_BUILD 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 dnl SOURCE_DEFINES - start with CDE project default
SOURCE_CPP_DEFINES="-DANSICPP -DMULTIBYTE -DNLS16" SOURCE_CPP_DEFINES="-DANSICPP -DMULTIBYTE -DNLS16"
@ -848,6 +858,10 @@ doc/it_IT.ISO8859-1/help/Makefile
include/Makefile include/Makefile
copyright
doc/common/help/HELPEnt.sgm
include/Dt/Dt.h
lib/tt/bin/ttauth/ttauth.man
]) ])
AC_OUTPUT AC_OUTPUT

2
cde/copyright → cde/copyright.in
View file

@ -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 1993-2012 The Open Group
(c) Copyright 2012-2022 CDE Project contributors, see CONTRIBUTORS for details (c) Copyright 2012-2022 CDE Project contributors, see CONTRIBUTORS for details

4
cde/doc/common/help/HELPEnt.sgm → cde/doc/common/help/HELPEnt.sgm.in
View file

@ -1,8 +1,8 @@
<!-- $TOG: HELPEnt.sgm /main/12 1999/10/12 09:35:15 mgreess $ --> <!-- $TOG: HELPEnt.sgm /main/12 1999/10/12 09:35:15 mgreess $ -->
<!ENTITY CDEcopyright "<GlossTerm Role=nogloss>Common Desktop Environment 2.4.0a</GlossTerm>, <!ENTITY CDEcopyright "<GlossTerm Role=nogloss>Common Desktop Environment @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@</GlossTerm>,
&copy; Copyright 1993-2012 The Open Group &copy; Copyright 1993-2012 The Open Group
&copy; Copyright 2012-2020 CDE Project contributors, see CONTRIBUTORS for details &copy; Copyright 2012-2023 CDE Project contributors, see CONTRIBUTORS for details
Project Website: http://cdesktopenv.sourceforge.net/ Project Website: http://cdesktopenv.sourceforge.net/

8
cde/include/Dt/Dt.h → cde/include/Dt/Dt.h.in
View file

@ -50,15 +50,15 @@ extern "C" {
/* CDE Version information */ /* CDE Version information */
#define DtVERSION 2 #define DtVERSION @CDE_VERSION_MAJOR@
#define DtREVISION 4 #define DtREVISION @CDE_VERSION_MINOR@
#define DtUPDATE_LEVEL 0 #define DtUPDATE_LEVEL @CDE_VERSION_MICRO@
#define DtVERSION_NUMBER (DtVERSION * 10000 + \ #define DtVERSION_NUMBER (DtVERSION * 10000 + \
DtREVISION * 100 + \ DtREVISION * 100 + \
DtUPDATE_LEVEL) 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@"
/* /*

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

@ -1,6 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in 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 bin_PROGRAMS = ttdbck

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

@ -1,6 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in 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 noinst_SCRIPTS = ttce2xdr
BUILT_SOURCES = ttce2xdr BUILT_SOURCES = ttce2xdr

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

@ -1,6 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in 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 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 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 BUILT_SOURCES = mp_types_gram.h
CLEANFILES = 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 .\" not be used in advertising or otherwise to promote the sale, use or
.\" other dealings in this Software without prior written authorization .\" other dealings in this Software without prior written authorization
.\" from The Open Group. .\" 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 .SH NAME
ttauth \- ToolTalk authority file utility ttauth \- ToolTalk authority file utility
.SH SYNOPSIS .SH SYNOPSIS

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

@ -1,6 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in 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 bin_PROGRAMS = rpc.ttdbserver

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

@ -1,6 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in 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 bin_PROGRAMS = ttsession

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

@ -1,6 +1,7 @@
MAINTAINERCLENAFILES = Makefile.in 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 bin_PROGRAMS = tttar

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

@ -1,7 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
include ../../tooltalk.inc
bin_PROGRAMS = tttrace bin_PROGRAMS = tttrace
tttrace_CXXFLAGS = -I../../lib 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 SUBDIRS = api db mp util tttk
include ../tooltalk.inc
lib_LTLIBRARIES = libtt.la 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 MAINTAINERCLEANFILES = Makefile.in
include ../../../tooltalk.inc
noinst_LTLIBRARIES = libapi.la noinst_LTLIBRARIES = libapi.la
libapi_la_CXXFLAGS = -I../../../lib libapi_la_CXXFLAGS = -I../../../lib

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

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

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

@ -1,7 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
include ../../tooltalk.inc
noinst_LTLIBRARIES = libdb.la noinst_LTLIBRARIES = libdb.la
libdb_la_CXXFLAGS = -I../../lib -I../../mini_isam 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 MAINTAINERCLEANFILES = Makefile.in
include ../../tooltalk.inc
noinst_LTLIBRARIES = libmp.la noinst_LTLIBRARIES = libmp.la
libmp_la_CXXFLAGS = -I../../lib -I../../mini_isam 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 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 noinst_LTLIBRARIES = libtttk.la

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

@ -1,6 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in 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 noinst_LTLIBRARIES = libutil.la

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

@ -1,6 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in 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 noinst_LIBRARIES= libisam.a

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

@ -1,7 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
include ../tooltalk.inc
noinst_LIBRARIES = libstt.a noinst_LIBRARIES = libstt.a
libstt_a_CXXFLAGS = $(TIRPC_DEFINES) -I../lib 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)\"