diff --git a/eclipse-build-help-contents.patch b/eclipse-build-help-contents.patch index 33c0f90..bdad27a 100644 --- a/eclipse-build-help-contents.patch +++ b/eclipse-build-help-contents.patch @@ -1,121 +1,453 @@ ---- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml.bak 2012-08-31 11:44:21.000000000 +0200 -+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml 2012-08-31 12:50:03.000000000 +0200 -@@ -23,4 +23,52 @@ +--- 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,4 @@ ++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.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,35 +1,35 @@ + -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 +--- /dev/null ++++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pde_basedirs.properties +@@ -0,0 +1,5 @@ ++eclipse.jdt.core=.. ++eclipse.jdt.ui=.. ++eclipse.jdt.debug=.. ++eclipse.platform.ant=.. ++ +--- 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 + -+ -+ -+ -+ org.eclipse.tycho.extras -+ tycho-eclipserun-plugin -+ -+ 0.16.0-SNAPSHOT -+ -+ -+ -Dhelp.lucene.tokenizer=standard -+ -+ -application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml -+ -+ -+ -+ 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 -+ -+ -+ -+ -+ ++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 @@ + + -+ 0.16.0-SNAPSHOT -+ -+ -+ -Dhelp.lucene.tokenizer=standard -+ -+ -application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml -+ -+ -+ -+ 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 -+ -+ -+ -+ -+ ++ ++ ++ ++ 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.platform.doc.isv/buildDoc.xml.bak 2012-07-25 17:26:09.000000000 +0200 -+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/buildDoc.xml 2012-08-31 14:03:43.542905920 +0200 -@@ -22,76 +22,80 @@ +--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/buildDoc.xml.bak 2012-10-01 11:24:28.000000000 +0200 ++++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/buildDoc.xml 2012-11-05 14:50:56.839854132 +0100 +@@ -1,6 +1,8 @@ + + + ++ ++ + + + +@@ -22,76 +24,75 @@ @@ -150,68 +482,67 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ - - - - -+ -+ -+ -+ ++ ++ ++ ++ - - - - - -+ -+ -+ -+ -+ ++ ++ ++ ++ ++ - - - - - -+ -+ -+ -+ -+ ++ ++ ++ ++ @@ -227,33 +558,117 @@ - - - -+ - - - - - - +- +- +- +- +- +- - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ---- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt 2012-09-17 15:29:48.000000000 +0200 -+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt 2012-09-18 11:02:07.580141687 +0200 +@@ -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" @@ -385,411 +800,957 @@ -;../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.ui.workbench/src -+;../../../eclipse.platform.ui/bundles/org.eclipse.e4.core.commands/src -+;../../../eclipse.platform.ui/bundles/org.eclipse.e4.core.contexts/src -+;../../../eclipse.platform.ui/bundles/org.eclipse.e4.core.di/src -+;../../../eclipse.platform.ui/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/update/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 -@@ -193,7 +193,7 @@ +@@ -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 ++@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.jdt.doc.user/pom.xml.bak 2012-09-05 11:23:16.000000000 +0200 -+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml 2012-09-05 13:52:13.000000000 +0200 -@@ -23,4 +23,41 @@ - org.eclipse.jdt.doc.user - 3.8.1-SNAPSHOT +--- 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 -+ -+ -+ -+ -+ org.eclipse.tycho.extras -+ tycho-eclipserun-plugin -+ ${tycho.version} -+ -+ -Dhelp.lucene.tokenizer=standard -+ -application org.eclipse.ant.core.antRunner -buildfile build.xml build.index -+ -+ -+ org.eclipse.ant.core -+ eclipse-plugin -+ -+ -+ org.apache.ant -+ eclipse-plugin -+ -+ -+ org.eclipse.help.base -+ eclipse-plugin -+ -+ -+ -+ -+ -+ -+ eclipse-run -+ -+ compile -+ -+ -+ -+ -+ -+ - ---- eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.properties.bak 2012-09-05 13:48:43.000000000 +0200 -+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.properties 2012-09-05 14:00:36.647229942 +0200 -@@ -9,4 +9,8 @@ - # 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 ++ ++ ++ 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.platform.common/bundles/org.eclipse.jdt.doc.isv/build.properties.bak 2012-09-05 11:23:15.000000000 +0200 -+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/build.properties 2012-09-05 14:25:51.358734685 +0200 -@@ -10,3 +10,11 @@ - ############################################################################### - # use provided build.xml - custom=true + 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/pde_basedirs.properties ++++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pde_basedirs.properties +@@ -1,5 +1,19 @@ ++dot.classes=@dot ++dependency.dir=.. + -+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 -\ No newline at end of file ---- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml.bak 2012-07-25 17:26:09.000000000 +0200 -+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml 2012-09-05 14:31:34.735058172 +0200 -@@ -21,15 +21,15 @@ - - + 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.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt.bak 2012-09-05 11:23:13.000000000 +0200 -+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt 2012-09-05 14:37:59.564659015 +0200 -@@ -1,35 +1,35 @@ - -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.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.debug/org.eclipse.jdt.debug/model -+;../../../eclipse.jdt.debug/org.eclipse.jdt.debug/jdi -+;../../../eclipse.jdt.debug/org.eclipse.jdt.debug/eval -+;../../../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/ui -+;../../../eclipse.jdt.ui/org.eclipse.jdt.ui/core refactoring -+;../../../eclipse.jdt.ui/org.eclipse.jdt.ui/ui refactoring -+;../../../eclipse.jdt.ui/org.eclipse.jdt.ui/core extension -+;../../../eclipse.jdt.ui/org.eclipse.jdt.ui/internal compatibility -+;../../../eclipse.jdt.ui/org.eclipse.jdt.core.manipulation/refactoring -+;../../../eclipse.jdt.ui/org.eclipse.jdt.core.manipulation/common -+;../../../eclipse.platform/ant/org.eclipse.ant.launching/src -+;../../../eclipse.platform/ant/org.eclipse.ant.ui/Ant Tools Support -+;../../../eclipse.platform/ant/org.eclipse.ant.ui/Ant Editor -+;../../../eclipse.jdt.core/org.eclipse.jdt.apt.core/src" ++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 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,49 @@ + + + ++ ++ 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 ++ ++ ++ ++ ++ ++ ++ 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@ - ;../com.ibm.icu_*.jar ---- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml.bak 2012-09-05 11:23:16.000000000 +0200 -+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml 2012-09-05 15:02:01.125672146 +0200 -@@ -23,4 +23,49 @@ - org.eclipse.pde.doc.user - 3.8.1-SNAPSHOT - eclipse-plugin -+ -+ -+ +-;../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.eclipse.tycho.extras -+ tycho-eclipserun-plugin -+ ${tycho.version} -+ -+ -Dhelp.lucene.tokenizer=standard -+ -application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml -+ -+ -+ 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.apache.maven.plugins ++ maven-dependency-plugin ++ 2.5.1 + + ++ copy ++ process-resources + -+ eclipse-run ++ copy-dependencies + -+ compile ++ ++ true ++ true ++ + + + -+ -+ -+ - ---- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt.bak 2012-09-05 11:23:13.000000000 +0200 -+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt 2012-09-05 14:55:53.990584309 +0200 -@@ -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/uiorg.eclipse.pde.ui/src -+;../../../eclipse.pde.build/org.eclipse.pde.build/src -+;../../../eclipse.pde.ui/uiorg.eclipse.pde.launching/src" + + org.eclipse.tycho.extras + tycho-eclipserun-plugin +--- eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt.bak 2012-11-05 15:51:17.000000000 +0100 ++++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt 2012-11-05 15:53:06.862349799 +0100 +@@ -32,61 +32,61 @@ + ;@eclipse.jdt.ui@/org.eclipse.jdt.ui/ui refactoring" -d reference/api -classpath @rt@ - ;../org.eclipse.compare/@dot ---- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/buildDoc.xml.bak 2012-07-25 17:26:09.000000000 +0200 -+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/buildDoc.xml 2012-09-05 14:54:44.521210739 +0200 -@@ -31,10 +31,10 @@ - - - -- -- -- -- -+ -+ -+ -+ - - - ---- eclipse.platform.releng/features/org.eclipse.sdk/feature.xml.bak 2012-07-25 17:26:52.000000000 +0200 -+++ eclipse.platform.releng/features/org.eclipse.sdk/feature.xml 2012-09-06 14:28:25.004902282 +0200 -@@ -66,4 +66,15 @@ - install-size="0" - version="0.0.0"/> - -+ -+ -+ - +-;../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 +--- 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.spec b/eclipse.spec index b8bdf64..2c6f792 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -69,7 +69,7 @@ fi; Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_version} -Release: 12%{?dist} +Release: 13%{?dist} License: EPL Group: Development/Tools URL: http://www.eclipse.org/ @@ -258,7 +258,7 @@ BuildRequires: glassfish-jsp-api >= 2.2.1-4 BuildRequires: cglib BuildRequires: glassfish-jsp >= 2.2.6 %if %{bootstrap} != 1 - BuildRequires: eclipse-pde +BuildRequires: eclipse-pde %endif %if 0%{?rhel} >= 6 ExclusiveArch: %{ix86} x86_64 @@ -414,9 +414,7 @@ tar --strip-components=1 -xf %{SOURCE1} %patch25 %patch26 %patch27 -%if %{bootstrap} != 1 - %patch28 -%endif +%patch28 %patch29 %patch30 %patch31 @@ -537,7 +535,7 @@ mkdir -p rt.equinox.framework/bundles/org.eclipse.equinox.executable/bin/gtk/lin %build -export MAVEN_OPTS=-Xmx2048m +export MAVEN_OPTS=-Xmx640m mkdir -p .m2/p2/repo-sdk/plugins mkdir -p .m2/p2/repo-sdk/features @@ -639,32 +637,14 @@ mvn-rpmbuild -f maven-cbi-plugin/pom.xml \ -Dmaven.local.mode=true -Dtycho.local.keepTarget -DskipTychoVersionCheck # workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=386377 -# pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable +pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/ + ant build_eclipse_cbi +popd + mvn-rpmbuild clean install \ -Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} -DskipTychoVersionCheck \ - -Dmaven.local.mode=true -Dtycho.local.keepTarget -# popd + -Dmaven.local.mode=true -Dtycho.local.keepTarget -Dbuilddoc=$((%{bootstrap} != 1)) -%if %{bootstrap} != 1 -pushd eclipse.platform.common/bundles/org.eclipse.platform.doc.user - mvn-rpmbuild install -Dmaven.test.skip=true -Dmaven.local.mode=true -DskipTychoVersionCheck -popd -pushd eclipse.platform.common/bundles/org.eclipse.platform.doc.isv - mvn-rpmbuild install -Dmaven.test.skip=true -Dmaven.local.mode=true -DskipTychoVersionCheck -popd -pushd eclipse.platform.common/bundles/org.eclipse.jdt.doc.user - mvn-rpmbuild install -Dmaven.test.skip=true -Dmaven.local.mode=true -DskipTychoVersionCheck -popd -pushd eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv - mvn-rpmbuild install -Dmaven.test.skip=true -Dmaven.local.mode=true -DskipTychoVersionCheck -popd -pushd eclipse.platform.common/bundles/org.eclipse.pde.doc.user - mvn-rpmbuild install -Dmaven.test.skip=true -Dmaven.local.mode=true -DskipTychoVersionCheck -popd -%endif -mvn-rpmbuild clean install \ - -Dmaven.test.skip=true -Dnative=linux.gtk.%{eclipse_arch} -DskipTychoVersionCheck \ - -Dmaven.local.mode=true -Dtycho.local.keepTarget pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch} @@ -1375,6 +1355,11 @@ rm -rf %{_bindir}/efj/ %{_mavendepmapfragdir}/%{name}-equinox-osgi %changelog +* Mon Nov 5 2012 Krzysztof Daniel 1:4.2.1-13 +- Reduce the memory available for Tycho build. +- Reduce the build time. +- Use the upstream help generation patch. + * Wed Oct 31 2012 Krzysztof Daniel 1:4.2.1-12 - Remove the reference to org.apache.jasper (replaced by glassfish)