diff options
| author | Omair Majid <[email protected]> | 2011-01-28 11:41:23 -0500 |
|---|---|---|
| committer | Omair Majid <[email protected]> | 2011-01-28 11:41:23 -0500 |
| commit | f64c8bd3c5ad5b3e12c2f767008944df7a79eea0 (patch) | |
| tree | f3b78ad5684aae37ab7a34744e16396abe766c93 /acinclude.m4 | |
| parent | d16944552990c2c953fdbd5e8d11f43e31dcbb3f (diff) | |
Use name and version as defined in configure.ac instead of hardcoding it in Boot.java
Use PACKAGE_NAME and FULL_VERSION as defined during build time rather than
hardcoding them in net.sourceforge.jnlp.runtime.Boot. Generate a manifest file
at build time, and define Implementation-Title and Implementation-Version to
PACKAGE_NAME and FULL_VERSION. Use these values from the manifest file when
displaying project name and version, rather than hardcoding "netx" and 0.5.
2011-01-28 Omair Majid <[email protected]>
* Makefile.am: Move ICEDTEA_REV, ICEDTEA_PKG to acinclude.m4. Use
FULL_VERSION.
(stamps/netx-dist.stamp): Depend on netx.manifest. Use this file as the
jar file manifest.
* acinclude.m4 (IT_SET_VERSION): New macro. Defines FULL_VERSION.
* configure.ac: Add netx.manifest to AC_CONFIG_FILES. Invoke
IT_SET_VERSION.
* netx.manifest.in: New file.
* netx/net/sourceforge/jnlp/runtime/Boot.java: Set name and version using
information from the manifest file.
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 2e488f9..9d06708 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -667,3 +667,19 @@ elif test x"${it_cv_applet_hole}" = "x3"; then fi AC_PROVIDE([$0])dnl ]) + +AC_DEFUN_ONCE([IT_SET_VERSION], +[ + AC_REQUIRE([IT_OBTAIN_HG_REVISIONS]) + AC_REQUIRE([IT_GET_PKGVERSION]) + AC_MSG_CHECKING([what version string to use]) + if test "x${ICEDTEA_REVISION}" != xnone; then + ICEDTEA_REV="+${ICEDTEA_REVISION}" + fi + if test "x${PKGVERSION}" != "xnone"; then + ICEDTEA_PKG=" (${PKGVERSION})" + fi + FULL_VERSION="${PACKAGE_VERSION}${ICEDTEA_REV}${ICEDTEA_PKG}" + AC_MSG_RESULT([${FULL_VERSION}]) + AC_SUBST([FULL_VERSION]) +]) |