# HG changeset patch # User Jiri Vanek # Date 1452855262 -3600 # Node ID fc1cd3b761d4f62423b32c0a7ee24ecd1bfd9f14 # Parent 0d8f8380c811e6a2598a75fb4c829be07b96550a Included maven artifacts and appstream metadata diff -r 0d8f8380c811 -r fc1cd3b761d4 ChangeLog --- a/ChangeLog Thu Jan 14 11:05:24 2016 +0100 +++ b/ChangeLog Fri Jan 15 11:54:22 2016 +0100 @@ -1,3 +1,17 @@ +2016-01-14 Jiri Vanek + + Included maven artifacts and appstream metadata + * .Makefile: (clean-local) and (.PHONY) now depends on clean-metadata. + ($(abs_top_builddir)/metadata) new target, copy metadata-in to metadata and + replace name, vendor and version check-meatdata, new stand alone target, checks + correctness of poms and xmls in metadata folder. (stamps/netx-dist.stamp) now + depends on $(abs_top_builddir)/metadata. clean-metadata, new target, removes + built metadata folder + * metadata.in/icedtea-web-javaws.appdata.xml: appstream metadata for javaws + * metadata.in/icedtea-web.metainfo.xml: appstream metadata for plugin + * metadata.in/icedtea-web-plugin.pom: pom for plugin.jar + * metadata.in/icedtea-web.pom: pom for netx jar + 2016-01-14 Jiri Vanek Vendor desktop entry replaced by X-Vendor diff -r 0d8f8380c811 -r fc1cd3b761d4 Makefile.am --- a/Makefile.am Thu Jan 14 11:05:24 2016 +0100 +++ b/Makefile.am Fri Jan 15 11:54:22 2016 +0100 @@ -220,7 +220,7 @@ export PLUGIN_VERSION = IcedTea-Web $(FULL_VERSION) export EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in policyeditor.desktop.in icedteaweb-completion \ - itweb-settings.desktop.in launcher $(top_srcdir)/tests html-gen.sh NEW_LINE_IFS + itweb-settings.desktop.in launcher $(top_srcdir)/tests html-gen.sh NEW_LINE_IFS $(top_srcdir)/metadata.in # reproducers `D`shortcuts export DTEST_SERVER=-Dtest.server.dir=$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR) @@ -263,7 +263,7 @@ check-local: $(RHINO_TESTS) $(JUNIT_TESTS) clean-local: clean-netx clean-plugin clean-liveconnect \ - clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-generated-docs clean-tests clean-bootstrap-directory + clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-generated-docs clean-metadata clean-tests clean-bootstrap-directory if [ -e stamps ] ; then \ rmdir stamps ; \ fi @@ -271,7 +271,7 @@ .PHONY: clean-IcedTeaPlugin clean-add-netx clean-add-netx-debug clean-add-plugin clean-add-plugin-debug \ clean-bootstrap-directory clean-native-ecj clean-desktop-files clean-netx-docs clean-docs clean-plugin-docs clean-generated-docs \ clean-tests check-local clean-launchers stamps/check-pac-functions.stamp stamps/run-netx-unit-tests.stamp clean-netx-tests \ - clean-junit-runner clean-netx-unit-tests + clean-junit-runner clean-netx-unit-tests clean-metadata install-exec-local: ${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/ $(DESTDIR)$(libdir) $(ICONS_DEST_DIR) @@ -508,6 +508,37 @@ sed -i '/RhinoBasedPacEvaluator/ d' $@ endif +$(abs_top_builddir)/metadata: $(top_srcdir)/metadata.in + mkdir -p $(abs_top_builddir)/metadata-work ; \ + METAFILES=`ls $(top_srcdir)/metadata.in` ; \ + for F in $$METAFILES ; do \ + cat $(top_srcdir)/metadata.in/$$F | sed "s;%{name};$(PACKAGE_NAME);g" | sed "s;%{version};$(FULL_VERSION);g" > $(abs_top_builddir)/metadata-work/$$F ; \ + done ; \ + mv $(abs_top_builddir)/metadata-work $(abs_top_builddir)/metadata ; + +check-metadata: $(abs_top_builddir)/metadata + xmllint --noout $(abs_top_builddir)/metadata/* ; \ + if [ $$? -eq 0 ] ; then \ + echo "Passed: well formed" ; \ + else \ + echo "FAILED: well formed" ; \ + fi ; \ + xmllint --noout --schema http://maven.apache.org/xsd/maven-4.0.0.xsd $(abs_top_builddir)/metadata/*.pom ; \ + if [ $$? -eq 0 ] ; then \ + echo "Passed: valid poms" ; \ + else \ + echo "FAILED: valid poms" ; \ + fi ; \ + appstream-util validate $(abs_top_builddir)/metadata/*.appdata.xml $(abs_top_builddir)/metadata/*.metainfo.xml ; \ + if [ $$? -eq 0 ] ; then \ + echo "Passed: valid software descriptors" ; \ + else \ + echo "FAILED: valid software descriptors" ; \ + fi ; +# very strange results: +# appstreamcli validate $(abs_top_builddir)/metadata/*.appdata.xml $(abs_top_builddir)/metadata/*.metainfo.xml + + stamps/generate-docs.stamp: stamps/netx.stamp mkdir -p "$(DOCS_DIR)" ; \ HTML_DOCS_TARGET_DIR="$(DOCS_DIR)/html" ; \ @@ -575,7 +606,7 @@ mkdir -p stamps touch $@ -stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/netx.manifest stamps/generate-docs.stamp +stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/netx.manifest stamps/generate-docs.stamp $(abs_top_builddir)/metadata (cd $(NETX_DIR) ; \ mkdir -p lib ; \ $(SYSTEM_JDK_DIR)/bin/jar cfm lib/classes.jar \ @@ -691,6 +722,9 @@ rm -f stamps/generate-docs.stamp +clean-metadata: + rm -rf $(abs_top_builddir)/metadata + # check # ========================== diff -r 0d8f8380c811 -r fc1cd3b761d4 metadata.in/icedtea-web-javaws.appdata.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/metadata.in/icedtea-web-javaws.appdata.xml Fri Jan 15 11:54:22 2016 +0100 @@ -0,0 +1,47 @@ + + + + javaws.desktop + %{name} + Java + Javaws implementation from OpenJDK + + +

