diff --git a/eclipse-build-help-contents.patch b/eclipse-build-help-contents.patch
deleted file mode 100644
index c7b4703..0000000
--- a/eclipse-build-help-contents.patch
+++ /dev/null
@@ -1,1799 +0,0 @@
---- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/build.properties.bak 2012-11-05 14:15:46.379557112 +0100
-+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/build.properties 2012-11-05 14:16:38.473928155 +0100
-@@ -10,3 +10,8 @@
- ###############################################################################
- # use provided build.xml
- custom=true
-+
-+bin.includes = META-INF/,\
-+ plugin.properties,\
-+ *.xml, *.zip,*.html,*.htm,*.png,book.css,guide/,META-INF/,porting/,questions/,reference/,index/
-+bin.excludes = build.properties,build.xml,buildDoc.xml,.m2
---- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/build.xml.bak 2012-10-01 11:24:28.000000000 +0200
-+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/build.xml 2012-11-05 14:18:07.805566686 +0100
-@@ -39,6 +39,7 @@
-
-
-
-+
-
-
-
---- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml.bak 2012-10-01 11:24:28.000000000 +0200
-+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml 2012-11-05 14:23:14.218775753 +0100
-@@ -1,6 +1,8 @@
-
-
--
-+
-+
-+
-
-
-
-@@ -21,15 +23,15 @@
-
-
-
--
--
--
--
--
--
--
--
--
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -60,7 +62,10 @@
-
-
-
--
-+
-+
-+
-+
-
-
-
---- /dev/null
-+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties
-@@ -0,0 +1,19 @@
-+dot.classes=target/classes
-+dependency.dir=target/dependency
-+
-+eclipse.jdt.core=../../../eclipse.jdt.core
-+eclipse.jdt.ui=../../../eclipse.jdt.ui
-+eclipse.jdt.debug=../../../eclipse.jdt.debug
-+eclipse.platform.ant=../../../eclipse.platform/ant
-+eclipse.platform.debug=../../../eclipse.platform.debug
-+eclipse.platform.resources.bundles=../../../eclipse.platform.resources/bundles
-+eclipse.platform.runtime.bundles=../../../eclipse.platform.runtime/bundles
-+eclipse.platform.team.bundles=../../../eclipse.platform.team/bundles
-+eclipse.platform.text=../../../eclipse.platform.text
-+eclipse.platform.ua=../../../eclipse.platform.ua
-+eclipse.platform.ui.bundles=../../../eclipse.platform.ui/bundles
-+rt.equinox.bundles.bundles=../../../rt.equinox.bundles/bundles
-+rt.equinox.framework.bundles=../../../rt.equinox.framework/bundles
-+
-+eclipse.equinox.supplement=../../../rt.equinox.framework/bundles/org.eclipse.osgi/supplement
-+org.apache.ant.jar=org.apache.ant_*-lib/ant.jar.jar
---- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt.bak 2012-11-05 14:11:11.000000000 +0100
-+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt 2012-11-05 14:26:56.445392861 +0100
-@@ -1,92 +1,92 @@
- -quiet
- -encoding "iso-8859-1"
- -charset "iso-8859-1"
---sourcepath "../org.eclipse.jdt.annotation/src
--;../org.eclipse.ant.launching/src
--;../org.eclipse.ant.ui/Ant Editor
--;../org.eclipse.ant.ui/Ant Tools Support
--;../org.eclipse.jdt.apt.core/src
--;../org.eclipse.jdt.core/antadapter
--;../org.eclipse.jdt.core/batch
--;../org.eclipse.jdt.core/codeassist
--;../org.eclipse.jdt.core/compiler
--;../org.eclipse.jdt.core/dom
--;../org.eclipse.jdt.core/eval
--;../org.eclipse.jdt.core/formatter
--;../org.eclipse.jdt.core/model
--;../org.eclipse.jdt.core/search
--;../org.eclipse.jdt.core.manipulation/common
--;../org.eclipse.jdt.core.manipulation/refactoring
--;../org.eclipse.jdt.debug/eval
--;../org.eclipse.jdt.debug/jdi
--;../org.eclipse.jdt.debug/model
--;../org.eclipse.jdt.debug.ui/ui
--;../org.eclipse.jdt.junit/src
--;../org.eclipse.jdt.junit.core/src
--;../org.eclipse.jdt.junit.runtime/src
--;../org.eclipse.jdt.launching/launching
--;../org.eclipse.jdt.ui/core extension
--;../org.eclipse.jdt.ui/core refactoring
--;../org.eclipse.jdt.ui/internal compatibility
--;../org.eclipse.jdt.ui/ui
--;../org.eclipse.jdt.ui/ui refactoring"
-+-sourcepath "@eclipse.jdt.core@/org.eclipse.jdt.annotation/src
-+;@eclipse.platform.ant@/org.eclipse.ant.launching/src
-+;@eclipse.platform.ant@/org.eclipse.ant.ui/Ant Editor
-+;@eclipse.platform.ant@/org.eclipse.ant.ui/Ant Tools Support
-+;@eclipse.jdt.core@/org.eclipse.jdt.apt.core/src
-+;@eclipse.jdt.core@/org.eclipse.jdt.core/antadapter
-+;@eclipse.jdt.core@/org.eclipse.jdt.core/batch
-+;@eclipse.jdt.core@/org.eclipse.jdt.core/codeassist
-+;@eclipse.jdt.core@/org.eclipse.jdt.core/compiler
-+;@eclipse.jdt.core@/org.eclipse.jdt.core/dom
-+;@eclipse.jdt.core@/org.eclipse.jdt.core/eval
-+;@eclipse.jdt.core@/org.eclipse.jdt.core/formatter
-+;@eclipse.jdt.core@/org.eclipse.jdt.core/model
-+;@eclipse.jdt.core@/org.eclipse.jdt.core/search
-+;@eclipse.jdt.ui@/org.eclipse.jdt.core.manipulation/common
-+;@eclipse.jdt.ui@/org.eclipse.jdt.core.manipulation/refactoring
-+;@eclipse.jdt.debug@/org.eclipse.jdt.debug/eval
-+;@eclipse.jdt.debug@/org.eclipse.jdt.debug/jdi
-+;@eclipse.jdt.debug@/org.eclipse.jdt.debug/model
-+;@eclipse.jdt.debug@/org.eclipse.jdt.debug.ui/ui
-+;@eclipse.jdt.ui@/org.eclipse.jdt.junit/src
-+;@eclipse.jdt.ui@/org.eclipse.jdt.junit.core/src
-+;@eclipse.jdt.ui@/org.eclipse.jdt.junit.runtime/src
-+;@eclipse.jdt.debug@/org.eclipse.jdt.launching/launching
-+;@eclipse.jdt.ui@/org.eclipse.jdt.ui/core extension
-+;@eclipse.jdt.ui@/org.eclipse.jdt.ui/core refactoring
-+;@eclipse.jdt.ui@/org.eclipse.jdt.ui/internal compatibility
-+;@eclipse.jdt.ui@/org.eclipse.jdt.ui/ui
-+;@eclipse.jdt.ui@/org.eclipse.jdt.ui/ui refactoring"
- -d reference/api
- -classpath @rt@
--;../com.ibm.icu_*.jar
--;../org.apache.ant_*/lib/ant.jar
--;../org.eclipse.ant.core/@dot
--;../org.eclipse.compare/@dot
--;../org.eclipse.compare.core/@dot
--;../org.eclipse.core.commands/@dot
--;../org.eclipse.core.contenttype/@dot
--;../org.eclipse.core.expressions/@dot
--;../org.eclipse.core.externaltools/@dot
--;../org.eclipse.core.filebuffers/@dot
--;../org.eclipse.core.filesystem/@dot
--;../org.eclipse.core.jobs/@dot
--;../org.eclipse.core.resources/@dot
--;../org.eclipse.core.runtime/@dot
--;../org.eclipse.core.runtime.content/@dot
--;../org.eclipse.core.runtime.jobs/@dot
--;../org.eclipse.core.runtime.preferences/@dot
--;../org.eclipse.core.variables/@dot
--;../org.eclipse.debug.core/@dot
--;../org.eclipse.debug.ui/@dot
--;../org.eclipse.equinox.app/@dot
--;../org.eclipse.equinox.common/@dot
--;../org.eclipse.equinox.preferences/@dot
--;../org.eclipse.equinox.registry/@dot
--;../org.eclipse.equinox.supplement/@dot
--;../org.eclipse.help/@dot
--;../org.eclipse.help.ui/@dot
--;../org.eclipse.jdt.apt.core/mirrorapi.jar
--;../org.eclipse.jdt.core.manipulation/@dot
--;../org.eclipse.jdt.debug/jdi.jar
--;../org.eclipse.jdt.junit/@dot
--;../org.eclipse.jdt.junit.core/@dot
--;../org.eclipse.jface/@dot
--;../org.eclipse.jface.text/@dot
--;../org.eclipse.ltk.core.refactoring/@dot
--;../org.eclipse.ltk.ui.refactoring/@dot
--;../org.eclipse.osgi/@dot
--;../org.eclipse.osgi.services/@dot
--;../org.eclipse.osgi.util/@dot
--;../org.eclipse.search/@dot
--;../org.eclipse.swt.win32.win32.x86/@dot
--;../org.eclipse.team.core/@dot
--;../org.eclipse.team.ui/@dot
--;../org.eclipse.text/@dot
--;../org.eclipse.ui/@dot
--;../org.eclipse.ui.console/@dot
--;../org.eclipse.ui.editors/@dot
--;../org.eclipse.ui.externaltools/@dot
--;../org.eclipse.ui.forms/@dot
--;../org.eclipse.ui.ide/@dot
--;../org.eclipse.ui.navigator/@dot
--;../org.eclipse.ui.views/@dot
--;../org.eclipse.ui.workbench/@dot
--;../org.eclipse.ui.workbench.texteditor/@dot
--;../org.junit/junit.jar
-+;@dependency.dir@/com.ibm.icu_*.jar
-+;@dependency.dir@/@org.apache.ant.jar@
-+;@eclipse.platform.ant@/org.eclipse.ant.core/@dot.classes@
-+;@eclipse.platform.team.bundles@/org.eclipse.compare/@dot.classes@
-+;@eclipse.platform.team.bundles@/org.eclipse.compare.core/@dot.classes@
-+;@eclipse.platform.ui.bundles@/org.eclipse.core.commands/@dot.classes@
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.contenttype/@dot.classes@
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.expressions/@dot.classes@
-+;@eclipse.platform.debug@/org.eclipse.core.externaltools/@dot.classes@
-+;@eclipse.platform.text@/org.eclipse.core.filebuffers/@dot.classes@
-+;@eclipse.platform.resources.bundles@/org.eclipse.core.filesystem/@dot.classes@
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.jobs/@dot.classes@
-+;@eclipse.platform.resources.bundles@/org.eclipse.core.resources/@dot.classes@
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime/@dot.classes@
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.content/@dot.classes@
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.jobs/@dot.classes@
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.preferences/@dot.classes@
-+;@eclipse.platform.debug@/org.eclipse.core.variables/@dot.classes@
-+;@eclipse.platform.debug@/org.eclipse.debug.core/@dot.classes@
-+;@eclipse.platform.debug@/org.eclipse.debug.ui/@dot.classes@
-+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.app/@dot.classes@
-+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.common/@dot.classes@
-+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.preferences/@dot.classes@
-+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.registry/@dot.classes@
-+;@eclipse.equinox.supplement@/@dot.classes@
-+;@eclipse.platform.ua@/org.eclipse.help/@dot.classes@
-+;@eclipse.platform.ua@/org.eclipse.help.ui/@dot.classes@
-+;@eclipse.jdt.core@/org.eclipse.jdt.apt.core/mirrorapi.jar
-+;@eclipse.jdt.ui@/org.eclipse.jdt.core.manipulation/@dot.classes@
-+;@eclipse.jdt.debug@/org.eclipse.jdt.debug/jdi.jar
-+;@eclipse.jdt.ui@/org.eclipse.jdt.junit/@dot.classes@
-+;@eclipse.jdt.ui@/org.eclipse.jdt.junit.core/@dot.classes@
-+;@eclipse.platform.ui.bundles@/org.eclipse.jface/@dot.classes@
-+;@eclipse.platform.text@/org.eclipse.jface.text/@dot.classes@
-+;@eclipse.jdt.ui@/org.eclipse.ltk.core.refactoring/@dot.classes@
-+;@eclipse.jdt.ui@/org.eclipse.ltk.ui.refactoring/@dot.classes@
-+;@rt.equinox.framework.bundles@/org.eclipse.osgi/@dot.classes@
-+;@rt.equinox.framework.bundles@/org.eclipse.osgi.services/@dot.classes@
-+;@rt.equinox.framework.bundles@/org.eclipse.osgi.util/@dot.classes@
-+;@eclipse.platform.text@/org.eclipse.search/@dot.classes@
-+;@eclipse.platform.text@/org.eclipse.swt.win32.win32.x86/@dot.classes@
-+;@eclipse.platform.team.bundles@/org.eclipse.team.core/@dot.classes@
-+;@eclipse.platform.team.bundles@/org.eclipse.team.ui/@dot.classes@
-+;@eclipse.platform.text@/org.eclipse.text/@dot.classes@
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui/@dot.classes@
-+;@eclipse.platform.debug@/org.eclipse.ui.console/@dot.classes@
-+;@eclipse.platform.text@/org.eclipse.ui.editors/@dot.classes@
-+;@eclipse.platform.debug@/org.eclipse.ui.externaltools/@dot.classes@
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui.forms/@dot.classes@
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui.ide/@dot.classes@
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui.navigator/@dot.classes@
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui.views/@dot.classes@
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui.workbench/@dot.classes@
-+;@eclipse.platform.text@/org.eclipse.ui.workbench.texteditor/@dot.classes@
-+;@dependency.dir@/org.junit/junit.jar
- -breakiterator
- -use
- -splitIndex
---- /dev/null
-+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pde_basedirs.properties
-@@ -0,0 +1,19 @@
-+dot.classes=@dot
-+dependency.dir=..
-+
-+eclipse.jdt.core=..
-+eclipse.jdt.ui=..
-+eclipse.jdt.debug=..
-+eclipse.platform.ant=..
-+eclipse.platform.debug=..
-+eclipse.platform.resources.bundles=..
-+eclipse.platform.runtime.bundles=..
-+eclipse.platform.team.bundles=..
-+eclipse.platform.text=..
-+eclipse.platform.ua=..
-+eclipse.platform.ui.bundles=..
-+rt.equinox.bundles.bundles=..
-+rt.equinox.framework.bundles=..
-+
-+eclipse.equinox.supplement=../org.eclipse.equinox.supplement
-+org.apache.ant.jar=org.apache.ant_*/lib/ant.jar
---- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml.bak 2012-11-05 14:11:23.000000000 +0100
-+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml 2012-11-05 14:30:47.057081369 +0100
-@@ -23,4 +23,64 @@
- org.eclipse.jdt.doc.isv
- 3.8.1-SNAPSHOT
- eclipse-plugin
-+
-+
-+ builddoc
-+
-+
-+ builddoc
-+ 1
-+
-+
-+
-+
-+
-+ org.eclipse.tycho.extras
-+ tycho-eclipserun-plugin
-+
-+ ${tycho.version}
-+
-+
-+ -Dhelp.lucene.tokenizer=standard
-+
-+ -application org.eclipse.ant.core.antRunner \
-+ -buildfile buildDoc.xml \
-+ -Dbasedir.properties=cbi_basedirs.properties
-+
-+
-+
-+ org.eclipse.ant.core
-+ eclipse-plugin
-+
-+
-+ org.apache.ant
-+ eclipse-plugin
-+
-+
-+ org.eclipse.help.base
-+ eclipse-plugin
-+
-+
-+ org.eclipse.pde.build
-+ eclipse-plugin
-+
-+
-+ org.eclipse.pde.core
-+ eclipse-plugin
-+
-+
-+
-+
-+
-+
-+ eclipse-run
-+
-+ compile
-+
-+
-+
-+
-+
-+
-+
-
---- eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.properties.bak 2012-11-05 14:11:22.000000000 +0100
-+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.properties 2012-11-05 14:33:50.018427096 +0100
-@@ -9,4 +9,7 @@
- # IBM Corporation - initial API and implementation
- ###############################################################################
- # use provided build.xml
--custom=true
-\ No newline at end of file
-+custom=true
-+
-+bin.includes=*.properties,*.xml,*.zip,*.html,*.htm,*.png,*.css,META-INF/,index/,concepts/, gettingStarted/, images/, reference/, tasks/, tips/, whatsNew/
-+bin.excludes=build.properties,build.xml,workspace,.m2
---- eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml.bak 2012-11-05 14:11:23.000000000 +0100
-+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml 2012-11-05 14:36:12.039445921 +0100
-@@ -1,6 +1,6 @@
-
-
-
-
---- /dev/null
-+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/cbi_basedirs.properties
-@@ -0,0 +1,2 @@
-+eclipse.pde.ui.ui=../../../eclipse.pde.ui/ui
-+eclipse.pde.build=../../../eclipse.pde.build
---- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/customBuildCallbacks.xml.bak 2012-10-01 11:24:28.000000000 +0200
-+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/customBuildCallbacks.xml 2012-11-05 14:40:35.008330410 +0100
-@@ -18,6 +18,7 @@
-
-
-
-+
-
-
-
---- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt.bak 2012-11-05 14:11:11.000000000 +0100
-+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt 2012-11-05 14:43:01.694390097 +0100
-@@ -1,9 +1,9 @@
- -quiet
- -charset "iso-8859-1"
---sourcepath "../org.eclipse.pde.core/src
--;../org.eclipse.pde.ui/src
--;../org.eclipse.pde.build/src
--;../org.eclipse.pde.launching/src"
-+-sourcepath "@eclipse.pde.ui.ui@/org.eclipse.pde.core/src
-+;@eclipse.pde.ui.ui@/org.eclipse.pde.ui/src
-+;@eclipse.pde.build@/org.eclipse.pde.build/src
-+;@eclipse.pde.ui.ui@/org.eclipse.pde.launching/src"
- -d reference/api
- -classpath @rt@
- ;../org.eclipse.compare/@dot
---- /dev/null
-+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pde_basedirs.properties
-@@ -0,0 +1,2 @@
-+eclipse.pde.ui.ui=..
-+eclipse.pde.build=..
---- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml.bak 2012-11-05 14:11:23.000000000 +0100
-+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml 2012-11-05 14:45:46.377585808 +0100
-@@ -1,6 +1,6 @@
-
-
--
--
--
--
-+
-+
-+
-+
-
--
--
--
--
--
-+
-+
-+
-+
-+
-
--
--
--
--
--
-+
-+
-+
-+
-
-
-
-
-
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -117,7 +118,25 @@
-
-
-
--
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
---- /dev/null
-+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties
-@@ -0,0 +1,20 @@
-+eclipse.jdt.ui=../../../eclipse.jdt.ui
-+eclipse.pde=../../../eclipse.pde
-+eclipse.platform.ant=../../../eclipse.platform/ant
-+eclipse.platform.debug=../../../eclipse.platform.debug
-+eclipse.platform.platform=../../../eclipse.platform/platform
-+eclipse.platform.resources.bundles=../../../eclipse.platform.resources/bundles
-+eclipse.platform.runtime.bundles=../../../eclipse.platform.runtime/bundles
-+eclipse.platform.swt.bundles=../../../eclipse.platform.swt/bundles
-+eclipse.platform.team.bundles=../../../eclipse.platform.team/bundles
-+eclipse.platform.text=../../../eclipse.platform.text
-+eclipse.platform.ua=../../../eclipse.platform.ua
-+eclipse.platform.ui.bundles=../../../eclipse.platform.ui/bundles
-+eclipse.platform.update=../../../eclipse.platform/update
-+rt.equinox.bundles.bundles=../../../rt.equinox.bundles/bundles
-+rt.equinox.framework.bundles=../../../rt.equinox.framework/bundles
-+rt.equinox.p2.bundles=../../../rt.equinox.p2/bundles
-+eclipse.platform.team.examples=../../../eclipse.platform.team/examples
-+eclipse.platform.swt.examples=../../../eclipse.platform.swt/examples
-+eclipse.platform.ui.examples=../../../eclipse.platform.ui/examples
-+
---- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/customBuildCallbacks.xml.bak 2012-10-01 11:24:28.000000000 +0200
-+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/customBuildCallbacks.xml 2012-11-05 14:53:19.830847656 +0100
-@@ -26,6 +26,7 @@
-
-
-
-+
-
-
-
---- /dev/null
-+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties
-@@ -0,0 +1,19 @@
-+eclipse.jdt.ui=..
-+eclipse.pde=..
-+eclipse.platform.ant=..
-+eclipse.platform.debug=..
-+eclipse.platform.platform=..
-+eclipse.platform.resources.bundles=..
-+eclipse.platform.runtime.bundles=..
-+eclipse.platform.swt.bundles=..
-+eclipse.platform.team.bundles=..
-+eclipse.platform.text=..
-+eclipse.platform.ua=..
-+eclipse.platform.ui.bundles=..
-+eclipse.platform.update=..
-+rt.equinox.bundles.bundles=..
-+rt.equinox.framework.bundles=..
-+rt.equinox.p2.bundles=..
-+eclipse.platform.team.examples=..
-+eclipse.platform.swt.examples=..
-+eclipse.platform.ui.examples=..
---- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt.bak 2012-11-05 14:11:11.000000000 +0100
-+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt 2012-11-05 14:56:21.958102851 +0100
-@@ -2,133 +2,133 @@
- -encoding "iso-8859-1"
- -charset "iso-8859-1"
- -sourcepath "
--;../org.eclipse.ant.core/src
--;../org.eclipse.compare.core/src
--;../org.eclipse.compare/compare
--;../org.eclipse.core.commands/src
--;../org.eclipse.core.contenttype/src
--;../org.eclipse.core.databinding.beans/src
--;../org.eclipse.core.databinding.observable/src
--;../org.eclipse.core.databinding.property/src
--;../org.eclipse.core.databinding/src
--;../org.eclipse.core.expressions/src
--;../org.eclipse.core.filebuffers/src
--;../org.eclipse.core.filesystem/src
--;../org.eclipse.core.jobs/src
--;../org.eclipse.core.net/src
--;../org.eclipse.core.resources/src
--;../org.eclipse.core.runtime.compatibility/src-model
--;../org.eclipse.core.runtime.compatibility/src-runtime
--;../org.eclipse.core.runtime/src
--;../org.eclipse.core.variables/src
--;../org.eclipse.debug.core/core
--;../org.eclipse.debug.ui/ui
--;../org.eclipse.equinox.app/src
--;../org.eclipse.e4.core.commands/src
--;../org.eclipse.e4.core.contexts/src
--;../org.eclipse.e4.core.di/src
--;../org.eclipse.e4.core.services/src
--;../org.eclipse.e4.ui.bindings/src
--;../org.eclipse.e4.ui.css.core/src
--;../org.eclipse.e4.ui.css.swt/src
--;../org.eclipse.e4.ui.css.swt.theme/src
--;../org.eclipse.e4.ui.di/src
--;../org.eclipse.e4.ui.model.workbench/src
--;../org.eclipse.e4.ui.services/src
--;../org.eclipse.e4.ui.widgets/src
--;../org.eclipse.e4.ui.workbench.renderers.swt/src
--;../org.eclipse.e4.ui.workbench.swt/src
--;../org.eclipse.e4.ui.workbench/src
--;../org.eclipse.e4.ui.workbench3/src
--;../org.eclipse.equinox.bidi/src
--;../org.eclipse.equinox.ds/src
--;../org.eclipse.equinox.common/src
--;../org.eclipse.equinox.frameworkadmin/src
--;../org.eclipse.equinox.http.jetty_*/src
--;../org.eclipse.equinox.http.registry/src
--;../org.eclipse.equinox.http.servlet/src
--;../org.eclipse.equinox.jsp.jasper.registry/src
--;../org.eclipse.equinox.jsp.jasper/src
--;../org.eclipse.equinox.preferences/src
--;../org.eclipse.equinox.p2.core/src
--;../org.eclipse.equinox.p2.director/src
--;../org.eclipse.equinox.p2.engine/src
--;../org.eclipse.equinox.p2.metadata/src
--;../org.eclipse.equinox.p2.metadata.repository/src
--;../org.eclipse.equinox.p2.operations/src
--;../org.eclipse.equinox.p2.ql/src
--;../org.eclipse.equinox.p2.repository/src
--;../org.eclipse.equinox.p2.touchpoint.eclipse/src
--;../org.eclipse.equinox.p2.ui/src
--;../org.eclipse.equinox.registry/src
--;../org.eclipse.equinox.security/src
--;../org.eclipse.help.base/src
--;../org.eclipse.help.base/src_demo
--;../org.eclipse.help.ui/src
--;../org.eclipse.help.webapp/src
--;../org.eclipse.help/src
--;../org.eclipse.jface.databinding/src
--;../org.eclipse.jface.text/projection
--;../org.eclipse.jface.text/src
--;../org.eclipse.jface/src
--;../org.eclipse.jsch.core/src
--;../org.eclipse.jsch.ui/src
--;../org.eclipse.ltk.core.refactoring/src
--;../org.eclipse.ltk.ui.refactoring/src
--;../org.eclipse.osgi/core/adaptor
--;../org.eclipse.osgi/core/framework
--;../org.eclipse.osgi/eclipseAdaptor/src
--;../org.eclipse.osgi/security/src
--;../org.eclipse.osgi/supplement/src
--;../org.eclipse.pde/src
--;../org.eclipse.platform/src
--;../org.eclipse.search/new search
--;../org.eclipse.search/search
--;../org.eclipse.swt/Eclipse SWT Accessibility/common/
--;../org.eclipse.swt/Eclipse SWT Accessibility/win32/
--;../org.eclipse.swt/Eclipse SWT AWT/common/
--;../org.eclipse.swt/Eclipse SWT AWT/win32/
--;../org.eclipse.swt/Eclipse SWT Browser/common/
--;../org.eclipse.swt/Eclipse SWT Browser/win32/
--;../org.eclipse.swt/Eclipse SWT Custom Widgets/common/
--;../org.eclipse.swt/Eclipse SWT Drag and Drop/common/
--;../org.eclipse.swt/Eclipse SWT Drag and Drop/win32/
--;../org.eclipse.swt/Eclipse SWT OLE Win32/win32/
--;../org.eclipse.swt/Eclipse SWT OpenGL/common
--;../org.eclipse.swt/Eclipse SWT OpenGL/emulated
--;../org.eclipse.swt/Eclipse SWT OpenGL/glx
--;../org.eclipse.swt/Eclipse SWT OpenGL/win32
--;../org.eclipse.swt/Eclipse SWT PI/common/
--;../org.eclipse.swt/Eclipse SWT PI/common_j2se/
--;../org.eclipse.swt/Eclipse SWT PI/win32/
--;../org.eclipse.swt/Eclipse SWT Printing/common/
--;../org.eclipse.swt/Eclipse SWT Printing/win32/
--;../org.eclipse.swt/Eclipse SWT Program/common/
--;../org.eclipse.swt/Eclipse SWT Program/win32/
--;../org.eclipse.swt/Eclipse SWT/common/
--;../org.eclipse.swt/Eclipse SWT/common_j2se/
--;../org.eclipse.swt/Eclipse SWT/win32/
--;../org.eclipse.team.core/src
--;../org.eclipse.team.ui/src
--;../org.eclipse.text/projection
--;../org.eclipse.text/src
--;../org.eclipse.ui.cheatsheets/src
--;../org.eclipse.ui.console/src
--;../org.eclipse.ui.editors/src
--;../org.eclipse.ui.forms/src
--;../org.eclipse.ui.ide/extensions
--;../org.eclipse.ui.ide/src
--;../org.eclipse.ui.intro.universal/src
--;../org.eclipse.ui.intro/src
--;../org.eclipse.ui.navigator.resources/src
--;../org.eclipse.ui.navigator/src
--;../org.eclipse.ui.views.properties.tabbed/src
--;../org.eclipse.ui.views/src
--;../org.eclipse.ui.workbench.texteditor/src
--;../org.eclipse.ui.workbench/Eclipse UI
--;../org.eclipse.ui.workbench/Eclipse UI Editor Support
--;../org.eclipse.ui/src
--;../org.eclipse.update.configurator/src
-+;@eclipse.platform.ant@/org.eclipse.ant.core/src
-+;@eclipse.platform.team.bundles@/org.eclipse.compare.core/src
-+;@eclipse.platform.team.bundles@/org.eclipse.compare/compare
-+;@eclipse.platform.ui.bundles@/org.eclipse.core.commands/src
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.contenttype/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.core.databinding.beans/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.core.databinding.observable/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.core.databinding.property/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.core.databinding/src
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.expressions/src
-+;@eclipse.platform.text@/org.eclipse.core.filebuffers/src
-+;@eclipse.platform.resources.bundles@/org.eclipse.core.filesystem/src
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.jobs/src
-+;@eclipse.platform.team.bundles@/org.eclipse.core.net/src
-+;@eclipse.platform.resources.bundles@/org.eclipse.core.resources/src
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.compatibility/src-model
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.compatibility/src-runtime
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime/src
-+;@eclipse.platform.debug@/org.eclipse.core.variables/src
-+;@eclipse.platform.debug@/org.eclipse.debug.core/core
-+;@eclipse.platform.debug@/org.eclipse.debug.ui/ui
-+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.app/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.e4.core.commands/src
-+;@eclipse.platform.runtime.bundles@/org.eclipse.e4.core.contexts/src
-+;@eclipse.platform.runtime.bundles@/org.eclipse.e4.core.di/src
-+;@eclipse.platform.runtime.bundles@/org.eclipse.e4.core.services/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.bindings/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.css.core/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.css.swt/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.css.swt.theme/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.di/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.model.workbench/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.services/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.widgets/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.workbench.renderers.swt/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.workbench.swt/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.workbench/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.e4.ui.workbench3/src
-+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.bidi/src
-+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.ds/src
-+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.common/src
-+;@rt.equinox.p2.bundles@/org.eclipse.equinox.frameworkadmin/src
-+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.http.jetty_*/src
-+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.http.registry/src
-+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.http.servlet/src
-+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.jsp.jasper.registry/src
-+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.jsp.jasper/src
-+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.preferences/src
-+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.core/src
-+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.director/src
-+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.engine/src
-+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.metadata/src
-+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.metadata.repository/src
-+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.operations/src
-+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.ql/src
-+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.repository/src
-+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.touchpoint.eclipse/src
-+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.ui/src
-+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.registry/src
-+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.security/src
-+;@eclipse.platform.ua@/org.eclipse.help.base/src
-+;@eclipse.platform.ua@/org.eclipse.help.base/src_demo
-+;@eclipse.platform.ua@/org.eclipse.help.ui/src
-+;@eclipse.platform.ua@/org.eclipse.help.webapp/src
-+;@eclipse.platform.ua@/org.eclipse.help/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.jface.databinding/src
-+;@eclipse.platform.text@/org.eclipse.jface.text/projection
-+;@eclipse.platform.text@/org.eclipse.jface.text/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.jface/src
-+;@eclipse.platform.team.bundles@/org.eclipse.jsch.core/src
-+;@eclipse.platform.team.bundles@/org.eclipse.jsch.ui/src
-+;@eclipse.jdt.ui@/org.eclipse.ltk.core.refactoring/src
-+;@eclipse.jdt.ui@/org.eclipse.ltk.ui.refactoring/src
-+;@rt.equinox.framework.bundles@/org.eclipse.osgi/core/adaptor
-+;@rt.equinox.framework.bundles@/org.eclipse.osgi/core/framework
-+;@rt.equinox.framework.bundles@/org.eclipse.osgi/eclipseAdaptor/src
-+;@rt.equinox.framework.bundles@/org.eclipse.osgi/security/src
-+;@rt.equinox.framework.bundles@/org.eclipse.osgi/supplement/src
-+;@eclipse.pde@/org.eclipse.pde/src
-+;@eclipse.platform.platform@/org.eclipse.platform/src
-+;@eclipse.platform.text@/org.eclipse.search/new search
-+;@eclipse.platform.text@/org.eclipse.search/search
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Accessibility/common/
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Accessibility/win32/
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT AWT/common/
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT AWT/win32/
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Browser/common/
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Browser/win32/
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Custom Widgets/common/
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Drag and Drop/common/
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT OLE Win32/win32/
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT OpenGL/common
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT OpenGL/emulated
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT OpenGL/glx
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT OpenGL/win32
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT PI/common/
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT PI/common_j2se/
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT PI/win32/
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Printing/common/
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Printing/win32/
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Program/common/
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT Program/win32/
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT/common/
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT/common_j2se/
-+;@eclipse.platform.swt.bundles@/org.eclipse.swt/Eclipse SWT/win32/
-+;@eclipse.platform.team.bundles@/org.eclipse.team.core/src
-+;@eclipse.platform.team.bundles@/org.eclipse.team.ui/src
-+;@eclipse.platform.text@/org.eclipse.text/projection
-+;@eclipse.platform.text@/org.eclipse.text/src
-+;@eclipse.platform.ua@/org.eclipse.ui.cheatsheets/src
-+;@eclipse.platform.debug@/org.eclipse.ui.console/src
-+;@eclipse.platform.text@/org.eclipse.ui.editors/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui.forms/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui.ide/extensions
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui.ide/src
-+;@eclipse.platform.ua@/org.eclipse.ui.intro.universal/src
-+;@eclipse.platform.ua@/org.eclipse.ui.intro/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui.navigator.resources/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui.navigator/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui.views.properties.tabbed/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui.views/src
-+;@eclipse.platform.text@/org.eclipse.ui.workbench.texteditor/src
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui.workbench/Eclipse UI
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui.workbench/Eclipse UI Editor Support
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui/src
-+;@eclipse.platform.update@/org.eclipse.update.configurator/src
- -d reference/api
- -classpath @rt@
- ;../com.ibm.icu_*.jar
-@@ -194,7 +194,7 @@
- -link http://www.osgi.org/javadoc/r5/core
- -link http://www.osgi.org/javadoc/r4v42
-
--../org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
-+@rt.equinox.framework.bundles@/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
-
- org.eclipse.ant.core
- org.eclipse.compare
---- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml.bak 2012-11-05 14:11:23.000000000 +0100
-+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml 2012-11-05 14:59:00.216219487 +0100
-@@ -23,4 +23,69 @@
- org.eclipse.platform.doc.isv
- 4.2.1-SNAPSHOT
- eclipse-plugin
-+
-+
-+
-+ builddoc
-+
-+
-+ builddoc
-+ 1
-+
-+
-+
-+
-+
-+ org.eclipse.tycho.extras
-+ tycho-eclipserun-plugin
-+
-+ ${tycho.version}
-+
-+
-+ -Dhelp.lucene.tokenizer=standard
-+
-+ -application org.eclipse.ant.core.antRunner \
-+ -buildfile buildDoc.xml \
-+ -Dbasedir.properties=cbi_basedirs.properties
-+
-+
-+
-+ org.eclipse.ant.core
-+ eclipse-plugin
-+
-+
-+ org.apache.ant
-+ eclipse-plugin
-+
-+
-+ org.eclipse.help.base
-+ eclipse-plugin
-+
-+
-+ org.eclipse.pde.build
-+ eclipse-plugin
-+
-+
-+ org.eclipse.pde.core
-+ eclipse-plugin
-+
-+
-+ org.eclipse.equinox.launcher
-+ eclipse-plugin
-+
-+
-+
-+
-+
-+
-+ eclipse-run
-+
-+ compile
-+
-+
-+
-+
-+
-+
-+
-
---- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml.bak 2012-11-05 15:04:34.000000000 +0100
-+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml 2012-11-05 15:08:14.818242506 +0100
-@@ -69,10 +69,10 @@
-
-
-
--
-+
-
-
--
-+
-
-
-
---- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties
-+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/cbi_basedirs.properties
-@@ -1,4 +1,19 @@
-+dot.classes=target/classes
-+dependency.dir=target/dependency
-+
- eclipse.jdt.core=../../../eclipse.jdt.core
- eclipse.jdt.ui=../../../eclipse.jdt.ui
- eclipse.jdt.debug=../../../eclipse.jdt.debug
- eclipse.platform.ant=../../../eclipse.platform/ant
-+eclipse.platform.debug=../../../eclipse.platform.debug
-+eclipse.platform.resources.bundles=../../../eclipse.platform.resources/bundles
-+eclipse.platform.runtime.bundles=../../../eclipse.platform.runtime/bundles
-+eclipse.platform.team.bundles=../../../eclipse.platform.team/bundles
-+eclipse.platform.text=../../../eclipse.platform.text
-+eclipse.platform.ua=../../../eclipse.platform.ua
-+eclipse.platform.ui.bundles=../../../eclipse.platform.ui/bundles
-+rt.equinox.bundles.bundles=../../../rt.equinox.bundles/bundles
-+rt.equinox.framework.bundles=../../../rt.equinox.framework/bundles
-+
-+eclipse.equinox.supplement=../../../rt.equinox.framework/bundles/org.eclipse.osgi/supplement
-+org.apache.ant.jar=org.apache.ant_*-lib/ant.jar.jar
---- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml.bak 2012-11-05 15:04:40.000000000 +0100
-+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml 2012-11-05 15:23:21.574964609 +0100
-@@ -34,6 +34,54 @@
-
-
-
-+
-+ org.eclipse.tycho
-+ target-platform-configuration
-+
-+
-+
-+
-+ eclipse-plugin
-+ com.ibm.icu
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.apache.ant
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.junit
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.eclipse.platform.doc.isv
-+ 0.0.0
-+
-+
-+
-+
-+
-+
-+ org.apache.maven.plugins
-+ maven-dependency-plugin
-+ 2.5.1
-+
-+
-+ copy
-+ process-resources
-+
-+ copy-dependencies
-+
-+
-+ true
-+ true
-+
-+
-+
-+
-
- org.eclipse.tycho.extras
- tycho-eclipserun-plugin
---- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/buildDoc.xml.bak 2012-11-05 15:04:34.000000000 +0100
-+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/buildDoc.xml 2012-11-05 15:25:46.479044371 +0100
-@@ -68,10 +68,10 @@
-
-
-
--
-+
-
-
--
-+
-
-
-
---- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/cbi_basedirs.properties
-+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/cbi_basedirs.properties
-@@ -1,2 +1,22 @@
-+dot.classes=target/classes
-+dependency.dir=target/dependency
-+
-+eclipse.jdt.core=../../../eclipse.jdt.core
-+eclipse.jdt.debug=../../../eclipse.jdt.debug
-+eclipse.jdt.ui=../../../eclipse.jdt.ui
- eclipse.pde.ui.ui=../../../eclipse.pde.ui/ui
- eclipse.pde.build=../../../eclipse.pde.build
-+eclipse.platform.debug=../../../eclipse.platform.debug
-+eclipse.platform.resources.bundles=../../../eclipse.platform.resources/bundles
-+eclipse.platform.runtime.bundles=../../../eclipse.platform.runtime/bundles
-+eclipse.platform.swt.binaries.bundles=../../../eclipse.platform.swt.binaries/bundles
-+eclipse.platform.team.bundles=../../../eclipse.platform.team/bundles
-+eclipse.platform.text=../../../eclipse.platform.text
-+eclipse.platform.ua=../../../eclipse.platform.ua
-+eclipse.platform.ui.bundles=../../../eclipse.platform.ui/bundles
-+eclipse.platform.update=../../../eclipse.platform/update
-+rt.equinox.bundles.bundles=../../../rt.equinox.bundles/bundles
-+rt.equinox.framework.bundles=../../../rt.equinox.framework/bundles
-+rt.equinox.p2.bundles=../../../rt.equinox.p2/bundles
-+
-+eclipse.equinox.supplement=../../../rt.equinox.framework/bundles/org.eclipse.osgi/supplement
---- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt.bak 2012-11-05 15:04:35.000000000 +0100
-+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt 2012-11-05 15:28:43.250369597 +0100
-@@ -6,55 +6,55 @@
- ;@eclipse.pde.ui.ui@/org.eclipse.pde.launching/src"
- -d reference/api
- -classpath @rt@
--;../org.eclipse.compare/@dot
--;../org.eclipse.compare.core/@dot
--;../org.eclipse.core.boot/@dot
--;../org.eclipse.core.contenttype/@dot
--;../org.eclipse.core.jobs/@dot
--;../org.eclipse.core.resources/@dot
--;../org.eclipse.core.runtime/@dot
--;../org.eclipse.core.runtime.content/@dot
--;../org.eclipse.core.runtime.jobs/@dot
--;../org.eclipse.core.runtime.preferences/@dot
--;../org.eclipse.core.variables/@dot
--;../org.eclipse.debug.core/@dot
--;../org.eclipse.debug.ui/@dot
--;../org.eclipse.equinox.common/@dot
--;../org.eclipse.equinox.frameworkadmin/@dot
--;../org.eclipse.equinox.p2.metadata/@dot
--;../org.eclipse.equinox.p2.publisher.eclipse/@dot
--;../org.eclipse.equinox.preferences/@dot
--;../org.eclipse.equinox.registry/@dot
--;../org.eclipse.equinox.supplement/@dot
--;../org.eclipse.help/@dot
--;../org.eclipse.help.ui/@dot
--;../org.eclipse.jdt.core/@dot
--;../org.eclipse.jdt.debug/jdi.jar
--;../org.eclipse.jdt.debug.ui/@dot
--;../org.eclipse.jdt.junit/@dot
--;../org.eclipse.jdt.junit/junitsupport.jar
--;../org.eclipse.jdt.junit.core/@dot
--;../org.eclipse.jdt.launching/@dot
--;../org.eclipse.jdt.ui/@dot
--;../org.eclipse.jface/@dot
--;../org.eclipse.jface.text/@dot
--;../org.eclipse.osgi/@dot
--;../org.eclipse.osgi.services/@dot
--;../org.eclipse.osgi.util/@dot
--;../org.eclipse.pde.core/@dot
--;../org.eclipse.pde.ui/@dot
--;../org.eclipse.pde.build/@dot
--;../org.eclipse.pde.launching/@dot
--;../org.eclipse.search/@dot
--;../org.eclipse.swt.win32.win32.x86/@dot
--;../org.eclipse.text/@dot
--;../org.eclipse.ui/@dot
--;../org.eclipse.ui.editors/@dot
--;../org.eclipse.ui.ide/@dot
--;../org.eclipse.ui.views/@dot
--;../org.eclipse.ui.workbench/@dot
--;../org.eclipse.ui.workbench.texteditor/@dot
--;../org.eclipse.update.configurator/@dot
-+;@eclipse.platform.team.bundles@/org.eclipse.compare/@dot.classes@
-+;@eclipse.platform.team.bundles@/org.eclipse.compare.core/@dot.classes@
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.boot/@dot.classes@
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.contenttype/@dot.classes@
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.jobs/@dot.classes@
-+;@eclipse.platform.resources.bundles@/org.eclipse.core.resources/@dot.classes@
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime/@dot.classes@
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.content/@dot.classes@
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.jobs/@dot.classes@
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.preferences/@dot.classes@
-+;@eclipse.platform.debug@/org.eclipse.core.variables/@dot.classes@
-+;@eclipse.platform.debug@/org.eclipse.debug.core/@dot.classes@
-+;@eclipse.platform.debug@/org.eclipse.debug.ui/@dot.classes@
-+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.common/@dot.classes@
-+;@rt.equinox.p2.bundles@/org.eclipse.equinox.frameworkadmin/@dot.classes@
-+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.metadata/@dot.classes@
-+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.publisher.eclipse/@dot.classes@
-+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.preferences/@dot.classes@
-+;@rt.equinox.bundles.bundles@/org.eclipse.equinox.registry/@dot.classes@
-+;@eclipse.equinox.supplement@/@dot.classes@
-+;@eclipse.platform.ua@/org.eclipse.help/@dot.classes@
-+;@eclipse.platform.ua@/org.eclipse.help.ui/@dot.classes@
-+;@eclipse.jdt.core@/org.eclipse.jdt.core/@dot.classes@
-+;@eclipse.jdt.debug@/org.eclipse.jdt.debug/jdi.jar
-+;@eclipse.jdt.debug@/org.eclipse.jdt.debug.ui/@dot.classes@
-+;@eclipse.jdt.ui@/org.eclipse.jdt.junit/@dot.classes@
-+;@eclipse.jdt.ui@/org.eclipse.jdt.junit/junitsupport.jar
-+;@eclipse.jdt.ui@/org.eclipse.jdt.junit.core/@dot.classes@
-+;@eclipse.jdt.debug@/org.eclipse.jdt.launching/@dot.classes@
-+;@eclipse.jdt.ui@/org.eclipse.jdt.ui/@dot.classes@
-+;@eclipse.platform.ui.bundles@/org.eclipse.jface/@dot.classes@
-+;@eclipse.platform.text@/org.eclipse.jface.text/@dot.classes@
-+;@rt.equinox.framework.bundles@/org.eclipse.osgi/@dot.classes@
-+;@rt.equinox.framework.bundles@/org.eclipse.osgi.services/@dot.classes@
-+;@rt.equinox.framework.bundles@/org.eclipse.osgi.util/@dot.classes@
-+;@eclipse.pde.ui.ui@/org.eclipse.pde.core/@dot.classes@
-+;@eclipse.pde.ui.ui@/org.eclipse.pde.ui/@dot.classes@
-+;@eclipse.pde.build@/org.eclipse.pde.build/@dot.classes@
-+;@eclipse.pde.ui.ui@/org.eclipse.pde.launching/@dot.classes@
-+;@eclipse.platform.text@/org.eclipse.search/@dot.classes@
-+;@eclipse.platform.swt.binaries.bundles@/org.eclipse.swt.win32.win32.x86/@dot.classes@
-+;@eclipse.platform.text@/org.eclipse.text/@dot.classes@
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui/@dot.classes@
-+;@eclipse.platform.text@/org.eclipse.ui.editors/@dot.classes@
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui.ide/@dot.classes@
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui.views/@dot.classes@
-+;@eclipse.platform.ui.bundles@/org.eclipse.ui.workbench/@dot.classes@
-+;@eclipse.platform.text@/org.eclipse.ui.workbench.texteditor/@dot.classes@
-+;@eclipse.platform.update@/org.eclipse.update.configurator/@dot.classes@
- -breakiterator
- -use
- -splitIndex
---- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pde_basedirs.properties
-+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pde_basedirs.properties
-@@ -1,2 +1,21 @@
-+dot.classes=@dot
-+dependency.dir=..
-+
-+eclipse.jdt.core=..
-+eclipse.jdt.debug=..
-+eclipse.jdt.ui=..
- eclipse.pde.ui.ui=..
- eclipse.pde.build=..
-+eclipse.platform.debug=..
-+eclipse.platform.resources.bundles=..
-+eclipse.platform.runtime.bundles=..
-+eclipse.platform.team.bundles=..
-+eclipse.platform.text=..
-+eclipse.platform.ua=..
-+eclipse.platform.ui=..
-+eclipse.platform.update=..
-+rt.equinox.bundles.bundles=..
-+rt.equinox.framework.bundles=..
-+rt.equinox.p2.bundles=..
-+
-+eclipse.equinox.supplement=../org.eclipse.equinox.supplement
---- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/buildDoc.xml.bak 2012-11-05 15:04:34.000000000 +0100
-+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/buildDoc.xml 2012-11-05 15:31:21.715559191 +0100
-@@ -139,10 +139,10 @@
-
-
-
--
-+
-
-
--
-+
-
-
-
---- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties
-+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/cbi_basedirs.properties
-@@ -1,3 +1,6 @@
-+dot.classes=target/classes
-+dependency.dir=target/dependency
-+
- eclipse.jdt.ui=../../../eclipse.jdt.ui
- eclipse.pde=../../../eclipse.pde
- eclipse.platform.ant=../../../eclipse.platform/ant
-@@ -18,3 +21,4 @@ eclipse.platform.team.examples=../../../eclipse.platform.team/examples
- eclipse.platform.swt.examples=../../../eclipse.platform.swt/examples
- eclipse.platform.ui.examples=../../../eclipse.platform.ui/examples
-
-+eclipse.equinox.supplement=../../../rt.equinox.framework/bundles/org.eclipse.osgi/supplement
---- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties
-+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pde_basedirs.properties
-@@ -1,3 +1,6 @@
-+dot.classes=@dot
-+dependency.dir=..
-+
- eclipse.jdt.ui=..
- eclipse.pde=..
- eclipse.platform.ant=..
-@@ -17,3 +20,5 @@ rt.equinox.p2.bundles=..
- eclipse.platform.team.examples=..
- eclipse.platform.swt.examples=..
- eclipse.platform.ui.examples=..
-+
-+eclipse.equinox.supplement=../org.eclipse.equinox.supplement
---- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml.bak 2012-11-05 15:04:40.000000000 +0100
-+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml 2012-11-05 15:35:51.721585656 +0100
-@@ -35,6 +35,199 @@
-
-
-
-+
-+ org.eclipse.tycho
-+ target-platform-configuration
-+
-+
-+
-+
-+ eclipse-plugin
-+ com.ibm.icu
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ com.jcraft.jsch
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.apache.geronimo.specs.geronimo-annotation_1.1_spec
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ javax.el
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ javax.inject
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ javax.servlet
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ javax.servlet.jsp
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.apache.ant
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.apache.batik.css
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.glassfish.web.javax.servlet.jsp
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.apache.lucene.analysis
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.apache.lucene.core
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.eclipse.ecf.provider.filetransfer
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.eclipse.ecf.filetransfer
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.eclipse.ecf
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.eclipse.ecf.ssl
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.eclipse.ecf.identity
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.eclipse.ecf.provider.filetransfer.ssl
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.eclipse.ecf.provider.filetransfer.httpclient
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.eclipse.ecf.provider.filetransfer.httpclient.ssl
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.eclipse.emf.common
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.eclipse.emf.ecore
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.eclipse.emf.ecore.xmi
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.eclipse.jetty.continuation
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.eclipse.jetty.http
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.eclipse.jetty.io
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.eclipse.jetty.security
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.eclipse.jetty.server
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.eclipse.jetty.servlet
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.eclipse.jetty.util
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.sat4j.core
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.sat4j.pb
-+ 0.0.0
-+
-+
-+ eclipse-plugin
-+ org.w3c.css.sac
-+ 0.0.0
-+
-+
-+
-+
-+
-+
-+ org.apache.maven.plugins
-+ maven-dependency-plugin
-+ 2.5.1
-+
-+
-+ copy
-+ process-resources
-+
-+ copy-dependencies
-+
-+
-+ true
-+ true
-+
-+
-+
-+
-
- org.eclipse.tycho.extras
- tycho-eclipserun-plugin
---- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt.bak 2012-11-05 17:19:09.000000000 +0100
-+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt 2012-11-05 17:25:46.971519416 +0100
-@@ -131,50 +131,49 @@
- ;@eclipse.platform.update@/org.eclipse.update.configurator/src
- -d reference/api
- -classpath @rt@
--;../com.ibm.icu_*.jar
--;../com.jcraft.jsch_*.jar
--;../javax.annotation_*.jar
--;../javax.el_*.jar
--;../javax.inject_*.jar
--;../javax.servlet_*.jar
--;../javax.servlet.jsp_*.jar
--;../org.apache.ant_*/lib/ant.jar
--;../org.apache.batik.css_*.jar
--;../org.apache.jasper.glassfish_*.jar
--;../org.apache.lucene.analysis_*.jar
--;../org.apache.lucene.core_*.jar
--;../org.eclipse.core.runtime.compatibility.auth/@dot
--;../org.eclipse.ecf.provider.filetransfer_*.jar
--;../org.eclipse.ecf.filetransfer_*.jar
--;../org.eclipse.ecf_*.jar
--;../org.eclipse.ecf.ssl_*.jar
--;../org.eclipse.ecf.identity_*.jar
--;../org.eclipse.ecf.provider.filetransfer.ssl_*.jar
--;../org.eclipse.ecf.provider.filetransfer.httpclient_*.jar
--;../org.eclipse.ecf.provider.filetransfer.httpclient.ssl_*.jar
--;../org.eclipse.emf.common_*.jar
--;../org.eclipse.emf.ecore_*.jar
--;../org.eclipse.emf.ecore.xmi_*.jar
--;../org.eclipse.equinox.p2.director/@dot
--;../org.eclipse.equinox.p2.garbagecollector/@dot
--;../org.eclipse.equinox.p2.metadata.repository/@dot
--;../org.eclipse.equinox.p2.publisher/@dot
--;../org.eclipse.equinox.simpleconfigurator/@dot
--;../org.eclipse.equinox.supplement/@dot
--;../org.eclipse.help.appserver/@dot
--;../org.eclipse.osgi.services/@dot
--;../org.eclipse.osgi/@dot
--;../org.eclipse.update.ui/@dot
--;../org.eclipse.jetty.continuation_*.jar
--;../org.eclipse.jetty.http_*.jar
--;../org.eclipse.jetty.io_*.jar
--;../org.eclipse.jetty.security_*.jar
--;../org.eclipse.jetty.server_*.jar
--;../org.eclipse.jetty.servlet_*.jar
--;../org.eclipse.jetty.util_*.jar
--;../org.sat4j.core_*.jar
--;../org.sat4j.pb_*.jar
--;../org.w3c.css.sac_*.jar
-+;@dependency.dir@/com.ibm.icu_*.jar
-+;@dependency.dir@/com.jcraft.jsch_*.jar
-+;@dependency.dir@/org.apache.geronimo.specs.geronimo-annotation_1.1_spec_*.jar
-+;@dependency.dir@/javax.el_*.jar
-+;@dependency.dir@/javax.inject_*.jar
-+;@dependency.dir@/javax.servlet_*.jar
-+;@dependency.dir@/javax.servlet.jsp_*.jar
-+;@dependency.dir@/org.apache.ant_*/lib/ant.jar
-+;@dependency.dir@/org.apache.batik.css_*.jar
-+;@dependency.dir@/org.glassfish.web.javax.servlet.jsp_*.jar
-+;@dependency.dir@/org.apache.lucene.analysis_*.jar
-+;@dependency.dir@/org.apache.lucene.core_*.jar
-+;@eclipse.platform.runtime.bundles@/org.eclipse.core.runtime.compatibility.auth/@dot.classes@
-+;@dependency.dir@/org.eclipse.ecf.provider.filetransfer_*.jar
-+;@dependency.dir@/org.eclipse.ecf.filetransfer_*.jar
-+;@dependency.dir@/org.eclipse.ecf_*.jar
-+;@dependency.dir@/org.eclipse.ecf.ssl_*.jar
-+;@dependency.dir@/org.eclipse.ecf.identity_*.jar
-+;@dependency.dir@/org.eclipse.ecf.provider.filetransfer.ssl_*.jar
-+;@dependency.dir@/org.eclipse.ecf.provider.filetransfer.httpclient_*.jar
-+;@dependency.dir@/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_*.jar
-+;@dependency.dir@/org.eclipse.emf.common_*.jar
-+;@dependency.dir@/org.eclipse.emf.ecore_*.jar
-+;@dependency.dir@/org.eclipse.emf.ecore.xmi_*.jar
-+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.director/@dot.classes@
-+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.garbagecollector/@dot.classes@
-+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.metadata.repository/@dot.classes@
-+;@rt.equinox.p2.bundles@/org.eclipse.equinox.p2.publisher/@dot.classes@
-+;@rt.equinox.p2.bundles@/org.eclipse.equinox.simpleconfigurator/@dot.classes@
-+;@eclipse.platform.supplement@/@dot.classes@
-+;@eclipse.platform.ua@/org.eclipse.help.appserver/@dot.classes@
-+;@rt.equinox.framework.bundles@/org.eclipse.osgi.services/@dot.classes@
-+;@rt.equinox.framework.bundles@/org.eclipse.osgi/@dot.classes@
-+;@dependency.dir@/org.eclipse.jetty.continuation_*.jar
-+;@dependency.dir@/org.eclipse.jetty.http_*.jar
-+;@dependency.dir@/org.eclipse.jetty.io_*.jar
-+;@dependency.dir@/org.eclipse.jetty.security_*.jar
-+;@dependency.dir@/org.eclipse.jetty.server_*.jar
-+;@dependency.dir@/org.eclipse.jetty.servlet_*.jar
-+;@dependency.dir@/org.eclipse.jetty.util_*.jar
-+;@dependency.dir@/org.sat4j.core_*.jar
-+;@dependency.dir@/org.sat4j.pb_*.jar
-+;@dependency.dir@/org.w3c.css.sac_*.jar
- -breakiterator
- -use
- -splitIndex
diff --git a/eclipse-build-internal-jdt-debug-jar.patch b/eclipse-build-internal-jdt-debug-jar.patch
index 04c6f02..ad9268a 100644
--- a/eclipse-build-internal-jdt-debug-jar.patch
+++ b/eclipse-build-internal-jdt-debug-jar.patch
@@ -2,7 +2,7 @@
+++ eclipse.jdt.debug/org.eclipse.jdt.launching/pom.xml 2012-09-19 14:36:29.035226726 +0200
@@ -22,4 +22,50 @@
org.eclipse.jdt.launching
- 3.6.100-SNAPSHOT
+ 3.6.101-SNAPSHOT
eclipse-plugin
+
+
diff --git a/eclipse-change-build-packagings.patch b/eclipse-change-build-packagings.patch
index 731c6d9..f898764 100644
--- a/eclipse-change-build-packagings.patch
+++ b/eclipse-change-build-packagings.patch
@@ -1,6 +1,6 @@
--- pom.xml.orig 2012-09-17 16:49:47.931902759 +0200
+++ pom.xml 2012-09-17 16:44:21.694938495 +0200
-@@ -49,11 +49,13 @@
+@@ -49,6 +49,7 @@
rt.equinox.bundles
rt.equinox.framework
rt.equinox.p2
@@ -8,15 +8,9 @@
eclipse.platform.releng
eclipse.platform.releng.tychoeclipsebuilder
-
- eclipse.platform.repository
-+ TMP/jdtpde
- TMP/eclipse-junit-tests
-
-
--- eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml.bak 2012-08-28 09:35:00.000000000 +0200
+++ eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml 2012-08-28 10:02:35.739112336 +0200
-@@ -45,7 +45,7 @@
+@@ -45,10 +45,11 @@
SDKProfile
@@ -25,6 +19,10 @@
eclipse
++
+
+
+
--- eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product.bak 2012-08-28 10:04:10.214701605 +0200
+++ eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product 2012-08-28 10:04:29.568822865 +0200
@@ -1,7 +1,7 @@
@@ -44,3 +42,12 @@
+--- eclipse.platform.releng.tychoeclipsebuilder/pom.xml.bak 2012-12-17 15:03:11.000000000 +0100
++++ eclipse.platform.releng.tychoeclipsebuilder/pom.xml 2012-12-18 10:32:35.835825807 +0100
+@@ -37,5 +37,6 @@
+ rcp.config
+ rcp.sdk
+ sdk
++ jdtpde
+
+
diff --git a/eclipse-fix-master-equinox.patch b/eclipse-fix-master-equinox.patch
index 2590318..14b6f15 100644
--- a/eclipse-fix-master-equinox.patch
+++ b/eclipse-fix-master-equinox.patch
@@ -1,229 +1,47 @@
---- eclipse.platform.releng/features/master-equinox/feature.xml.bak 2012-07-25 17:26:52.000000000 +0200
-+++ eclipse.platform.releng/features/master-equinox/feature.xml 2012-09-07 20:13:36.050319021 +0200
-@@ -7,173 +7,139 @@
-
--
--
-+
-+
-+
-+
--
--
-+
-+
--
--
-+
-+
--
--
-+
-+
--
--
--
--
--
--
--
--
-+
-+
--
--
-+
-+
--
--
-+
-+
--
--
-+
-+
--
--
-+
-+
--
--
-
--
-
--
-
--
--
--
--
-+
+--- eclipse.platform.releng/features/master-equinox/feature.xml.orig 2012-12-17 15:17:55.000000000 +0100
++++ eclipse.platform.releng/features/master-equinox/feature.xml 2012-12-18 09:50:45.413972005 +0100
+@@ -128,13 +128,13 @@
+ unpack="false"/>
+
--
--
--
--
--
--
--
--
+
+
+ -->
-
-- -->
--
--
--
+
+
++ version="0.0.0"/-->
--
--
--
--
-
+ org.eclipse.tycho
+--- eclipse-parent/pom.xml.orig 2012-12-17 15:03:11.000000000 +0100
++++ eclipse-parent/pom.xml 2012-12-18 10:01:03.641488185 +0100
+@@ -207,7 +207,7 @@
tycho-packaging-plugin
${tycho.version}
--
+
-
-- org.eclipse.tycho.extras
-- tycho-buildtimestamp-jgit
-- ${tycho-extras.version}
++
+
false
'v'yyyyMMdd-HHmm
- jgit
--
--
++
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index 165c96e..74f2ad7 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -431,24 +431,14 @@
--- rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/build.sh.bak 2012-11-20 07:45:12.580081610 -0500
+++ rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/build.sh 2012-11-20 07:49:33.792018170 -0500
-@@ -94,6 +94,21 @@
+@@ -94,6 +94,11 @@
defaultJava=DEFAULT_JAVA_EXEC
- OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
-+ "armv7l")
++ "armv*")
+ defaultOSArch="arm"
+ defaultJava=DEFAULT_JAVA_EXEC
-+ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
-+ ;;
-+ "armv7hl")
-+ defaultOSArch="arm"
-+ defaultJava=DEFAULT_JAVA_EXEC
-+ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
-+ ;;
-+ "armv5tel")
-+ defaultOSArch="arm"
-+ defaultJava=DEFAULT_JAVA_EXEC
-+ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
++ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
+ ;;
*)
echo "*** Unknown MODEL <${MODEL}>"
diff --git a/eclipse-test-support.patch b/eclipse-test-support.patch
index d37d550..6a95e79 100644
--- a/eclipse-test-support.patch
+++ b/eclipse-test-support.patch
@@ -1,89 +1,170 @@
---- TMP/eclipse-junit-tests/src/main/scripts/test.xml.bak 2012-07-25 17:15:52.000000000 +0200
-+++ TMP/eclipse-junit-tests/src/main/scripts/test.xml 2012-09-04 10:01:23.562816367 +0200
-@@ -90,65 +90,20 @@
-
-
-
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
-+
-+
-+
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2012-12-17 15:03:11.000000000 +0100
++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2012-12-18 11:08:09.033309587 +0100
+@@ -164,98 +164,14 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+
+
+
+
-+
+
+-
+-
+
+
+
+-
+
+
+
+@@ -283,7 +199,7 @@
+
+-
++
+
+
+
+@@ -815,6 +731,17 @@
+ arg2="" />
+
+
++
++
++
++
++
++
++ trying to find ${testPluginFolder}
++
++
+
-+
-+
-+
++
+
+
+
+@@ -1252,7 +1179,7 @@
+
-
---- TMP/eclipse-junit-tests/src/main/scripts/runtests.sh.bak 2012-07-25 17:15:52.000000000 +0200
-+++ TMP/eclipse-junit-tests/src/main/scripts/runtests.sh 2012-09-04 10:02:38.616352712 +0200
-@@ -1,4 +1,70 @@
- #!/bin/sh
+-
++
+
+
+
+
+-
++
+
+
+
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh.orig 2012-12-17 15:03:11.000000000 +0100
++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh 2012-12-18 11:21:53.867638480 +0100
+@@ -1,5 +1,74 @@
+ #!/usr/bin/env bash
+
++
+function findXvncAndSetDisplay() {
+# if [ ${headless} == 1 ]; then
+ # Try to find Xvnc
@@ -150,97 +231,48 @@
+ rm Xvnc.cfg
+ fi
+}
-
- #set the DISPLAY for running tests on Linux
- #DISPLAY=`$HOST`:0.0;export DISPLAY
-@@ -66,24 +132,38 @@
-
++
++
+ # This file should never exist or be needed for production machine,
+ # but allows an easy way for a "local user" to provide this file
+ # somewhere on the search path ($HOME/bin is common),
+@@ -92,11 +161,18 @@
#necessary when invoking this script through rsh
cd $dir
--
-+mkdir -p /tmp/eclipse-tests-directory
-+pushd /tmp/eclipse-tests-directory
-+rm -rf *
- # verify os, ws and arch values passed in are valid before running tests
- if [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "macosx-cocoa-ppc" ] || [ "$os-$ws-$arch" = "macosx-cocoa-x86" ] || [ "$os-$ws-$arch" = "aix-gtk-ppc" ] || [ "$os-$ws-$arch" = "aix-gtk-ppc64" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "hpux-gtk-ia64_32"]
- then
-- if [ ! -r eclipse ]
-- then
-- tar -xzf eclipse-SDK-*.tar.gz
-- unzip -qq -o -C eclipse-junit-tests-*.zip */plugins/org.eclipse.test* -d eclipse/dropins/
-+ if [ ! -r eclipse ]
-+ then
+
++
++ mkdir -p /tmp/eclipse-tests-directory
++ pushd /tmp/eclipse-tests-directory
++ rm -rf *
++
+ if [ ! -r eclipse ]
+ then
+- tar -xzf eclipse-SDK-*.tar.gz
+- # note, the file pattern to match, must not start with */plugins because there is no leading '/' in the zip file, since they are repos.
+- unzip -qq -o -C eclipse-junit-tests-*.zip plugins/org.eclipse.test* -d eclipse/dropins/
+ pushd @libdir@
-+ tar czf /tmp/eclipse-tests-directory/eclipse-SDK-v20120903-1347-linux-gtk-x86_64.tar.gz eclipse
++ tar czf /tmp/eclipse-tests-directory/eclipse-SDK-v20120903-1347-linux-gtk-x86_64.tar.gz eclipse
+ popd
+ cp -rf @libdir@/eclipse eclipse
+ unzip -o -C /usr/share/java/eclipse-tests/eclipse-junit-tests-*.zip */plugins/org.eclipse.test* -d eclipse/dropins/
- fi
+ fi
-+findXvncAndSetDisplay
-+setArch
+ # run tests
+@@ -139,9 +215,15 @@
+ echo "extdirproperty in runtest: ${extdirproperty}"
+
+ # -Dtimeout=300000 "${ANT_OPTS}"
++
++ if [[ ! -z "${testslocation}" ]]
++ then
++ testslocation="/usr/share/java/eclipse-tests/"
++fi
+
- # run tests
--launcher=`ls eclipse/plugins/org.eclipse.equinox.launcher_*.jar`
--$vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file `pwd`/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
-+eclipse -nosplash -data workspace -application org.eclipse.ant.core.antRunner \
-+-file "/usr/share/java/eclipse-tests/test.xml" $tests \
-+-Dws=$ws -Dos=$os -Darch=$arch -Dos.arch=$arch \
-+-DbuildId=v20120903-1347 -Dbasedir="/tmp/eclipse-tests-directory" \
-+-DruntimeArchive="eclipse-SDK-v20120903-1347-linux-gtk-x86_64.tar.gz" \
-+-DrepoLocation="/usr/share/java/eclipse-tests" \
-+-Dorg.eclipse.test="3.3.100" \
-+-D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
-
-+cleanupXvnc
- # display message to user if os, ws and arch are invalid
- else
- echo "The os, ws and arch values are either invalid or are an invalid combination"
-
- exit 1
- fi
--
---- TMP/eclipse-junit-tests/src/main/scripts/test.xml.bak 2012-09-04 11:06:32.018103811 +0200
-+++ TMP/eclipse-junit-tests/src/main/scripts/test.xml 2012-09-04 10:13:07.000000000 +0200
-@@ -120,7 +120,7 @@
-
-
-
--
-+
-
-
-
---- TMP/eclipse-junit-tests/src/main/scripts/test.xml.bak 2012-09-06 09:11:00.000000000 +0200
-+++ TMP/eclipse-junit-tests/src/main/scripts/test.xml 2012-09-06 09:12:14.131863056 +0200
-@@ -949,9 +949,9 @@
-
-
-
--
-+
-
--
-+
-
-
-
---- TMP/eclipse-junit-tests/src/main/scripts/test.xml.bak 2012-09-06 09:14:04.000000000 +0200
-+++ TMP/eclipse-junit-tests/src/main/scripts/test.xml 2012-09-06 10:42:12.066027428 +0200
-@@ -390,6 +390,16 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+ trying to find ${testPluginFolder}
-+
-+
-+
-
-
-
+ if [[ ! -z "${extdirproperty}" ]]
+ then
+- $vmcmd "${extdirproperty}" -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
++ $vmcmd "${extdirproperty}" -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${testslocation}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
+ else
+- $vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
++ $vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${testslocation}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
+ fi
diff --git a/eclipse.spec b/eclipse.spec
index 012296e..69686ff 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -5,7 +5,7 @@ Epoch: 1
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
%global eclipse_micro 1
%global initialize 1
-%global eb_commit 094a56b8b1222d3535f5dada20290dc91f14d102
+%global eb_commit 7a327b17de5f606f47cba6b74e64619520186b7a
%global build_id I20120608-1400
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
%global installation_loc %{_libdir}/%{name}
@@ -179,8 +179,6 @@ Patch26: %{name}-build-network-native-libs.patch
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=385010
Patch27: %{name}-build-filesystem-native-libs.patch
-Patch28: %{name}-build-help-contents.patch
-
Patch29: %{name}-test-support.patch
Patch30: %{name}-remove-tomcat6.patch
@@ -413,7 +411,6 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch25
%patch26
%patch27
-%patch28
%patch29
%patch30
%patch31
@@ -424,16 +421,14 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch36
%patch37
-#p2.inf should be qualified (asked in the newsgroup and waiting for an answer)
-#http://dev.eclipse.org/mhonarc/lists/cbi-dev/msg00777.html
-cp eclipse.platform.releng.tychoeclipsebuilder/platform/p2.inf eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
-cp eclipse.platform.releng.tychoeclipsebuilder/platform/p2.inf eclipse.platform.releng.tychoeclipsebuilder/platform/org.fedoraproject.eclipse.platform.p2.inf
-
#To save build hdd space (it took more than 10GB to build everything)
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module rcp eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module rcp.sdk eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module sdk eclipse.platform.releng.tychoeclipsebuilder
+%pom_disable_module equinox.starterkit.product eclipse.platform.releng.tychoeclipsebuilder
+%pom_disable_module osgistarter.config.launcher eclipse.platform.releng.tychoeclipsebuilder
+%pom_disable_module eclipse.platform.repository
#we do not have dependencies for those tests
%pom_disable_module bundles/org.eclipse.equinox.region.tests rt.equinox.bundles
@@ -446,6 +441,7 @@ cp eclipse.platform.releng.tychoeclipsebuilder/platform/p2.inf eclipse.platform.
%pom_disable_module bundles/org.eclipse.equinox.cm.test rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.console.ssh rt.equinox.bundles
+
#no idea what's that. Maybe later - sources seem to be hidden inside this additonal jar.
%pom_disable_module bundles/org.eclipse.equinox.weaving.caching.j9 rt.equinox.bundles/
@@ -534,6 +530,9 @@ sed -i -e "s/1500/1503/" rt.equinox.framework/bundles/org.eclipse.equinox.launch
#hack - there should be a patch providing a profile for each arch
mkdir -p rt.equinox.framework/bundles/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch}
+sed -i -e "s/org.apache.jasper.glassfish/org.glassfish.web.javax.servlet.jsp/" eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
+sed -i -e "s/javax.annotation/org.apache.geronimo.specs.geronimo-annotation_1.1_spec/" eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
+
%build
#This is the lowest value where the build succeeds. 512m is not enough.
export MAVEN_OPTS="-Xmx640m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState"
@@ -554,8 +553,6 @@ ln -s /usr/share/java/emf/eclipse/plugins/* -t .
for f in %{_libdir}/eclipse/dropins/sdk/plugins/* ; do ln -s $f || echo "$f exists"; done
%endif
-#ln -s %{_javadir}/hamcrest/core.jar
-
#create fake junit3
pushd org.junit_3.8.2.v3_8_2_v20100427-1100
ln -s %{_javadir}/junit.jar
@@ -613,7 +610,7 @@ mvn-rpmbuild -f maven-cbi-plugin/pom.xml \
# workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=386377
pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/
export JAVA_HOME=%{java_home}
- ant build_eclipse_cbi
+ ant
popd
mvn-rpmbuild clean install \
@@ -734,7 +731,7 @@ cp -rf eclipse eclipse-backup-with-jdt
# go into backup
pushd eclipse-backup-with-jdt
./eclipse -application org.eclipse.equinox.p2.director \
- -repository file:/`pwd`/../../../../../../../../../TMP/jdtpde/target/repository \
+ -repository file:/`pwd`/../../../../../../../../../eclipse.platform.releng.tychoeclipsebuilder/jdtpde/target/repository \
-installIU org.eclipse.jdt.feature.group
#exit backup
popd
@@ -759,7 +756,7 @@ cp -rf eclipse-backup-with-jdt eclipse-backup-with-jdt-pde
pushd eclipse-backup-with-jdt-pde
./eclipse -application org.eclipse.equinox.p2.director \
- -repository file:/`pwd`/../../../../../../../../../TMP/jdtpde/target/repository \
+ -repository file:/`pwd`/../../../../../../../../../eclipse.platform.releng.tychoeclipsebuilder/jdtpde/target/repository \
-installIU org.eclipse.sdk.feature.group
popd
@@ -1021,7 +1018,7 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
# Tests
##############
-unzip TMP/eclipse-junit-tests/target/eclipse-junit-tests-bundle.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests
+unzip eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target/eclipse-junit-tests-bundle.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests
unzip $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests/eclipse-junit-tests-*.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests/
rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests/eclipse-junit-tests-*.zip
rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests/runtests.bat
diff --git a/get-eclipse.sh b/get-eclipse.sh
index 16470e4..0124dad 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -3,7 +3,7 @@
rm -rf R4_platform-aggregator
rm eclipse-source.tar.bz2
-git clone -b JunoSR1_RC1_R4 --recurse-submodules git://git.eclipse.org/gitroot/cbi/platform-aggregator.git R4_platform-aggregator
+git clone -b R4_2_maintenance --recurse-submodules git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git R4_platform-aggregator
pushd R4_platform-aggregator
diff --git a/sources b/sources
index cc4e7b5..91610c1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-30164141fa99313969cdd32a11d7cf6d eclipse-build-094a56b8b1222d3535f5dada20290dc91f14d102.tar.xz
-e0410f4224b0e4390b553e092e400439 eclipse-source.tar.bz2
\ No newline at end of file
+841919f98ced4d5c7df6496d09761c37 eclipse-source.tar.bz2
+102b0b7d9be171c8402dbf315b5e01b4 eclipse-build-7a327b17de5f606f47cba6b74e64619520186b7a.tar.xz