Skip to content
Browse files

Fix compilation problem when building help webapp

  • Loading branch information...
1 parent 20ba3ec commit 7b07d10488eb9d6e2880eac320b09c16d1ae78e3 Krzysztof Daniel committed Jun 28, 2012
Showing with 13 additions and 0 deletions.
  1. +1 −0 eclipse-build/build.xml
  2. +12 −0 eclipse-build/patches/eclipse-help-fix-webapp-jsp-compilation.patch
View
1 eclipse-build/build.xml
@@ -392,6 +392,7 @@
<patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="2" backups="true"/>
<patch patchfile="${basedir}/patches/eclipse-help-feature-adjust-dependencies.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/eclipse-help-fix-webapp-jsp-compilation.patch" dir="${buildDirectory}/plugins" strip="1"/>
<patch patchfile="${basedir}/patches/eclipse-equinox-jsp-jasper.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/serverside-patch-additional-imports.patch" dir="${buildDirectory}" strip="0" />
View
12 eclipse-build/patches/eclipse-help-fix-webapp-jsp-compilation.patch
@@ -0,0 +1,12 @@
+--- a/org.eclipse.help.webapp/META-INF/MANIFEST.MF 2012-06-28 11:28:53.151509917 +0200
++++ b/org.eclipse.help.webapp/META-INF/MANIFEST.MF 2012-06-28 11:37:31.820225439 +0200
+@@ -10,7 +10,8 @@
+ org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.equinox.jsp.jasper.registry;bundle-version="1.0.100",
+ org.eclipse.equinox.http.registry;bundle-version="1.0.200",
+- org.eclipse.core.expressions;bundle-version="3.4.200"
++ org.eclipse.core.expressions;bundle-version="3.4.200",
++ org.apache.el
+ Export-Package: org.eclipse.help.internal.webapp;x-friends:="org.eclipse.ua.tests",
+ org.eclipse.help.internal.webapp.data;x-friends:="org.eclipse.ua.tests",
+ org.eclipse.help.internal.webapp.parser;x-internal:=true,

0 comments on commit 7b07d10

Please sign in to comment.
Something went wrong with that request. Please try again.