/hg/icedtea-web: 3 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Apr 26 17:20:38 UTC 2017
changeset 279d81001d01 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=279d81001d01
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Apr 26 19:07:31 2017 +0200
* netx/net/sourceforge/jnlp/runtime/Boot.java: added support for jnlp:other_protocol:// handlig
* tests/netx/unit/net/sourceforge/jnlp/runtime/BootTest.java: added unitt tests for various jnlp protocol cases
changeset 4d2719ecfec6 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=4d2719ecfec6
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Apr 26 19:28:12 2017 +0200
jars used during windows build are now saved to distribution image
* Makefile.am: (printvars) new target to print out all used variables (printvarsfile) new target to save all variables to file. Those is only way I found to extract jars from configure in without manual enumeration. (uninstall-local) on windows, removes copied dependence. (install-data-local) on windows, copy all used jars. Some selected jars are duplicated in runtime dependeces
changeset ba53197d6257 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=ba53197d6257
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Apr 26 19:29:53 2017 +0200
* Makefile.am: (composeclasspath) is now quoting its result. Needed for some cygwin build and praying not destroying everything.
diffstat:
ChangeLog | 20 +++++
Makefile.am | 43 ++++++++++-
netx/net/sourceforge/jnlp/runtime/Boot.java | 7 +-
tests/netx/unit/net/sourceforge/jnlp/runtime/BootTest.java | 56 ++++++++++++++
4 files changed, 123 insertions(+), 3 deletions(-)
diffs (192 lines):
diff -r 4d892fe13055 -r ba53197d6257 ChangeLog
--- a/ChangeLog Tue Apr 25 14:52:45 2017 +0200
+++ b/ChangeLog Wed Apr 26 19:29:53 2017 +0200
@@ -1,3 +1,23 @@
+2017-04-26 Jiri Vanek <jvanek at redhat.com>
+
+ * Makefile.am: (composeclasspath) is now quoting its result. Needed
+ for some cygwin build and praying not destroying everything.
+
+2017-04-26 Jiri Vanek <jvanek at redhat.com>
+
+ jars used during windows build are now saved to distribution image
+ * Makefile.am: (printvars) new target to print out all used variables
+ (printvarsfile) new target to save all variables to file. Those is only way
+ I found to extract jars from configure in without manual enumeration.
+ (uninstall-local) on windows, removes copied dependence. (install-data-local)
+ on windows, copy all used jars. Some selected jars are duplicated in runtime
+ dependeces
+
+2017-04-26 Jiri Vanek <jvanek at redhat.com>
+
+ * netx/net/sourceforge/jnlp/runtime/Boot.java: added support for jnlp:other_protocol:// handlig
+ * tests/netx/unit/net/sourceforge/jnlp/runtime/BootTest.java: added unitt tests for various jnlp protocol cases
+
2017-04-25 Jiri Vanek <jvanek at redhat.com>
* tests/reproducers/signed/AppletTestSigned/testcases/AppletTestSignedTests.java: added tests for jnlp protocol
diff -r 4d892fe13055 -r ba53197d6257 Makefile.am
--- a/Makefile.am Tue Apr 25 14:52:45 2017 +0200
+++ b/Makefile.am Wed Apr 26 19:29:53 2017 +0200
@@ -12,7 +12,7 @@
$(subst $(SPACE),$(CLASSPATH_SEPARATOR),$(strip $1))
endef
define composeclasspath
-$(if $(call joinsegments,$1),-classpath $(call joinsegments,$1),)
+$(if $(call joinsegments,$1),-classpath "$(call joinsegments,$1)",)
endef
# Source directories
@@ -34,6 +34,9 @@
export ICONS_DEST_DIR=$(DESTDIR)$(datadir)/pixmaps
export BASH_CMPL_DEST_DIR=$(DESTDIR)$(sysconfdir)/bash_completion.d
+export WIN_ALL_DEPS=$(DESTDIR)$(prefix)/win-deps-all
+export WIN_RUN_DEPS=$(DESTDIR)$(prefix)/win-deps-runtime
+
export REPORT_STYLES_DIRNAME=report-styles
export TESTS_SRCDIR=$(TOP_SRC_DIR)/tests
@@ -318,7 +321,9 @@
${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
# all generated manpages are installed in swarm
-install-data-local:
+# all windows depndences are copied for windows build, and known one are copied/removed as necessary
+# the makefile variables are used in favor of global variables, but maybe they will need to get mixed together
+install-data-local: printvarsfile
${mkinstalldirs} -d $(DESTDIR)$(mandir)
cp -r "$(DOCS_DIR)/man/"* $(DESTDIR)$(mandir)/
if ENABLE_DOCS
@@ -336,6 +341,27 @@
done)
endif
endif
+if WINDOWS
+ mkdir $(WIN_ALL_DEPS)
+ mkdir $(WIN_RUN_DEPS)
+ JARSVARS=` ( set -o posix ; set ) | sed "s/.*=//" | grep \\.jar$$ ` ; \
+ JARSMAKE=` cat $(TOP_BUILD_DIR)/printvarsfile | sed "s/.*=//" | grep \\.jar$$ ` ; \
+ for JAR in $$JARSMAKE ; do \
+ if [ -f $ $$JAR ] ; then \
+ cp -v $$JAR $(WIN_ALL_DEPS)/ ; \
+ fi ; \
+ done ;
+ rm -f $(WIN_ALL_DEPS)/jar ;
+ for JAR in `ls $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/*.jar` ; do \
+ rm -v $(WIN_ALL_DEPS)/`basename $$JAR` ; \
+ done;
+if WITH_RHINO
+ cp -v $(RHINO_JAR) $(WIN_RUN_DEPS)/
+endif
+if HAVE_TAGSOUP
+ cp -v $(TAGSOUP_JAR) $(WIN_RUN_DEPS)/
+endif
+endif
# all generated manpages must be removed one by one
uninstall-local:
@@ -357,6 +383,10 @@
rm -f $(DESTDIR)$(bindir)/$(policyeditor)
rm -rf $(DESTDIR)$(htmldir)
rm -f $(BASH_CMPL_DEST_DIR)/icedteaweb-completion
+if WINDOWS
+ rm -rf $(WIN_ALL_DEPS)
+ rm -rf $(WIN_RUN_DEPS)
+endif
# Plugin
@@ -1614,6 +1644,15 @@
touch stamps/plugin-tests.stamp
endif
+
+printvarsfile:
+ $(MAKE) printvars > $@
+
+printvars:
+ $(foreach v, $(.VARIABLES), $(info $(v)=$($(v))))
+
+
+
# Target Aliases
# ===============
diff -r 4d892fe13055 -r ba53197d6257 netx/net/sourceforge/jnlp/runtime/Boot.java
--- a/netx/net/sourceforge/jnlp/runtime/Boot.java Tue Apr 25 14:52:45 2017 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Wed Apr 26 19:29:53 2017 +0200
@@ -232,7 +232,12 @@
OutputController.getLogger().printOut(itwInfoMessage);
}
- private static String fixJnlpProtocol(String param) {
+ static String fixJnlpProtocol(String param) {
+ //remove jnlp: for case like jnlp:https://some.app/file.jnlp
+ if (param.matches("^jnlp[s]?:.*://.*")){
+ param = param.replaceFirst("^jnlp[s]?:", "");
+ }
+ //transalte jnlp://some.app/file.jnlp to http/https
return param.replaceFirst("^jnlp:", "http:").replaceFirst("^jnlps:", "https:");
}
diff -r 4d892fe13055 -r ba53197d6257 tests/netx/unit/net/sourceforge/jnlp/runtime/BootTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/netx/unit/net/sourceforge/jnlp/runtime/BootTest.java Wed Apr 26 19:29:53 2017 +0200
@@ -0,0 +1,56 @@
+/*
+ Copyright (C) 2017 Red Hat, Inc.
+
+ This file is part of IcedTea.
+
+ IcedTea is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2.
+
+ IcedTea 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 for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with IcedTea; see the file COPYING. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library. Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module. An independent module is a module which is not derived from
+ or based on this library. If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so. If you do not wish to do so, delete this
+ exception statement from your version.
+ */
+package net.sourceforge.jnlp.runtime;
+
+import net.sourceforge.jnlp.util.logging.NoStdOutErrTest;
+import org.junit.Assert;
+
+import org.junit.Test;
+
+public class BootTest extends NoStdOutErrTest {
+
+ @Test
+ public void fixJnlpProtocolTest() throws Exception {
+ Assert.assertEquals("http://www.com/file.jnlp", Boot.fixJnlpProtocol("jnlp://www.com/file.jnlp"));
+ Assert.assertEquals("https://www.com/file.jnlp", Boot.fixJnlpProtocol("jnlps://www.com/file.jnlp"));
+ Assert.assertEquals("http://www.com/file.jnlp", Boot.fixJnlpProtocol("jnlp:http://www.com/file.jnlp"));
+ Assert.assertEquals("https://www.com/file.jnlp", Boot.fixJnlpProtocol("jnlp:https://www.com/file.jnlp"));
+ Assert.assertEquals("http://www.com/file.jnlp", Boot.fixJnlpProtocol("jnlps:http://www.com/file.jnlp"));
+ Assert.assertEquals("https://www.com/file.jnlp", Boot.fixJnlpProtocol("jnlps:https://www.com/file.jnlp"));
+ }
+
+}
More information about the distro-pkg-dev
mailing list