diff options
| author | doko <[email protected]> | 2012-02-27 21:53:21 +0100 |
|---|---|---|
| committer | doko <[email protected]> | 2012-02-27 21:53:21 +0100 |
| commit | 39f1ff14b49aa0a6cf35269025991eb819e60d78 (patch) | |
| tree | 08e45f169da3d79eff50be2121b523fa7abeb2b9 /plugin | |
| parent | a6b12e16fd330edb07600ff867822a65245e151a (diff) | |
Define mime descriptions for 1.7, when built with Java7
2012-02-27 Matthias Klose <[email protected]>
* 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 HAVE_JAVA7.
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/icedteanp/IcedTeaNPPlugin.cc | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/plugin/icedteanp/IcedTeaNPPlugin.cc b/plugin/icedteanp/IcedTeaNPPlugin.cc index 48a4378..6f49726 100644 --- a/plugin/icedteanp/IcedTeaNPPlugin.cc +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc @@ -90,6 +90,18 @@ exception statement from your version. */ #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 @@ exception statement from your version. */ "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 @@ exception statement from your version. */ "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 |