/hg/icedtea-web: 2 new changesets

[jvanek at icedtea.classpath.org]

changeset 69a8f501e9d2 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=69a8f501e9d2
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Apr 24 10:02:33 2017 +0200

	fixed PR3365:  icedteaweb-completion.in: _itweb-settings renamed to _itwebsettings


changeset 1e0fcdc4f72e in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=1e0fcdc4f72e
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Apr 24 10:06:48 2017 +0200

	Merge


diffstat:

 ChangeLog                |  16 ++++++++++++++++
 Makefile.am              |   3 ++-
 icedteaweb-completion.in |   4 ++--
 3 files changed, 20 insertions(+), 3 deletions(-)

diffs (64 lines):

diff -r f34f9ca3c3ef -r 1e0fcdc4f72e ChangeLog
--- a/ChangeLog	Mon Apr 10 18:55:17 2017 +0200
+++ b/ChangeLog	Mon Apr 24 10:06:48 2017 +0200
@@ -1,3 +1,19 @@
+2017-04-24  Jiri Vanek <jvanek at redhat.com>
+
+	fixed PR3365
+	* icedteaweb-completion.in: _itweb-settings renamed to _itwebsettings
+
+2017-04-11  Michal Vala <mvala at redhat.com>
+            Jiri Vanek <jvanek at redhat.com>
+
+	* .Makefile.am: on windows, replace prefix by its cygwin path
+
+2017-04-10  Michal Vala <mvala at redhat.com>
+            Jiri Vanek  <jvanek at redhat.com>
+
+	fixed quoting wrongly interpreted by cigwin
+	* Makefile.am: LAUNCHER_BOOTCLASSPATH now using ' instead of "
+
 2017-04-10  Jiri Vanek <jvanek at redhat.com>
 
 	Reproduced issue PR3351
diff -r f34f9ca3c3ef -r 1e0fcdc4f72e Makefile.am
--- a/Makefile.am	Mon Apr 10 18:55:17 2017 +0200
+++ b/Makefile.am	Mon Apr 24 10:06:48 2017 +0200
@@ -19,6 +19,7 @@
 if WINDOWS
 	export TOP_BUILD_DIR := $(shell cygpath -p -m "$(abs_top_builddir)")
 	export TOP_SRC_DIR := $(shell cygpath -p -m "$(abs_top_srcdir)")
+	export prefix := $(shell cygpath -p -m "$(prefix)")
 else
 	export TOP_BUILD_DIR = $(abs_top_builddir)
 	export TOP_SRC_DIR = $(abs_top_srcdir)
@@ -155,7 +156,7 @@
 export UNIFIED_JACOCO_CLASSPATH=$(call joinsegments, $(UNIFIED_JACOCO_CLASSPATH_SEGMENTS))
 export UNIFIED_BOOTCLASSPATH=-Xbootclasspath/a:$(UNIFIED_CLASSPATH)
 # note javaws, itwebsettings and policyeditor (== LAUNCHER_BOOTCLASSPATH) must be always able to compile and run *without* plugin
-export LAUNCHER_BOOTCLASSPATH="$(UNIFIED_BOOTCLASSPATH)"
+export LAUNCHER_BOOTCLASSPATH='$(UNIFIED_BOOTCLASSPATH)'
 export PLUGIN_BOOTCLASSPATH='"$(UNIFIED_BOOTCLASSPATH)"'
 export PLUGIN_COVERAGE_BOOTCLASSPATH='"-Xbootclasspath/a:$(UNIFIED_JACOCO_CLASSPATH)"'
 
diff -r f34f9ca3c3ef -r 1e0fcdc4f72e icedteaweb-completion.in
--- a/icedteaweb-completion.in	Mon Apr 10 18:55:17 2017 +0200
+++ b/icedteaweb-completion.in	Mon Apr 24 10:06:48 2017 +0200
@@ -1,7 +1,7 @@
 #/bin/bash
 #place this file over to /etc/bash_completion.d/ to make this file useful
 #Note: If you do not have bash-completion you will need to install it
-_itweb-settings()
+_itwebsettings()
 {
     local cur prev opts base
     cur="${COMP_WORDS[COMP_CWORD]}"
@@ -13,7 +13,7 @@
     COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
     return 0
 }
-complete -F _itweb-settings itweb-settings
+complete -F _itwebsettings itweb-settings
 
 _policyeditor()
 {