[icedtea-web] RFC: pick up name and version from configure
Dr Andrew John Hughes
ahughes at redhat.com
Wed Jan 26 11:44:09 PST 2011
On 12:13 Tue 25 Jan , Omair Majid wrote:
> Hi,
>
> The attached patch gets rid of the hardcoded names and version numbers
> in net. It makes netx pick up the right name and version form the
> configure script.
>
> Okay to commit?
>
> ChangeLog:
> 2011-01-25 Omair Majid <omajid at redhat.com>
>
> * Makefile.am: Add FULL_VERSION. Make PLUGIN_VERSION use
> FULL_VERSION.
> ($(NETX_DIR)/netx.manifest): New target. Creates a manifest file
> containing package name and version for netx.
> (stamps/netx.stamp): Add manifest to jar.
> * netx/net/sourceforge/jnlp/runtime/Boot.java: Look up name and
> version from manifest.
>
> Cheers,
> Omair
I think it would be much cleaner to produce the manifest using autoconf's existing support for this
rather than hacking stuff into the Makefile. You need to AC_SUBST FULL_VERSION and then add
netx.manifest to AC_CONFIG_FILES. autoconf will do the rest. Make sure that the macros that
set ICEDTEA_REVISION (IT_OBTAIN_HG_REVISIONS) and PKGVERSION (IT_GET_PKGVERSION) are run before
FULL_VERSION is set. Something like the attached patch should do it.
$ /home/andrew/projects/openjdk/icedtea-web/configure
...
checking what version string to use... 1.1pre+r64da2a80df88
...
$ cat netx/netx.manifest
Implementation-Title: icedtea-web
Implementation-Version: 1.1pre+r64da2a80df88
$ /home/andrew/projects/openjdk/icedtea-web/configure --with-pkgversion=23
...
checking what version string to use... 1.1pre+r64da2a80df88 (23)
...
$ cat netx/netx.manifest
Implementation-Title: icedtea-web
Implementation-Version: 1.1pre+r64da2a80df88 (23)
The changes to Boot.java and the netx-dist target look fine.
> diff -r 64da2a80df88 Makefile.am
> --- a/Makefile.am Tue Jan 25 10:19:20 2011 -0500
> +++ b/Makefile.am Tue Jan 25 12:04:54 2011 -0500
> @@ -82,7 +82,8 @@
> -DEXPAND_CLASSPATH_WILDCARDS
> LAUNCHER_LINK = -o $@ -pthread -Xlinker -O1 -Xlinker -z -Xlinker defs -L$(BOOT_DIR)/lib/$(INSTALL_ARCH_DIR) \
> -Wl,-soname=lib.so -Wl,-z -Wl,origin -Wl,--allow-shlib-undefined $(X11_CFLAGS) $(X11_LIBS) -ldl -lz
> -PLUGIN_VERSION = IcedTea-Web $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
> +FULL_VERSION=$(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
> +PLUGIN_VERSION = IcedTea-Web $(FULL_VERSION)
>
> EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher \
> itweb-settings.desktop.in
> @@ -298,10 +299,14 @@
> mkdir -p stamps
> touch $@
>
> -stamps/netx-dist.stamp: stamps/netx.stamp
> +$(NETX_DIR)/netx.manifest:
> + echo "Implementation-Title: $(PACKAGE_NAME)" > $@ && \
> + echo "Implementation-Version: $(FULL_VERSION)" >> $@
> +
> +stamps/netx-dist.stamp: stamps/netx.stamp $(NETX_DIR)/netx.manifest
> (cd $(NETX_DIR) ; \
> mkdir -p lib ; \
> - $(BOOT_DIR)/bin/jar cf lib/classes.jar javax/jnlp net ; \
> + $(BOOT_DIR)/bin/jar cfm lib/classes.jar netx.manifest javax/jnlp net ; \
> cp -pPR $(SRC_DIR_LINK) $(NETX_SRCDIR) src; \
> find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
> cd src ; \
> diff -r 64da2a80df88 netx/net/sourceforge/jnlp/runtime/Boot.java
> --- a/netx/net/sourceforge/jnlp/runtime/Boot.java Tue Jan 25 10:19:20 2011 -0500
> +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Tue Jan 25 12:04:54 2011 -0500
> @@ -58,11 +58,12 @@
> // todo: decide whether a spawned netx (external launch)
> // should inherit the same options as this instance (store argv?)
>
> - private static final String version = "0.5";
> + private static final String name = Boot.class.getPackage().getImplementationTitle();
> + private static final String version = Boot.class.getPackage().getImplementationVersion();
>
> /** the text to display before launching the about link */
> private static final String aboutMessage = ""
> - + "netx v" + version + " - (C)2001-2003 Jon A. Maxwell (jmaxwell at users.sourceforge.net)\n"
> + + name + " " + version
> + "\n"
> + R("BLaunchAbout");
>
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r 64da2a80df88 Makefile.am
--- a/Makefile.am Tue Jan 25 10:19:20 2011 -0500
+++ b/Makefile.am Wed Jan 26 19:43:21 2011 +0000
@@ -54,13 +54,6 @@
SRC_DIR_LINK = $(REFLINK)
endif
-if HAS_ICEDTEA_REVISION
-ICEDTEA_REV = +${ICEDTEA_REVISION}
-endif
-if HAS_PKGVERSION
-ICEDTEA_PKG = $(EMPTY) (${PKGVERSION})
-endif
-
if ENABLE_DOCS
JAVADOC_OPTS=-use -keywords -encoding UTF-8 -splitIndex \
-bottom '<font size="-1"> <a href="http://icedtea.classpath.org/bugzilla">Submit a bug or feature</a></font>'
@@ -82,7 +75,7 @@
-DEXPAND_CLASSPATH_WILDCARDS
LAUNCHER_LINK = -o $@ -pthread -Xlinker -O1 -Xlinker -z -Xlinker defs -L$(BOOT_DIR)/lib/$(INSTALL_ARCH_DIR) \
-Wl,-soname=lib.so -Wl,-z -Wl,origin -Wl,--allow-shlib-undefined $(X11_CFLAGS) $(X11_LIBS) -ldl -lz
-PLUGIN_VERSION = IcedTea-Web $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
+PLUGIN_VERSION = IcedTea-Web $(FULL_VERSION)
EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher \
itweb-settings.desktop.in
diff -r 64da2a80df88 acinclude.m4
--- a/acinclude.m4 Tue Jan 25 10:19:20 2011 -0500
+++ b/acinclude.m4 Wed Jan 26 19:43:21 2011 +0000
@@ -667,3 +667,19 @@
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])
+])
diff -r 64da2a80df88 configure.ac
--- a/configure.ac Tue Jan 25 10:19:20 2011 -0500
+++ b/configure.ac Wed Jan 26 19:43:21 2011 +0000
@@ -1,6 +1,6 @@
AC_INIT([icedtea-web],[1.1pre],[distro-pkg-dev at openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile netx/netx.manifest])
# Older automake doesn't generate these correctly
abs_top_builddir=`pwd -P`
@@ -35,8 +35,7 @@
IT_FIND_JAVADOC
AC_CONFIG_FILES([javac], [chmod +x javac])
-IT_GET_PKGVERSION
-IT_OBTAIN_HG_REVISIONS
+IT_SET_VERSION
IT_CHECK_XULRUNNER_VERSION
AC_CHECK_LIB(z, main,, [AC_MSG_ERROR("zlib not found - try installing zlib-devel")])
diff -r 64da2a80df88 netx/netx.manifest.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/netx.manifest.in Wed Jan 26 19:43:21 2011 +0000
@@ -0,0 +1,2 @@
+Implementation-Title: @PACKAGE_NAME@
+Implementation-Version: @FULL_VERSION@
More information about the distro-pkg-dev
mailing list