diff options
Diffstat (limited to 'java/icedtea-web/files/patch-Makefile.in')
| -rw-r--r-- | java/icedtea-web/files/patch-Makefile.in | 101 |
1 files changed, 41 insertions, 60 deletions
diff --git a/java/icedtea-web/files/patch-Makefile.in b/java/icedtea-web/files/patch-Makefile.in index 21650451abd0..d85ccdcf11bc 100644 --- a/java/icedtea-web/files/patch-Makefile.in +++ b/java/icedtea-web/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2014-08-15 03:08:34.349127000 -0400 -+++ Makefile.in 2014-10-21 18:14:35.000000000 -0400 -@@ -309,9 +309,9 @@ +--- Makefile.in.orig 2016-02-03 13:49:10 UTC ++++ Makefile.in +@@ -338,9 +338,9 @@ ECHO_WHITELIST = if [ -f $(REPRODUCERS_C #end of exported autoconf copies # binary names @@ -12,25 +12,22 @@ # the launcher needs to know $(bindir) and $(datadir) which can be different at # make-time from configure-time -@@ -852,34 +852,36 @@ +@@ -900,10 +900,10 @@ install-exec-local: @ENABLE_PLUGIN_TRUE@ ${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar ${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 +- ${INSTALL_DATA} $(abs_top_srcdir)/javaws.png $(ICONS_DEST_DIR)/ - ${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir) - ${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir) - ${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir) ++ ${INSTALL_DATA} $(abs_top_srcdir)/javaws.png $(ICONS_DEST_DIR)/itweb-javaws.png + ${INSTALL_SCRIPT} launcher.build/$(javaws) $(DESTDIR)$(bindir) + ${INSTALL_SCRIPT} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir) + ${INSTALL_SCRIPT} launcher.build/$(policyeditor) $(DESTDIR)$(bindir) + # all generated manpages are installed in swarm install-data-local: - ${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1 -- ${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(mandir)/man1 -+ ${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(mandir)/man1/itweb-javaws.1 - ${INSTALL_DATA} $(NETX_SRCDIR)/itweb-settings.1 $(DESTDIR)$(mandir)/man1 -- ${INSTALL_DATA} $(NETX_SRCDIR)/policyeditor.1 $(DESTDIR)$(mandir)/man1 -+ ${INSTALL_DATA} $(NETX_SRCDIR)/policyeditor.1 $(DESTDIR)$(mandir)/man1/itweb-policyeditor.1 - @ENABLE_DOCS_TRUE@ ${mkinstalldirs} $(DESTDIR)$(htmldir) +@@ -913,12 +913,14 @@ install-data-local: @ENABLE_DOCS_TRUE@ (cd ${abs_top_builddir}/docs/netx; \ @ENABLE_DOCS_TRUE@ for files in $$(find . -type f); \ @ENABLE_DOCS_TRUE@ do \ @@ -46,42 +43,26 @@ +@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \ @ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ done) - uninstall-local: - rm -f $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) - rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar + # all generated manpages must be removed one by one +@@ -928,7 +930,7 @@ uninstall-local: rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar -- rm -f $(DESTDIR)$(mandir)/man1/javaws.1 -+ rm -f $(DESTDIR)$(mandir)/man1/itweb-javaws.1 - rm -f $(DESTDIR)$(mandir)/man1/itweb-settings.1 -- rm -f $(DESTDIR)$(mandir)/man1/policyeditor.1 -+ rm -f $(DESTDIR)$(mandir)/man1/itweb-policyeditor.1 - rm -f $(DESTDIR)$(bindir)/$(javaws) - rm -f $(DESTDIR)$(bindir)/$(itweb_settings) - rm -f $(DESTDIR)$(bindir)/$(policyeditor) -@@ -1042,10 +1044,10 @@ - find $(NETX_SRCDIR) -name '*.java' | sort > $@ ; \ - for src in $(NETX_EXCLUDE_SRCS) ; \ - do \ -- sed -i "/$${src}/ d" $@ ; \ -+ sed -i -e "/$${src}/ d" $@ ; \ - done --@WITH_RHINO_FALSE@ sed -i '/RhinoBasedPacEvaluator/ d' $@ --@HAVE_JAVA7_FALSE@ sed -i '/VariableX509TrustManagerJDK7/ d' $@ -+@WITH_RHINO_FALSE@ sed -i -e '/RhinoBasedPacEvaluator/ d' $@ -+@HAVE_JAVA7_FALSE@ sed -i -e '/VariableX509TrustManagerJDK7/ d' $@ - - stamps/netx-html-gen.stamp: - (cd $$NETX_SRCDIR/..; \ -@@ -1059,7 +1061,7 @@ - mkdir -p stamps - touch $@ - --stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp stamps/netx-html-gen.stamp -+stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp - mkdir -p $(NETX_DIR) - $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ - -d $(NETX_DIR) \ -@@ -1070,7 +1072,8 @@ + rm -r $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png + rm -r $(ICONS_DEST_DIR)/javaws.png +- KNOWN_MANS="icedtea-web.1 icedtea-web-plugin.1 itweb-settings.1 javaws.1 policyeditor.1" ; \ ++ KNOWN_MANS="icedtea-web.1 icedtea-web-plugin.1 itweb-settings.1 itweb-javaws.1 itweb-policyeditor.1" ; \ + KNOWN_DIRS="man1 de/man1 pl/man1 cs/man1" ; \ + for file in $$KNOWN_MANS ; do \ + for dir in $$KNOWN_DIRS ; do \ +@@ -1161,7 +1163,7 @@ stamps/generate-docs.stamp: stamps/netx. + echo "<body><h3>$(PLUGIN_VERSION) docs:</h3>" >> "$$HTML_DOCS_INDEX" ; \ + for LANG_ID in en_US.UTF-8 cs_CZ.UTF-8 pl_PL.UTF-8 de_DE.UTF-8 ; do \ + ID=`echo "$$LANG_ID" | head -c 2` ; \ +- ENCOD=`echo "$$LANG_ID" | tail -c 6 -` ; \ ++ ENCOD=`echo "$$LANG_ID" | tail -c 6` ; \ + export LANG=$$LANG_ID; \ + mkdir "$$HTML_DOCS_TARGET_DIR/$$ID" ; \ + echo "<li><a href='$$ID/icedtea-web.html'>$$LANG_ID</a></li>" >> "$$HTML_DOCS_INDEX" ; \ +@@ -1203,7 +1205,8 @@ stamps/netx.stamp: netx-source-files.txt (cd $(NETX_RESOURCE_DIR); \ for files in $$(find . -type f); \ do \ @@ -91,7 +72,7 @@ $(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \ done) cp -a $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \ -@@ -1100,7 +1103,7 @@ +@@ -1233,7 +1236,7 @@ clean-netx: rm -f $(NETX_RESOURCE_DIR)/{NEWS,AUTHORS,COPYING,ChangeLog}.html clean-desktop-files: @@ -100,7 +81,7 @@ rm -f itweb-settings.desktop launcher.build/$(javaws): launcher/launchers.in -@@ -1133,7 +1136,7 @@ +@@ -1266,7 +1269,7 @@ clean-launchers: fi javaws.desktop: javaws.desktop.in @@ -109,7 +90,7 @@ itweb-settings.desktop: $(srcdir)/itweb-settings.desktop.in sed "s#PATH_TO_ITWEB_SETTINGS#$(bindir)/$(itweb_settings)#" \ -@@ -1141,7 +1144,7 @@ +@@ -1274,7 +1277,7 @@ itweb-settings.desktop: $(srcdir)/itweb- policyeditor.desktop: $(srcdir)/policyeditor.desktop.in sed 's#PATH_TO_POLICYEDITOR#$(bindir)/$(policyeditor)#' \ @@ -118,16 +99,16 @@ # documentation -@@ -1252,7 +1255,7 @@ +@@ -1400,7 +1403,7 @@ stamps/netx-dist-tests-prepare-reproduce notSrcFiles=`find . -mindepth 1 -type f \! -name "*.java" | sed "s/.\/*//"` ; \ - $(BOOT_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect -d "$(REPRODUCERS_BUILD_DIR)/$$dir/" $$srcFiles ; \ + $(SYSTEM_JDK_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect -d "$(REPRODUCERS_BUILD_DIR)/$$dir/" $$srcFiles ; \ if [ -n "$$notSrcFiles" ] ; then \ - cp -R --parents $$notSrcFiles "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \ + tar -c -f - "$$notSrcFiles" | tar -x -f - -C "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \ fi ; \ cd "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \ if [ -f $(META_MANIFEST) ]; \ -@@ -1307,7 +1310,7 @@ +@@ -1465,7 +1468,7 @@ stamps/change-dots-to-paths.stamp: stamp path="`dirname $$slashed_dir`" ; \ file="`basename $$slashed_dir`.jar" ; \ echo "copying $$dir.jar to $$path as $$file" ; \ @@ -136,16 +117,16 @@ cp $$dir".jar" "$$path"/"$$file" ; \ fi ; \ done ; \ -@@ -1435,7 +1438,7 @@ - whiteListed=`cat $(REPRODUCERS_CLASS_WHITELIST)`; \ +@@ -1598,7 +1601,7 @@ $(REPRODUCERS_CLASS_NAMES): + whiteListed=$(RUN_WHITELIST_FILTER); \ cd $(TEST_EXTENSIONS_TESTS_DIR) ; \ class_names= ; \ - for test in `find -type f` ; do \ + for test in `find . -type f` ; do \ class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \ class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \ - INLCUDE="NO" ; \ -@@ -1625,7 +1628,7 @@ + INCLUDE="NO" ; \ +@@ -1783,7 +1786,7 @@ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME): $(UNIT_CLASS_NAMES): cd $(NETX_UNIT_TEST_DIR) ; \ class_names= ; \ @@ -154,7 +135,7 @@ class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \ class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \ class_names="$$class_names $$class_name" ; \ -@@ -1636,10 +1639,7 @@ +@@ -1794,10 +1797,7 @@ stamps/run-netx-unit-tests.stamp: stamps $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(UNIT_CLASS_NAMES) filename=" " ; \ cd $(NETX_UNIT_TEST_SRCDIR) ; \ @@ -165,10 +146,10 @@ + tar -c -f - `find . -type f \! -iname "*.java"` | tar -x -f - -C $(NETX_UNIT_TEST_DIR) ; \ cd $(NETX_UNIT_TEST_DIR) ; \ class_names=`cat $(UNIT_CLASS_NAMES)` ; \ - CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR):$(TAGSOUP_JAR) ; \ -@@ -2131,9 +2131,7 @@ + CLASSPATH=$(call joinsegments, $(NETX_DIR)/lib/classes.jar $(abs_top_builddir)/liveconnect/lib/classes.jar $(JUNIT_RUNTIME) $(JUNIT_RUNNER_JAR) $(TEST_EXTENSIONS_DIR) . $(TEST_EXTENSIONS_SRCDIR) $(TAGSOUP_JAR)) ; \ +@@ -2095,9 +2095,7 @@ clean-test-code-coverage-tools-jacoco: @ENABLE_PLUGIN_TRUE@ $(PLUGIN_TEST_SRCS) ; - @ENABLE_PLUGIN_TRUE@ $(BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \ + @ENABLE_PLUGIN_TRUE@ $(SYSTEM_JDK_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \ @ENABLE_PLUGIN_TRUE@ plugin/tests/LiveConnect/*.class ; -@ENABLE_PLUGIN_TRUE@ cp -pPR $(SRC_DIR_LINK) $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \ -@ENABLE_PLUGIN_TRUE@ plugin/tests/LiveConnect ; |