From c019453664fb2eb23922912f019c8bdceba94770 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Thu, 11 Oct 2007 18:27:35 +0000 Subject: [PATCH] DEVEL15-macos-version-generation-20071011 make release time simpler (cherry picked from commit e1b1f4655f537427369c996b22816b0e5426da82) --- configure-libafs.in | 5 ++++- configure.in | 5 +++++ src/libafs/afs.ppc_darwin_12.plist.in | 4 ++-- src/libafs/afs.ppc_darwin_13.plist.in | 4 ++-- src/libafs/afs.ppc_darwin_14.plist.in | 4 ++-- src/libafs/afs.ppc_darwin_60.plist.in | 4 ++-- src/libafs/afs.ppc_darwin_70.plist.in | 4 ++-- src/libafs/afs.ppc_darwin_80.plist.in | 4 ++-- src/libafs/afs.ppc_darwin_90.plist.in | 4 ++-- src/libafs/afs.x86_darwin_80.plist.in | 4 ++-- src/libafs/afs.x86_darwin_90.plist.in | 4 ++-- .../MacOS/{OpenAFS.Info.plist => OpenAFS.Info.plist.in} | 4 ++-- src/packaging/MacOS/{OpenAFS.info => OpenAFS.info.in} | 2 +- 13 files changed, 30 insertions(+), 22 deletions(-) rename src/packaging/MacOS/{OpenAFS.Info.plist => OpenAFS.Info.plist.in} (94%) rename src/packaging/MacOS/{OpenAFS.info => OpenAFS.info.in} (95%) diff --git a/configure-libafs.in b/configure-libafs.in index 0cde5b0cb..69bc25de4 100644 --- a/configure-libafs.in +++ b/configure-libafs.in @@ -1,8 +1,11 @@ AC_INIT(src/libafs/Makefile.common.in) AM_INIT_AUTOMAKE(openafs-libafs,1.5.25) AC_CONFIG_HEADER(src/config/afsconfig.h) -define(OPENAFS_CONFIGURE_LIBAFS) +MACOS_VERSION=1.5.25 + +AC_SUBST(MACOS_VERSION) +define(OPENAFS_CONFIGURE_LIBAFS) AC_PROG_CC OPENAFS_CONFIGURE_COMMON diff --git a/configure.in b/configure.in index 999d85f4d..41e84230b 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,9 @@ AC_INIT(src/config/stds.h) AM_INIT_AUTOMAKE(openafs,1.5.25) AC_CONFIG_HEADER(src/config/afsconfig.h) +MACOS_VERSION=1.5.25 + +AC_SUBST(MACOS_VERSION) AC_PROG_CC OPENAFS_CONFIGURE_COMMON @@ -79,6 +82,8 @@ src/lwp/test/Makefile \ src/mpp/Makefile \ src/null/Makefile \ src/package/Makefile \ +src/packaging/MacOS/OpenAFS.Info.plist \ +src/packaging/MacOS/OpenAFS.info \ src/packaging/RedHat/openafs.spec \ src/pam/Makefile \ src/pinstall/Makefile \ diff --git a/src/libafs/afs.ppc_darwin_12.plist.in b/src/libafs/afs.ppc_darwin_12.plist.in index 50e5e72d9..eb1be80c9 100644 --- a/src/libafs/afs.ppc_darwin_12.plist.in +++ b/src/libafs/afs.ppc_darwin_12.plist.in @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - @VERSION@ + @MACOS_VERSION@ CFBundleSignature ???? CFBundleVersion - @VERSION@ + @MACOS_VERSION@ OSBundleLibraries com.apple.kernel.bsd diff --git a/src/libafs/afs.ppc_darwin_13.plist.in b/src/libafs/afs.ppc_darwin_13.plist.in index 50e5e72d9..eb1be80c9 100644 --- a/src/libafs/afs.ppc_darwin_13.plist.in +++ b/src/libafs/afs.ppc_darwin_13.plist.in @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - @VERSION@ + @MACOS_VERSION@ CFBundleSignature ???? CFBundleVersion - @VERSION@ + @MACOS_VERSION@ OSBundleLibraries com.apple.kernel.bsd diff --git a/src/libafs/afs.ppc_darwin_14.plist.in b/src/libafs/afs.ppc_darwin_14.plist.in index 7e4f1bf1a..eafb93158 100644 --- a/src/libafs/afs.ppc_darwin_14.plist.in +++ b/src/libafs/afs.ppc_darwin_14.plist.in @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - @VERSION@ + @MACOS_VERSION@ CFBundleSignature ???? CFBundleVersion - @VERSION@ + @MACOS_VERSION@ OSBundleLibraries com.apple.kernel.bsd diff --git a/src/libafs/afs.ppc_darwin_60.plist.in b/src/libafs/afs.ppc_darwin_60.plist.in index 98ab34421..46d02fdcb 100644 --- a/src/libafs/afs.ppc_darwin_60.plist.in +++ b/src/libafs/afs.ppc_darwin_60.plist.in @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - @VERSION@ + @MACOS_VERSION@ CFBundleSignature ???? CFBundleVersion - @VERSION@ + @MACOS_VERSION@ OSBundleLibraries com.apple.kernel.bsd diff --git a/src/libafs/afs.ppc_darwin_70.plist.in b/src/libafs/afs.ppc_darwin_70.plist.in index a5334fe37..8fbe49061 100644 --- a/src/libafs/afs.ppc_darwin_70.plist.in +++ b/src/libafs/afs.ppc_darwin_70.plist.in @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 1.5.25 + @MACOS_VERSION@ CFBundleSignature ???? CFBundleVersion - 1.5.25 + @MACOS_VERSION@ OSBundleLibraries com.apple.kernel.bsd diff --git a/src/libafs/afs.ppc_darwin_80.plist.in b/src/libafs/afs.ppc_darwin_80.plist.in index eb48495ff..a1385718c 100644 --- a/src/libafs/afs.ppc_darwin_80.plist.in +++ b/src/libafs/afs.ppc_darwin_80.plist.in @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 1.5.25 + @MACOS_VERSION@ CFBundleSignature ???? CFBundleVersion - 1.5.25 + @MACOS_VERSION@ OSBundleLibraries com.apple.kpi.bsd diff --git a/src/libafs/afs.ppc_darwin_90.plist.in b/src/libafs/afs.ppc_darwin_90.plist.in index eb48495ff..a1385718c 100644 --- a/src/libafs/afs.ppc_darwin_90.plist.in +++ b/src/libafs/afs.ppc_darwin_90.plist.in @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 1.5.25 + @MACOS_VERSION@ CFBundleSignature ???? CFBundleVersion - 1.5.25 + @MACOS_VERSION@ OSBundleLibraries com.apple.kpi.bsd diff --git a/src/libafs/afs.x86_darwin_80.plist.in b/src/libafs/afs.x86_darwin_80.plist.in index eb48495ff..a1385718c 100644 --- a/src/libafs/afs.x86_darwin_80.plist.in +++ b/src/libafs/afs.x86_darwin_80.plist.in @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 1.5.25 + @MACOS_VERSION@ CFBundleSignature ???? CFBundleVersion - 1.5.25 + @MACOS_VERSION@ OSBundleLibraries com.apple.kpi.bsd diff --git a/src/libafs/afs.x86_darwin_90.plist.in b/src/libafs/afs.x86_darwin_90.plist.in index eb48495ff..a1385718c 100644 --- a/src/libafs/afs.x86_darwin_90.plist.in +++ b/src/libafs/afs.x86_darwin_90.plist.in @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 1.5.25 + @MACOS_VERSION@ CFBundleSignature ???? CFBundleVersion - 1.5.25 + @MACOS_VERSION@ OSBundleLibraries com.apple.kpi.bsd diff --git a/src/packaging/MacOS/OpenAFS.Info.plist b/src/packaging/MacOS/OpenAFS.Info.plist.in similarity index 94% rename from src/packaging/MacOS/OpenAFS.Info.plist rename to src/packaging/MacOS/OpenAFS.Info.plist.in index 13878eda7..bf9751531 100644 --- a/src/packaging/MacOS/OpenAFS.Info.plist +++ b/src/packaging/MacOS/OpenAFS.Info.plist.in @@ -3,13 +3,13 @@ CFBundleGetInfoString - OpenAFS 1.5.25 + OpenAFS @MACOS_VERSION@ CFBundleIdentifier org.openafs.OpenAFS.pkg CFBundleName OpenAFS CFBundleShortVersionString - 1.5.25 + @MACOS_VERSION@ IFMajorVersion 1 IFMinorVersion diff --git a/src/packaging/MacOS/OpenAFS.info b/src/packaging/MacOS/OpenAFS.info.in similarity index 95% rename from src/packaging/MacOS/OpenAFS.info rename to src/packaging/MacOS/OpenAFS.info.in index abc9a8594..2977252e1 100644 --- a/src/packaging/MacOS/OpenAFS.info +++ b/src/packaging/MacOS/OpenAFS.info.in @@ -1,5 +1,5 @@ Title OpenAFS -Version 1.5.25 +Version @VERSION@ Description The OpenAFS distributed filesystem. This package installs an almost-ready-to-run client for OpenAFS. see http://www.openafs.org for more information. DefaultLocation / Diskname (null) -- 2.39.5