diff options
author | Sven Gothel <[email protected]> | 2014-01-30 10:39:16 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2014-01-30 10:39:16 +0100 |
commit | 64e7dcc21339ae56841f10131a4f8a462454dec4 (patch) | |
tree | a62d2fbafc6fbe412d2d5ad599cd992bdf97ddbe /Makefile.am | |
parent | 98c9d6e1ea22db18913b531b8056fbdc5465eb18 (diff) |
Experimental Applet without AWT (Applet3)
DISCLAIMER:
- Only new Applet3 applets are supported under X11 for now
- AWT Applet are disabled
- Namespace com.jogamp.* and jogamp.* is only chosen
to indicate new AWT-less code
- Applet3 code path does not invoke any AWT function
- JNLP code path still utilizes AWT/Swing (UIs, ..)
TODO:
- Refactor AWT dependencies properly via UI interfaces ?
- Decide whether we shall merge netx and plugin namespace ?
IMHO the right thing to do, jumping hoops due to separation.
- Add support for Windows, OSX, Wayland, ..
Applet3:
- New AWT-less Applet3 interfaces are:
- com.jogamp.plugin.applet.Applet3
- User implements
- com.jogamp.plugin.applet.Applet3Context
- Plugin implements
- com.jogamp.plugin.ui.NativeWindowUpstream
- Plugin window, aka browser parent of Applet3
- com.jogamp.plugin.ui.NativeWindowDownstream
- Applet3 user window
- User interfaces are exported as:
- plugin3-public.jar
- plugin3-public-src.zip
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 50 |
1 files changed, 44 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 75cf2fe..1e5b715 100644 --- a/Makefile.am +++ b/Makefile.am @@ -118,8 +118,8 @@ export IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) # - we want full privileges # export LAUNCHER_BOOTCLASSPATH="-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar$(RHINO_RUNTIME):$(TAGSOUP_JAR)" -export PLUGIN_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME):$(TAGSOUP_JAR)"' -export PLUGIN_COVERAGE_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME):$(JACOCO_CLASSPATH):$(TAGSOUP_JAR)"' +export PLUGIN_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/plugin3.jar$(RHINO_RUNTIME):$(TAGSOUP_JAR)"' +export PLUGIN_COVERAGE_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/plugin3.jar$(RHINO_RUNTIME):$(JACOCO_CLASSPATH):$(TAGSOUP_JAR)"' # Fake update version to work with the Deployment Toolkit script used by Oracle # http://download.oracle.com/javase/tutorial/deployment/deploymentInDepth/depltoolkit_index.html @@ -148,7 +148,7 @@ endif if ENABLE_PLUGIN export ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin -export LIVECONNECT_DIR = netscape sun/applet +export LIVECONNECT_DIR = netscape sun/applet jogamp/plugin/applet export PLUGIN_DIR=$(abs_top_builddir)/plugin/icedteanp export PLUGIN_SRCDIR=$(abs_top_srcdir)/plugin/icedteanp export LIVECONNECT_SRCS = $(PLUGIN_SRCDIR)/java @@ -243,7 +243,9 @@ install-exec-local: ${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/ $(DESTDIR)$(libdir) if ENABLE_PLUGIN ${INSTALL_PROGRAM} $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY) $(DESTDIR)$(libdir) - ${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar + ${INSTALL_DATA} $(abs_top_builddir)/plugin.all/plugin3.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin3.jar + ${INSTALL_DATA} $(abs_top_builddir)/plugin.ext/plugin3-public.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin3-public.jar + ${INSTALL_DATA} $(abs_top_builddir)/plugin.ext/plugin3-public-src.zip $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin3-public-src.zip endif ${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar ${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png @@ -272,6 +274,9 @@ endif uninstall-local: rm -f $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar + rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin3.jar + rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin3-public.jar + rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin3-public-src.jar rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar rm -f $(DESTDIR)$(mandir)/man1/javaws.1 rm -f $(DESTDIR)$(bindir)/$(javaws) @@ -425,7 +430,7 @@ stamps/liveconnect.stamp: liveconnect-source-files.txt stamps/netx.stamp mkdir -p stamps touch $@ -stamps/liveconnect-dist.stamp: stamps/liveconnect.stamp +stamps/liveconnect-dist.stamp: stamps/liveconnect.stamp $(abs_top_builddir)/plugin.manifest $(NETX_DIR)/lib/classes.jar if test "x${LIVECONNECT_DIR}" != x; then \ (cd $(abs_top_builddir)/liveconnect ; \ mkdir -p lib ; \ @@ -434,6 +439,37 @@ stamps/liveconnect-dist.stamp: stamps/liveconnect.stamp find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \ cd src ; \ $(ZIP) -qr $(abs_top_builddir)/liveconnect/lib/src.zip $(LIVECONNECT_DIR) ) ; \ + rm -rf $(abs_top_builddir)/plugin.all ; \ + mkdir -p $(abs_top_builddir)/plugin.all/src ; \ + mkdir -p $(abs_top_builddir)/plugin.all/classes ; \ + (cd $(abs_top_builddir)/plugin.all/src ; \ + cp -a $(abs_top_builddir)/liveconnect/* $(abs_top_builddir)/plugin.all/src/ ; \ + rm -rf sun/applet/Applet3MessageHandler.java ; \ + unzip $(NETX_DIR)/lib/src.zip ; \ + $(ZIP) -qr ../plugin3-src.zip . ) ; \ + (cd $(abs_top_builddir)/plugin.all/classes ; \ + unzip $(abs_top_builddir)/liveconnect/lib/classes.jar ; \ + rm -rf META-INF sun/applet/Applet3MessageHandler.class ; \ + unzip $(NETX_DIR)/lib/classes.jar ; \ + rm -rf META-INF ; \ + $(BOOT_DIR)/bin/jar cfm ../plugin3.jar \ + $(abs_top_builddir)/plugin.manifest \ + javax/jnlp net com/jogamp/plugin/ui com/jogamp/plugin/applet jogamp/applet jogamp/plugin/jnlp sun/applet \ + $(LIVECONNECT_DIR) ) ; \ + rm -rf $(abs_top_builddir)/plugin.ext ; \ + mkdir -p $(abs_top_builddir)/plugin.ext/src ; \ + mkdir -p $(abs_top_builddir)/plugin.ext/classes ; \ + (cd $(abs_top_builddir)/plugin.ext/src ; \ + mkdir -p com/jogamp ; \ + cp -a $(abs_top_builddir)/netx/com/jogamp/plugin com/jogamp/ ; \ + $(ZIP) -qr ../plugin3-public-src.zip . ) ; \ + (cd $(abs_top_builddir)/plugin.ext/classes ; \ + mkdir -p com/jogamp ; \ + cp -a $(NETX_DIR)/com/jogamp/plugin com/jogamp/ ; \ + cp -a $(NETX_DIR)/javax . ; \ + $(BOOT_DIR)/bin/jar cfm ../plugin3-public.jar \ + $(abs_top_builddir)/plugin.manifest \ + javax/jnlp com/jogamp/plugin/ui com/jogamp/plugin/applet ) ; \ fi mkdir -p stamps touch $@ @@ -443,6 +479,8 @@ clean-liveconnect: rm -f stamps/liveconnect-dist.stamp rm -f liveconnect-source-files.txt rm -f stamps/liveconnect.stamp + rm -rf $(abs_top_builddir)/plugin.all + rm -rf $(abs_top_builddir)/plugin.ext # NetX # requires availability of OpenJDK source code including @@ -497,7 +535,7 @@ stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/netx.manifest (cd $(NETX_DIR) ; \ mkdir -p lib ; \ $(BOOT_DIR)/bin/jar cfm lib/classes.jar \ - $(abs_top_builddir)/netx.manifest javax/jnlp net ; \ + $(abs_top_builddir)/netx.manifest javax/jnlp net com/jogamp/plugin/ui com/jogamp/plugin/applet jogamp/applet jogamp/plugin/jnlp sun/applet ; \ cp -pPR $(SRC_DIR_LINK) $(NETX_SRCDIR) src; \ find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \ cd src ; \ |