diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | Makefile.am | 14 | ||||
| -rw-r--r-- | acinclude.m4 | 16 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | netx.manifest.in | 2 | ||||
| -rw-r--r-- | netx/net/sourceforge/jnlp/runtime/Boot.java | 5 |
6 files changed, 40 insertions, 15 deletions
@@ -1,3 +1,16 @@ +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. + 2011-01-27 Omair Majid <[email protected]> * netx/net/sourceforge/jnlp/resources/Messages.properties: Add diff --git a/Makefile.am b/Makefile.am index e19fcd3..7da13b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,13 +54,6 @@ else 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 @@ LAUNCHER_FLAGS = -O2 -fno-strict-aliasing -fPIC -pthread -W -Wall -Wno-unused -W -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 @@ -298,10 +291,11 @@ stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp mkdir -p stamps touch $@ -stamps/netx-dist.stamp: stamps/netx.stamp +stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/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 \ + $(abs_top_builddir)/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 --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]) +]) diff --git a/configure.ac b/configure.ac index 189433b..38ddd6f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_INIT([icedtea-web],[1.1pre],[[email protected]], [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.manifest]) # Older automake doesn't generate these correctly abs_top_builddir=`pwd -P` @@ -35,8 +35,7 @@ FIND_ECJ_JAR 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 --git a/netx.manifest.in b/netx.manifest.in new file mode 100644 index 0000000..790bcf9 --- /dev/null +++ b/netx.manifest.in @@ -0,0 +1,2 @@ +Implementation-Title: @PACKAGE_NAME@ +Implementation-Version: @FULL_VERSION@ diff --git a/netx/net/sourceforge/jnlp/runtime/Boot.java b/netx/net/sourceforge/jnlp/runtime/Boot.java index b075e65..91ecdf5 100644 --- a/netx/net/sourceforge/jnlp/runtime/Boot.java +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java @@ -58,11 +58,12 @@ public final class Boot implements PrivilegedAction<Void> { // 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 ([email protected])\n" + + name + " " + version + "\n" + R("BLaunchAbout"); |