RFC: Build fixes for icedtea-web
Dr Andrew John Hughes
ahughes at redhat.com
Tue Oct 19 13:36:43 PDT 2010
On 15:58 Tue 19 Oct , Deepak Bhole wrote:
> Hi,
>
> This patch fixes a few build issues in icedtea-web. It:
>
> Fixes build error when building javaws
> Fixes clean targets
> Fixes rpath during javaws and pluginappletviewer compilation
>
> ChangeLog:
> 2010-10-19 Deepak Bhole <dbhole at redhat.com>
>
> * Makefile.am:
> (NETX_DIR):Moved NetX launcher objects to a separate directory where
> they are now built.
> (LAUNCHER_LINK): Fixed ORIGIN to the rpath argument when compiling
> launchers.
> (clean-plugin): Fixed cleanup.
> (clean-netx): Same.
> (netx-dist.stamp): Copy specific source dirs, exclude launcher dir.
> * launcher/jni_md.h: Imported from OpenJDK.
>
> Comments?
>
> Deepak
* javac shouldn't be added to .hgignore, it's produced by configure. Only
files that would appear in a tarball are listed (the results of ./autogen.sh)
* NETX_DIR is confused. It's referring to the source tree, but you're building
the launcher objects there. What was wrong with using $(abs_top_builddir)/launcher?
I guess a srcdir==builddir conflict, so use the launcher.build naming as used with
netx and liveconnect.
* clean-plugin and $ORIGIN changes are good
* NETX_SRCS only seems to be needed if you mix source and build objects as noted above.
If you set NETX_DIR to $(abs_top_builddir)/launcher.build, it should be unnecessary
to specify the sources.
* jni_md.h addition is fine; conflicts with gcj's version on Fedora from your error
earlier on IRC.
> diff -r fc0b251243fb -r a7987617d5eb .hgignore
> --- a/.hgignore Tue Oct 19 18:19:19 2010 +0100
> +++ b/.hgignore Tue Oct 19 15:53:43 2010 -0700
> @@ -6,3 +6,4 @@
> missing
> config.guess
> config.sub
> +javac
> diff -r fc0b251243fb -r a7987617d5eb Makefile.am
> --- a/Makefile.am Tue Oct 19 18:19:19 2010 +0100
> +++ b/Makefile.am Tue Oct 19 15:53:43 2010 -0700
> @@ -1,6 +1,8 @@
> # Source directories
>
> +NETX_DIR = $(abs_top_srcdir)/netx
> NETX_SRCDIR = $(abs_top_srcdir)/netx
> +NETX_SRCS = $(NETX_DIR)/javaws.1 $(NETX_DIR)/javax $(NETX_DIR)/net
> NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
> NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources
>
> @@ -93,14 +95,14 @@
> LAUNCHER_SRCDIR = $(abs_top_srcdir)/launcher
> LAUNCHER_OBJECTS = java.o java_md.o splashscreen_stubs.o
> PLUGIN_LAUNCHER_OBJECTS = $(addprefix $(PLUGIN_DIR)/launcher/,$(LAUNCHER_OBJECTS))
> -NETX_LAUNCHER_OBJECTS = $(addprefix $(abs_top_builddir)/launcher/,$(LAUNCHER_OBJECTS))
> +NETX_LAUNCHER_OBJECTS = $(addprefix $(NETX_DIR)/launcher/,$(LAUNCHER_OBJECTS))
> LAUNCHER_FLAGS = -O2 -fno-strict-aliasing -fPIC -W -Wall -Wno-unused -Wno-parentheses -pipe -fno-omit-frame-pointer \
> -g -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -DLAUNCHER_NAME='"java"' -I$(LAUNCHER_SRCDIR) \
> -DJDK_MAJOR_VERSION='"1"' -DJDK_MINOR_VERSION='"6"' -DLIBARCHNAME='"$(JRE_ARCH_DIR)"'
> LAUNCHER_LINK = -o $@ -Xlinker -O1 -Xlinker -z -Xlinker defs -L$(BOOT_DIR)/lib/$(INSTALL_ARCH_DIR) \
> -Wl,-soname=lib.so -L $(BOOT_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/jli -Wl,-z -Wl,origin \
> - -Wl,--allow-shlib-undefined -Wl,-rpath -Wl,$$ORIGIN/../lib/$(INSTALL_ARCH_DIR)/jli -Wl,-rpath \
> - -Wl,$$ORIGIN/../jre/lib/$(INSTALL_ARCH_DIR)/jli -lpthread $(X11_CFLAGS) $(X11_LIBS) -ljli -ldl -lc -lz
> + -Wl,--allow-shlib-undefined -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(INSTALL_ARCH_DIR)/jli -Wl,-rpath \
> + -Wl,\$$ORIGIN/../jre/lib/$(INSTALL_ARCH_DIR)/jli -lpthread $(X11_CFLAGS) $(X11_LIBS) -ljli -ldl -lc -lz
> PLUGIN_VERSION = IcedTea $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
>
> EXTRA_DIST = $(NETX_SRCDIR) $(abs_top_srcdir)/plugin javaws.png javaws.desktop extra launcher
> @@ -108,7 +110,7 @@
> # Top-Level Targets
> # =================
>
> -all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher/javaws
> +all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp $(NETX_DIR)/launcher/javaws
>
> clean-local: clean-netx clean-plugin clean-liveconnect clean-extra clean-bootstrap-directory clean-native-ecj
>
> @@ -124,7 +126,7 @@
> cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(prefix)/jre/lib/plugin.jar
> endif
> cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar $(DESTDIR)$(prefix)/jre/lib/netx.jar
> - cp -pPRf launcher/javaws $(DESTDIR)$(bindir)
> + cp -pPRf $(NETX_DIR)/launcher/javaws $(DESTDIR)$(bindir)
> cp extra-lib/about.jar $(DESTDIR)$(prefix)/jre/lib
>
> install-data-local:
> @@ -202,6 +204,7 @@
> touch stamps/plugin.stamp
>
> clean-plugin: $(ICEDTEAPLUGIN_CLEAN)
> + rm -rf $(PLUGIN_DIR)/launcher
> rm -f stamps/plugin.stamp
>
> liveconnect-source-files.txt:
> @@ -262,8 +265,9 @@
> stamps/netx-dist.stamp: stamps/netx.stamp
> (cd $(abs_top_builddir)/netx.build ; \
> mkdir -p lib ; \
> + mkdir -p src ; \
> $(BOOT_DIR)/bin/jar cf lib/classes.jar javax/jnlp net ; \
> - cp -pPR $(SRC_DIR_LINK) $(NETX_SRCDIR) src; \
> + cp -pPR $(SRC_DIR_LINK) $(NETX_SRCS) src; \
> find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
> cd src ; \
> $(BOOT_DIR)/bin/jar uf $(abs_top_builddir)/netx.build/lib/classes.jar \
> @@ -274,6 +278,7 @@
>
> clean-netx:
> rm -rf $(abs_top_builddir)/netx.build
> + rm -rf $(NETX_DIR)/launcher
> rm -f stamps/netx-dist.stamp
> rm -f netx-source-files.txt
> rm -f stamps/netx.stamp
> @@ -299,12 +304,12 @@
> extra-lib/about.jar: stamps/extra-class-files.stamp
> $(BOOT_DIR)/bin/jar cf $@ -C extra-lib net ;
>
> -launcher/%.o: $(LAUNCHER_SRCDIR)/%.c
> - mkdir -p launcher && \
> +$(NETX_DIR)/launcher/%.o: $(LAUNCHER_SRCDIR)/%.c
> + mkdir -p $(NETX_DIR)/launcher && \
> $(CC) $(LAUNCHER_FLAGS) -DJAVA_ARGS='{ "-J-ms8m", "net.sourceforge.jnlp.runtime.Boot", }' -DPROGNAME='"javaws"' \
> -c -o $@ $<
>
> -launcher/javaws: $(NETX_LAUNCHER_OBJECTS)
> +$(NETX_DIR)/launcher/javaws: $(NETX_LAUNCHER_OBJECTS)
> $(CC) $(LAUNCHER_LINK) $(NETX_LAUNCHER_OBJECTS)
>
> # plugin tests
> diff -r fc0b251243fb -r a7987617d5eb launcher/jni_md.h
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/launcher/jni_md.h Tue Oct 19 15:53:43 2010 -0700
> @@ -0,0 +1,42 @@
> +/*
> + * Copyright (c) 1996, 2000, Oracle and/or its affiliates. All rights reserved.
> + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
> + *
> + * This code is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License version 2 only, as
> + * published by the Free Software Foundation. Oracle designates this
> + * particular file as subject to the "Classpath" exception as provided
> + * by Oracle in the LICENSE file that accompanied this code.
> + *
> + * This code is distributed in the hope that it will be useful, but WITHOUT
> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
> + * version 2 for more details (a copy is included in the LICENSE file that
> + * accompanied this code).
> + *
> + * You should have received a copy of the GNU General Public License version
> + * 2 along with this work; if not, write to the Free Software Foundation,
> + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
> + *
> + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
> + * or visit www.oracle.com if you need additional information or have any
> + * questions.
> + */
> +
> +#ifndef _JAVASOFT_JNI_MD_H_
> +#define _JAVASOFT_JNI_MD_H_
> +
> +#define JNIEXPORT
> +#define JNIIMPORT
> +#define JNICALL
> +
> +typedef int jint;
> +#ifdef _LP64 /* 64-bit Solaris */
> +typedef long jlong;
> +#else
> +typedef long long jlong;
> +#endif
> +
> +typedef signed char jbyte;
> +
> +#endif /* !_JAVASOFT_JNI_MD_H_ */
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
More information about the distro-pkg-dev
mailing list