Mercurial > hg > release > icedtea-web-1.6

changeset 1287:fc1cd3b761d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Included maven artifacts and appstream metadata
author Jiri Vanek <jvanek@redhat.com>
date Fri, 15 Jan 2016 11:54:22 +0100
parents 0d8f8380c811
children 030e419bfb61
files ChangeLog Makefile.am metadata.in/icedtea-web-javaws.appdata.xml metadata.in/icedtea-web-plugin.pom metadata.in/icedtea-web.metainfo.xml metadata.in/icedtea-web.pom
diffstat 6 files changed, 129 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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 <jvanek@redhat.com>
+
+	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  <jvanek@redhat.com>
 
 	Vendor desktop entry replaced by X-Vendor
--- 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
 # ==========================
 
--- /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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+<!-- <component> -->
+  <id>javaws.desktop</id>
+  <name>%{name}</name>
+  <name>Java</name>
+  <summary>Javaws implementation from OpenJDK</summary>
+<!--   <provides>
+​    <library>netx.jar</library>
+​    <library>plugin.jar</library>
+​    <binary>javaws</binary>
+​    <binary>itweb-settings</binary>
+​    <binary>policyeditor</binary>
+​  </provides>
+-->
+  <description>
+<p>
+Free java implementation of jnlp launching protocol.
+</p><p>
+Originally based on NetX,but now bringing many improvements compared to proprietary implementations.
+</p><p>
+Powerful debug console, internal appletviewer, safe run-in-sandbox option, extendable "remember me" options and custom policy editor.
+</p><p>
+It have also  possibility to turn all security off and just enjoy legacy web (on your own risk). All via simple itweb-settings gui.
+</p>
+   </description>
+  <url type="homepage">http://icedtea.classpath.org/wiki/IcedTea-Web</url>
+  <metadata_license>CC0-1.0</metadata_license>
+  <updatecontact>distro-pkg-dev@openjdk.java.net</updatecontact>
+  <mimetypes>
+​    <mimetype>text/jnlp</mimetype>
+  </mimetypes>
+ <screenshots>
+  <screenshot type="default"> 
+   <image>http://icedtea.classpath.org/wiki/images/Javaws_splash.png</image>
+   <caption>Itw self describing splash screen</caption>
+  </screenshot>
+  <screenshot>
+   <image>http://icedtea.classpath.org/wiki/images/Fullysigned.png</image>
+   <caption>Run in sandbox dialog</caption>
+  </screenshot>
+  <screenshot>
+   <image>http://icedtea.classpath.org/wiki/images/Policyeditor-in-use.png</image>
+   <caption>Simplified view of policy editor</caption>
+  </screenshot>
+ </screenshots>
+</component>
--- /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 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                      http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>sun.applet</groupId>
+    <artifactId>%{name}-plugin</artifactId>
+    <version>%{version}</version>
+</project>
--- /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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="addon">
+  <id>%{name}</id>
+  <extends>epiphany.desktop</extends>
+  <extends>firefox.desktop</extends>
+  <extends>midori.desktop</extends>
+  <name>Java</name>
+  <summary>Browser plug-in implementation from OpenJDK. This plugin is running java applets</summary>
+  <url type="homepage">http://icedtea.classpath.org/wiki/IcedTea-Web</url>
+  <metadata_license>CC0-1.0</metadata_license>
+  <updatecontact>distro-pkg-dev@openjdk.java.net</updatecontact>
+</component>
--- /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 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                      http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>net.sourceforge.jnlp</groupId>
+    <artifactId>%{name}</artifactId>
+    <version>%{version}</version>
+</project>