diff options
| author | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2016-05-03 23:42:34 -0700 |
|---|---|---|
| committer | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2016-05-04 00:08:34 -0700 |
| commit | d6ba4f2c52da150a9a92bdb00efe7902d17033bd (patch) | |
| tree | e862837a9e7d3ea47c8f175a33dddcba50600b6b | |
| parent | c1614928c10a8f8400f99acfd1b7f96d503af7ec (diff) | |
XQuartz: Add --with-bundle-version and --with-bundle-version-string configure options
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | hw/xquartz/bundle/Info.plist.cpp | 4 | ||||
| -rw-r--r-- | hw/xquartz/bundle/Makefile.am | 4 |
3 files changed, 15 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 61af401d0..2633f4e58 100644 --- a/configure.ac +++ b/configure.ac @@ -559,6 +559,16 @@ AC_ARG_WITH(bundle-id-prefix, AS_HELP_STRING([--with-bundle-id-prefix=RDNS_PREF [ BUNDLE_ID_PREFIX="${withval}" ]) AC_SUBST([BUNDLE_ID_PREFIX]) AC_DEFINE_UNQUOTED(BUNDLE_ID_PREFIX, "$BUNDLE_ID_PREFIX", [Prefix to use for bundle identifiers]) +DEFAULT_BUNDLE_VERSION=`echo ${PACKAGE_VERSION} | cut -f1-3 -d.` +m4_define(DEFAULT_BUNDLE_VERSION, m4_esyscmd([echo ]AC_PACKAGE_VERSION[ | cut -f1-3 -d.])) +AC_ARG_WITH(bundle-version, AS_HELP_STRING([--with-bundle-version=VERSION], [Version to use for X11.app's CFBundleVersion (default: ]DEFAULT_BUNDLE_VERSION[)]), + [ BUNDLE_VERSION="${withval}" ], + [ BUNDLE_VERSION="${DEFAULT_BUNDLE_VERSION}" ]) +AC_SUBST([BUNDLE_VERSION]) +AC_ARG_WITH(bundle-version-string, AS_HELP_STRING([--with-bundle-version-string=VERSION], [Version to use for X11.app's CFBundleShortVersionString (default: ]AC_PACKAGE_VERSION[)]), + [ BUNDLE_VERSION_STRING="${withval}" ], + [ BUNDLE_VERSION_STRING="${PACKAGE_VERSION}" ]) +AC_SUBST([BUNDLE_VERSION_STRING]) AC_ARG_ENABLE(sparkle,AS_HELP_STRING([--enable-sparkle], [Enable updating of X11.app using the Sparkle Framework (default: disabled)]), [ XQUARTZ_SPARKLE="${enableval}" ], [ XQUARTZ_SPARKLE="no" ]) diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp index 8d543a183..f6a72af49 100644 --- a/hw/xquartz/bundle/Info.plist.cpp +++ b/hw/xquartz/bundle/Info.plist.cpp @@ -19,9 +19,9 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>2.7.7</string> + <string>BUNDLE_VERSION_STRING</string> <key>CFBundleVersion</key> - <string>2.7.7</string> + <string>BUNDLE_VERSION</string> <key>CFBundleSignature</key> <string>x11a</string> <key>CSResourcesFileMapped</key> diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am index ac293db50..424a7475f 100644 --- a/hw/xquartz/bundle/Makefile.am +++ b/hw/xquartz/bundle/Makefile.am @@ -1,8 +1,10 @@ include cpprules.in CPP_FILES_FLAGS = \ + -DAPPLE_APPLICATION_NAME="$(APPLE_APPLICATION_NAME)" \ -DBUNDLE_ID_PREFIX="$(BUNDLE_ID_PREFIX)" \ - -DAPPLE_APPLICATION_NAME="$(APPLE_APPLICATION_NAME)" + -DBUNDLE_VERSION="$(BUNDLE_VERSION)" \ + -DBUNDLE_VERSION_STRING="$(BUNDLE_VERSION_STRING)" if XQUARTZ_SPARKLE CPP_FILES_FLAGS += -DXQUARTZ_SPARKLE -DXQUARTZ_SPARKLE_FEED_URL="$(XQUARTZ_SPARKLE_FEED_URL)" |