IcedTea-Web branched for 1.2 release

[Matthias Klose]

On 05.02.2012 15:27, Matthias Klose wrote:
> On 22.01.2012 15:34, Matthias Klose wrote:
>> On 11.01.2012 21:07, Deepak Bhole wrote:
>>> IcedTea-Web has been branched for a 1.2 release:
>>> http://icedtea.classpath.org/hg/release/icedtea-web-1.2/
>>>
>>> The release is tentatively scheduled for Jan 30th, 2012. The late date
>>> is to accommodate a pending patch from Jiri Vanek who is away until the
>>> 23rd.
>>>
>>> If there are any issues with the above date, please let me know.
>>
>> building with OpenJDK 7 doesn't define
>>
>> "application/x-java-applet;version=1.7:class,jar:IcedTea;" \
>> "application/x-java-bean;version=1.7:class,jar:IcedTea;" \
>>
>> is this intended or are these not defined at all for the Oracle proprietary
>> plugin?
>
> Here is a patch which sets these depending on the runtime used for the build.

typo fixed.
-------------- next part --------------

	* acinclude.m4 (IT_FIND_JAVA): Set VERSION_DEFS.
	* Makefile.am ($(PLUGIN_DIR)/%.o): Pass $(VERSION_DEFS)
	* IcedTeaNPPlugin.cc (PLUGIN_MIME_DESC): Define in terms
	of HAVA_JAVA7.

--- icedtea-web-1.2~pre1.orig/acinclude.m4
+++ icedtea-web-1.2~pre1/acinclude.m4
@@ -673,6 +673,11 @@ AC_DEFUN_ONCE([IT_FIND_JAVA],
   fi
   AC_MSG_RESULT(${JAVA})
   AC_SUBST(JAVA)
+  JAVA_VERSION=`$JAVA -version 2>&1 | sed -n '1s/[^"]*"\(.*\)"$/\1/p'`
+  case "${JAVA_VERSION}" in
+    1.7*) VERSION_DEFS='-DHAVE_JAVA7';;
+  esac
+  AC_SUBST(VERSION_DEFS)
 ])
 
 AC_DEFUN_ONCE([IT_FIND_KEYTOOL],
--- icedtea-web-1.2~pre1.orig/Makefile.am
+++ icedtea-web-1.2~pre1/Makefile.am
@@ -213,7 +213,7 @@ $(PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc
 	mkdir -p $(PLUGIN_DIR) && \
 	cd $(PLUGIN_DIR) && \
 	$(CXX) $(CXXFLAGS) \
-	   $(DEFS) \
+	   $(DEFS) @VERSION_DEFS@ \
 	  -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
 	  -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \
 	  -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
--- icedtea-web-1.2~pre1.orig/plugin/icedteanp/IcedTeaNPPlugin.cc	2012-02-04 17:38:59.000000000 +0100
+++ icedtea-web-1.2~pre1/plugin/icedteanp/IcedTeaNPPlugin.cc	2012-02-04 17:39:02.000000000 +0100
@@ -90,6 +90,18 @@
 #define PLUGIN_FULL_NAME PLUGIN_NAME " (using " PLUGIN_VERSION ")"
 #define PLUGIN_DESC "The <a href=\"" PACKAGE_URL "\">" PLUGIN_NAME "</a> executes Java applets."
 
+#ifdef HAVE_JAVA7
+ #define JPI_VERSION "1.7.0_" JDK_UPDATE_VERSION
+ #define PLUGIN_APPLET_MIME_DESC7 \
+  "application/x-java-applet;version=1.7:class,jar:IcedTea;"
+ #define PLUGIN_BEAN_MIME_DESC7 \
+  "application/x-java-bean;version=1.7:class,jar:IcedTea;"
+#else
+ #define JPI_VERSION "1.6.0_" JDK_UPDATE_VERSION
+ #define PLUGIN_APPLET_MIME_DESC7
+ #define PLUGIN_BEAN_MIME_DESC7
+#endif
+
 #define PLUGIN_MIME_DESC                                               \
   "application/x-java-vm:class,jar:IcedTea;"                           \
   "application/x-java-applet:class,jar:IcedTea;"                       \
@@ -107,7 +119,8 @@
   "application/x-java-applet;version=1.4.2:class,jar:IcedTea;"         \
   "application/x-java-applet;version=1.5:class,jar:IcedTea;"           \
   "application/x-java-applet;version=1.6:class,jar:IcedTea;"           \
-  "application/x-java-applet;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;"  \
+  PLUGIN_APPLET_MIME_DESC7 \
+  "application/x-java-applet;jpi-version=" JPI_VERSION ":class,jar:IcedTea;"  \
   "application/x-java-bean:class,jar:IcedTea;"                         \
   "application/x-java-bean;version=1.1:class,jar:IcedTea;"             \
   "application/x-java-bean;version=1.1.1:class,jar:IcedTea;"           \
@@ -123,7 +136,8 @@
   "application/x-java-bean;version=1.4.2:class,jar:IcedTea;"           \
   "application/x-java-bean;version=1.5:class,jar:IcedTea;"             \
   "application/x-java-bean;version=1.6:class,jar:IcedTea;"             \
-  "application/x-java-bean;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;"    \
+  PLUGIN_BEAN_MIME_DESC7 \
+  "application/x-java-bean;jpi-version=" JPI_VERSION ":class,jar:IcedTea;"    \
   "application/x-java-vm-npruntime::IcedTea;"
 
 #define PLUGIN_URL NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE