STABLE14-macos-version-generation-20071011

make release time simpler

(cherry picked from commit e1b1f4655f537427369c996b22816b0e5426da82)

diff --git a/configure-libafs.in b/configure-libafs.in
index 27647fd475708e13926f1eb7f2f6365853be3a5c..f84f9258dc928c913910b7dac4b4d839615bb838 100644 (file)
--- 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.4.5-pre1)
 AC_CONFIG_HEADER(src/config/afsconfig.h)
-define(OPENAFS_CONFIGURE_LIBAFS)
+MACOS_VERSION=1.4.5fc1
+
+AC_SUBST(MACOS_VERSION)
 
+define(OPENAFS_CONFIGURE_LIBAFS)
 AC_PROG_CC
 OPENAFS_CONFIGURE_COMMON
 

diff --git a/configure.in b/configure.in
index f075cd7dc99442a407e3b3d1875e2a65d5f3346b..37e93c43f68491711007e265df4ef8a711316f2f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,9 @@
 AC_INIT(src/config/stds.h)
 AM_INIT_AUTOMAKE(openafs,1.4.5-pre1)
 AC_CONFIG_HEADER(src/config/afsconfig.h)
+MACOS_VERSION=1.4.5fc1
+
+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 50e5e72d9fbbfce4c6530b5a17dbd2bf94b9e4bf..eb1be80c90a4cf54d2be5740c881e8bdce0f13a1 100644 (file)
--- a/src/libafs/afs.ppc_darwin_12.plist.in
+++ b/src/libafs/afs.ppc_darwin_12.plist.in
@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
-       <string>@VERSION@</string>
+       <string>@MACOS_VERSION@</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>@VERSION@</string>
+       <string>@MACOS_VERSION@</string>
        <key>OSBundleLibraries</key>
        <dict>
                <key>com.apple.kernel.bsd</key>

diff --git a/src/libafs/afs.ppc_darwin_13.plist.in b/src/libafs/afs.ppc_darwin_13.plist.in
index 50e5e72d9fbbfce4c6530b5a17dbd2bf94b9e4bf..eb1be80c90a4cf54d2be5740c881e8bdce0f13a1 100644 (file)
--- a/src/libafs/afs.ppc_darwin_13.plist.in
+++ b/src/libafs/afs.ppc_darwin_13.plist.in
@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
-       <string>@VERSION@</string>
+       <string>@MACOS_VERSION@</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>@VERSION@</string>
+       <string>@MACOS_VERSION@</string>
        <key>OSBundleLibraries</key>
        <dict>
                <key>com.apple.kernel.bsd</key>

diff --git a/src/libafs/afs.ppc_darwin_14.plist.in b/src/libafs/afs.ppc_darwin_14.plist.in
index 7e4f1bf1ac10152cb47934f68e2b9493c6e7f6d6..eafb9315895301d9006b563391af3f98ec4c3f9c 100644 (file)
--- a/src/libafs/afs.ppc_darwin_14.plist.in
+++ b/src/libafs/afs.ppc_darwin_14.plist.in
@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
-       <string>@VERSION@</string>
+       <string>@MACOS_VERSION@</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>@VERSION@</string>
+       <string>@MACOS_VERSION@</string>
        <key>OSBundleLibraries</key>
        <dict>
                <key>com.apple.kernel.bsd</key>

diff --git a/src/libafs/afs.ppc_darwin_60.plist.in b/src/libafs/afs.ppc_darwin_60.plist.in
index 98ab344210012f25435242eeefd267f8f7a9e0c4..46d02fdcb81c7556861f3de04b263ce96ff38639 100644 (file)
--- a/src/libafs/afs.ppc_darwin_60.plist.in
+++ b/src/libafs/afs.ppc_darwin_60.plist.in
@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
-       <string>@VERSION@</string>
+       <string>@MACOS_VERSION@</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>@VERSION@</string>
+       <string>@MACOS_VERSION@</string>
        <key>OSBundleLibraries</key>
        <dict>
                <key>com.apple.kernel.bsd</key>