+Free java implementation of jnlp launching protocol. +

+Originally based on NetX,but now bringing many improvements compared to proprietary implementations. +

+Powerful debug console, internal appletviewer, safe run-in-sandbox option, extendable "remember me" options and custom policy editor. +

+It have also possibility to turn all security off and just enjoy legacy web (on your own risk). All via simple itweb-settings gui. +

+ + http://icedtea.classpath.org/wiki/IcedTea-Web + CC0-1.0 + distro-pkg-dev@openjdk.java.net + +​ text/jnlp + + + + http://icedtea.classpath.org/wiki/images/Javaws_splash.png + Itw self describing splash screen + + + http://icedtea.classpath.org/wiki/images/Fullysigned.png + Run in sandbox dialog + + + http://icedtea.classpath.org/wiki/images/Policyeditor-in-use.png + Simplified view of policy editor + + + diff -r 0d8f8380c811 -r fc1cd3b761d4 metadata.in/icedtea-web-plugin.pom --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/metadata.in/icedtea-web-plugin.pom Fri Jan 15 11:54:22 2016 +0100 @@ -0,0 +1,9 @@ + + 4.0.0 + sun.applet + %{name}-plugin + %{version} + diff -r 0d8f8380c811 -r fc1cd3b761d4 metadata.in/icedtea-web.metainfo.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/metadata.in/icedtea-web.metainfo.xml Fri Jan 15 11:54:22 2016 +0100 @@ -0,0 +1,12 @@ + + + %{name} + epiphany.desktop + firefox.desktop + midori.desktop + Java + Browser plug-in implementation from OpenJDK. This plugin is running java applets + http://icedtea.classpath.org/wiki/IcedTea-Web + CC0-1.0 + distro-pkg-dev@openjdk.java.net + diff -r 0d8f8380c811 -r fc1cd3b761d4 metadata.in/icedtea-web.pom --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/metadata.in/icedtea-web.pom Fri Jan 15 11:54:22 2016 +0100 @@ -0,0 +1,9 @@ + + 4.0.0 + net.sourceforge.jnlp + %{name} + %{version} +