IcedTea-Web branched for 1.2 release

[Matthias Klose]

On 16.02.2012 16:28, Deepak Bhole wrote:
> * Matthias Klose<doko at ubuntu.com>  [2012-02-05 09:27]:
>> 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.
>>
>>    Matthias
>>
>>
>
> This patch breaks the build:

sorry, sent an old version. Here is a current one.

   Matthias
-------------- next part --------------
diff -r c959afd1eba7 Makefile.am
--- a/Makefile.am	Mon Feb 13 11:35:49 2012 -0500
+++ b/Makefile.am	Wed Feb 22 00:33:11 2012 +0100
@@ -213,7 +213,7 @@
 	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)\"" \
diff -r c959afd1eba7 acinclude.m4
--- a/acinclude.m4	Mon Feb 13 11:35:49 2012 -0500
+++ b/acinclude.m4	Wed Feb 22 00:33:11 2012 +0100
@@ -673,6 +673,11 @@
   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],
diff -r c959afd1eba7 plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Mon Feb 13 11:35:49 2012 -0500
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Wed Feb 22 00:33:11 2012 +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