diff --git a/src/libafs/afs.ppc_darwin_70.plist.in b/src/libafs/afs.ppc_darwin_70.plist.in
index 3d9426de2a81874609b603ffe0ee0bd3e17a807d..8fbe490610949327bb49d97549ef23a0dcc63e0e 100644 (file)
--- a/src/libafs/afs.ppc_darwin_70.plist.in
+++ b/src/libafs/afs.ppc_darwin_70.plist.in
@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.4.5fc1</string>
+       <string>@MACOS_VERSION@</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>1.4.5fc1</string>
+       <string>@MACOS_VERSION@</string>
        <key>OSBundleLibraries</key>
        <dict>
                <key>com.apple.kernel.bsd</key>

diff --git a/src/libafs/afs.ppc_darwin_80.plist.in b/src/libafs/afs.ppc_darwin_80.plist.in
index b13525b8b9352d89ba7950b72da7788e26b05ad8..a1385718c5249f02b9364ad30dc99c06403d9135 100644 (file)
--- a/src/libafs/afs.ppc_darwin_80.plist.in
+++ b/src/libafs/afs.ppc_darwin_80.plist.in
@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.4.5fc1</string>
+       <string>@MACOS_VERSION@</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>1.4.5fc1</string>
+       <string>@MACOS_VERSION@</string>
        <key>OSBundleLibraries</key>
        <dict>
                <key>com.apple.kpi.bsd</key>

diff --git a/src/libafs/afs.ppc_darwin_90.plist.in b/src/libafs/afs.ppc_darwin_90.plist.in
index b13525b8b9352d89ba7950b72da7788e26b05ad8..a1385718c5249f02b9364ad30dc99c06403d9135 100644 (file)
--- a/src/libafs/afs.ppc_darwin_90.plist.in
+++ b/src/libafs/afs.ppc_darwin_90.plist.in
@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.4.5fc1</string>
+       <string>@MACOS_VERSION@</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>1.4.5fc1</string>
+       <string>@MACOS_VERSION@</string>
        <key>OSBundleLibraries</key>
        <dict>
                <key>com.apple.kpi.bsd</key>

diff --git a/src/libafs/afs.x86_darwin_80.plist.in b/src/libafs/afs.x86_darwin_80.plist.in
index b13525b8b9352d89ba7950b72da7788e26b05ad8..a1385718c5249f02b9364ad30dc99c06403d9135 100644 (file)
--- a/src/libafs/afs.x86_darwin_80.plist.in
+++ b/src/libafs/afs.x86_darwin_80.plist.in
@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.4.5fc1</string>
+       <string>@MACOS_VERSION@</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>1.4.5fc1</string>
+       <string>@MACOS_VERSION@</string>
        <key>OSBundleLibraries</key>
        <dict>
                <key>com.apple.kpi.bsd</key>

diff --git a/src/libafs/afs.x86_darwin_90.plist.in b/src/libafs/afs.x86_darwin_90.plist.in
index b13525b8b9352d89ba7950b72da7788e26b05ad8..a1385718c5249f02b9364ad30dc99c06403d9135 100644 (file)
--- a/src/libafs/afs.x86_darwin_90.plist.in
+++ b/src/libafs/afs.x86_darwin_90.plist.in
@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.4.5fc1</string>
+       <string>@MACOS_VERSION@</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>1.4.5fc1</string>
+       <string>@MACOS_VERSION@</string>
        <key>OSBundleLibraries</key>
        <dict>
                <key>com.apple.kpi.bsd</key>

diff --git a/src/packaging/MacOS/OpenAFS.Info.plist b/src/packaging/MacOS/OpenAFS.Info.plist
deleted file mode 100644 (file)
index 3a8593a..0000000
--- a/src/packaging/MacOS/OpenAFS.Info.plist
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>CFBundleGetInfoString</key>
-       <string>OpenAFS 1.4.5-pre1</string>
-       <key>CFBundleIdentifier</key>
-       <string>org.openafs.OpenAFS.pkg</string>
-       <key>CFBundleName</key>
-       <string>OpenAFS</string>
-       <key>CFBundleShortVersionString</key>
-       <string>1.4.5fc1</string>
-       <key>IFMajorVersion</key>
-       <integer>1</integer>
-       <key>IFMinorVersion</key>
-       <integer>4</integer>
-       <key>IFPkgFlagAllowBackRev</key>
-       <false/>
-       <key>IFPkgFlagAuthorizationAction</key>
-       <string>RootAuthorization</string>
-       <key>IFPkgFlagBackgroundAlignment</key>
-       <string>bottomright</string>
-       <key>IfPkgFlagBackgroundScaling</key>
-       <string>proportional</string>
-       <key>IFPkgFlagDefaultLocation</key>
-       <string>/</string>
-       <key>IFPkgFlagInstallFat</key>
-       <false/>
-       <key>IFPkgFlagIsRequired</key>
-       <false/>
-       <key>IFPkgFlagRelocatable</key>
-       <false/>
-       <key>IFPkgFlagRestartAction</key>
-       <string>NoRestart</string>
-       <key>IFPkgFlagRootVolumeOnly</key>
-       <true/>
-       <key>IFPkgFlagUpdateInstalledLanguages</key>
-       <false/>
-       <key>IFPkgFlagUseUserMask</key>
-       <false/>
-       <key>IFPkgFormatVersion</key>
-       <real>0.10000000149011612</real>
-</dict>
-</plist>

diff --git a/src/packaging/MacOS/OpenAFS.Info.plist.in b/src/packaging/MacOS/OpenAFS.Info.plist.in
new file mode 100644 (file)
index 0000000..bf97515
--- /dev/null
+++ b/src/packaging/MacOS/OpenAFS.Info.plist.in
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+       <key>CFBundleGetInfoString</key>
+       <string>OpenAFS @MACOS_VERSION@</string>
+       <key>CFBundleIdentifier</key>
+       <string>org.openafs.OpenAFS.pkg</string>
+       <key>CFBundleName</key>
+       <string>OpenAFS</string>
+       <key>CFBundleShortVersionString</key>
+       <string>@MACOS_VERSION@</string>
+       <key>IFMajorVersion</key>
+       <integer>1</integer>
+       <key>IFMinorVersion</key>
+       <integer>5</integer>
+       <key>IFPkgFlagAllowBackRev</key>
+       <false/>
+       <key>IFPkgFlagAuthorizationAction</key>
+       <string>RootAuthorization</string>
+       <key>IFPkgFlagBackgroundAlignment</key>
+       <string>bottomright</string>
+       <key>IfPkgFlagBackgroundScaling</key>
+       <string>proportional</string>
+       <key>IFPkgFlagDefaultLocation</key>
+       <string>/</string>
+       <key>IFPkgFlagInstallFat</key>
+       <false/>
+       <key>IFPkgFlagIsRequired</key>
+       <false/>
+       <key>IFPkgFlagRelocatable</key>
+       <false/>
+       <key>IFPkgFlagRestartAction</key>
+       <string>NoRestart</string>
+       <key>IFPkgFlagRootVolumeOnly</key>
+       <true/>
+       <key>IFPkgFlagUpdateInstalledLanguages</key>
+       <false/>
+       <key>IFPkgFlagUseUserMask</key>
+       <false/>
+       <key>IFPkgFormatVersion</key>
+       <real>0.10000000149011612</real>
+</dict>
+</plist>

diff --git a/src/packaging/MacOS/OpenAFS.info b/src/packaging/MacOS/OpenAFS.info
deleted file mode 100644 (file)
index b81effa..0000000
--- a/src/packaging/MacOS/OpenAFS.info
+++ /dev/null
@@ -1,16 +0,0 @@
-Title OpenAFS
-Version 1.4.5-pre1
-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)
-DeleteWarning 
-NeedsAuthorization YES
-DisableStop NO
-UseUserMask NO
-Application NO
-Relocatable NO
-Required NO
-InstallOnly NO
-RequiresReboot NO
-InstallFat NO
-rootVolumeOnly YES

diff --git a/src/packaging/MacOS/OpenAFS.info.in b/src/packaging/MacOS/OpenAFS.info.in
new file mode 100644 (file)
index 0000000..2977252
--- /dev/null
+++ b/src/packaging/MacOS/OpenAFS.info.in
@@ -0,0 +1,16 @@
+Title OpenAFS
+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)
+DeleteWarning 
+NeedsAuthorization YES
+DisableStop NO
+UseUserMask NO
+Application NO
+Relocatable NO
+Required NO
+InstallOnly NO
+RequiresReboot NO
+InstallFat NO
+rootVolumeOnly YES