/hg/icedtea-web: 2 new changesets

[jvanek at icedtea.classpath.org]

changeset edc9f4d7f576 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=edc9f4d7f576
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Apr 25 11:42:33 2017 +0200

	* html-gen.sh: fixed case for some cygwin versions, when changelog html generation could end in endless loop.


changeset bbb78a496f99 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bbb78a496f99
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Apr 25 11:45:30 2017 +0200

	* Makefile.am: cp -a got extracted -a switch to variable, disabled on win, which may fail on certain combinations ow wndows x cygwin.


diffstat:

 ChangeLog   |  10 ++++++++++
 Makefile.am |   6 ++++--
 html-gen.sh |   3 ++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diffs (57 lines):

diff -r 3deb4b2e0213 -r bbb78a496f99 ChangeLog
--- a/ChangeLog	Mon Apr 24 17:05:21 2017 +0200
+++ b/ChangeLog	Tue Apr 25 11:45:30 2017 +0200
@@ -1,3 +1,13 @@
+2017-04-25  Jiri Vanek <jvanek at redhat.com>
+
+	* Makefile.am: cp -a got extracted -a switch to variable, disabled on win,
+	which may fail on certain combinations ow wndows x cygwin.
+
+2017-04-25  Jiri Vanek <jvanek at redhat.com>
+
+	* html-gen.sh: fixed case for some cygwin versions, when changelog
+	html generation could end in endless loop.
+
 2017-04-24  Jiri Vanek <jvanek at redhat.com>
 
 	javaws made to understand jnlp "network protokol"
diff -r 3deb4b2e0213 -r bbb78a496f99 Makefile.am
--- a/Makefile.am	Mon Apr 24 17:05:21 2017 +0200
+++ b/Makefile.am	Tue Apr 25 11:45:30 2017 +0200
@@ -20,9 +20,11 @@
 	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)")
+	export CPA=""
 else
 	export TOP_BUILD_DIR = $(abs_top_builddir)
 	export TOP_SRC_DIR = $(abs_top_srcdir)
+	export CPA="-a"
 endif
 
 export NETX_DIR = $(TOP_BUILD_DIR)/netx.build
@@ -670,9 +672,9 @@
 	   ${INSTALL_DATA} -D $${files} \
 	   $(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \
 	 done)
-	cp -a $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
+	cp $(CPA) $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
 	  $(NETX_DIR)/net/sourceforge/jnlp/runtime
-	cp -a build.properties $(NETX_DIR)/net/sourceforge/jnlp/
+	cp $(CPA) build.properties $(NETX_DIR)/net/sourceforge/jnlp/
 	mkdir -p stamps
 	touch $@
 
diff -r 3deb4b2e0213 -r bbb78a496f99 html-gen.sh
--- a/html-gen.sh	Mon Apr 24 17:05:21 2017 +0200
+++ b/html-gen.sh	Tue Apr 25 11:45:30 2017 +0200
@@ -141,7 +141,8 @@
                 BOLD=0
             fi
             date_regex=[0-9]{4}-[0-9]{2}-[0-9]{2}
-            if [[ "$LINE" =~ $date_regex* ]] # Matches line starting with eg 2013-07-01
+            cutLine=`echo $LINE | sed "s/&.*//"` # on some versions of windows, the & caused the [[ ]] command to fail
+            if [[ "$cutLine" =~ $date_regex ]] # Matches line starting with eg 2013-07-01
             then
                 html_space="\ \ "
                 if [ -n "${REPO_URL}" ]; then