Use the new build-help-index mojo instead of ant calls

eclipse-platform · Apr 19, 2023 · 845d94b · 845d94b
1 parent 83885f0
commit 845d94b
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 364 deletions.
diff --git a/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml b/bundles/org.eclipse.jdt.doc.isv/buildDoc.xml
@@ -12,13 +12,6 @@
 	<target name="all" depends="init" unless="index.present">
 		<antcall target="convertSchemaToHtml" />
 		<antcall target="generateJavadoc" />
-		<antcall target="build.index" />
-		<!--antcall target="createDocZip" /-->
-	</target>
-
-
-	<target name="build.index" description="Builds search index for the plug-in: org.eclipse.jdt.doc.isv" if="eclipse.running">
-		<help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>
 	</target>
 
 	<target name="convertSchemaToHtml" if="eclipse.running">

diff --git a/bundles/org.eclipse.jdt.doc.isv/pom.xml b/bundles/org.eclipse.jdt.doc.isv/pom.xml
@@ -190,6 +190,10 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+			<groupId>org.eclipse.tycho.extras</groupId>
+			<artifactId>tycho-document-bundle-plugin</artifactId>
+          </plugin>
         </plugins>
       </build>
     </profile>

diff --git a/bundles/org.eclipse.jdt.doc.user/build.xml b/bundles/org.eclipse.jdt.doc.user/build.xml
diff --git a/bundles/org.eclipse.jdt.doc.user/pom.xml b/bundles/org.eclipse.jdt.doc.user/pom.xml
@@ -34,48 +34,8 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>org.eclipse.tycho.extras</groupId>
-            <artifactId>tycho-eclipserun-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>dont_skip_me</id>
-                <phase>compile</phase>
-                <configuration>
-                  <skip>false</skip>
-                  <applicationsArgs>
-	                  <args>-consolelog</args>
-	                  <args>-debug</args>
-	                  <args>-application</args>
-	                  <args>org.eclipse.ant.core.antRunner</args>
-	                  <args>-quiet</args>
-	                  <args>-buildfile</args>
-	                  <args>build.xml</args>
-	                  <args>build.index</args>
-                  </applicationsArgs>
-                  <dependencies>
-                    <dependency>
-                      <artifactId>org.eclipse.osgi.compatibility.state</artifactId>
-                      <type>eclipse-plugin</type>
-                    </dependency>
-                    <dependency>
-                      <artifactId>org.eclipse.ant.core</artifactId>
-                      <type>eclipse-plugin</type>
-                    </dependency>
-                    <dependency>
-                      <artifactId>org.apache.ant</artifactId>
-                      <type>eclipse-plugin</type>
-                    </dependency>
-                    <dependency>
-                      <artifactId>org.eclipse.help.base</artifactId>
-                      <type>eclipse-plugin</type>
-                    </dependency>
-                  </dependencies>
-                </configuration>
-                <goals>
-                  <goal>eclipse-run</goal>
-                </goals>
-              </execution>
-            </executions>
+			<groupId>org.eclipse.tycho.extras</groupId>
+			<artifactId>tycho-document-bundle-plugin</artifactId>
           </plugin>
         </plugins>
       </build>

diff --git a/bundles/org.eclipse.pde.doc.user/buildDoc.xml b/bundles/org.eclipse.pde.doc.user/buildDoc.xml
@@ -23,12 +23,6 @@
 	<target name="all" depends="init" unless="index.present">
 		<antcall target="convertSchemaToHtml" />
 		<antcall target="generateJavadoc" />
-		<antcall target="build.index" />
-		<!--antcall target="createDocZip" /-->
-	</target>
-
-	<target name="build.index" description="Builds search index for the plug-in: org.eclipse.pde.doc.user." if="eclipse.running">
-		<help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>
 	</target>
 
 	<target name="convertSchemaToHtml" if="eclipse.running">

diff --git a/bundles/org.eclipse.pde.doc.user/pom.xml b/bundles/org.eclipse.pde.doc.user/pom.xml
@@ -154,6 +154,10 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+			<groupId>org.eclipse.tycho.extras</groupId>
+			<artifactId>tycho-document-bundle-plugin</artifactId>
+          </plugin>
         </plugins>
       </build>
     </profile>

diff --git a/bundles/org.eclipse.platform.doc.isv/buildDoc.xml b/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
@@ -13,13 +13,6 @@
 		<antcall target="convertSchemaToHtml" />
 		<antcall target="examplesDocCopy" />
 		<antcall target="generateJavadoc" />
-		<antcall target="build.index" />
-		<!--antcall target="createDocZip" /-->
-	</target>
-
-
-	<target name="build.index" description="Builds search index for the plug-in: org.eclipse.platform.doc.isv" if="eclipse.running">
-		<help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>
 	</target>
 
 	<target name="convertSchemaToHtml" if="eclipse.running">

diff --git a/bundles/org.eclipse.platform.doc.isv/pom.xml b/bundles/org.eclipse.platform.doc.isv/pom.xml
@@ -354,6 +354,10 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+			<groupId>org.eclipse.tycho.extras</groupId>
+			<artifactId>tycho-document-bundle-plugin</artifactId>
+          </plugin>
         </plugins>
       </build>
     </profile>

diff --git a/bundles/org.eclipse.platform.doc.user/build.properties b/bundles/org.eclipse.platform.doc.user/build.properties
@@ -8,14 +8,10 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-customBuildCallbacks=customBuildCallbacks.xml
-
-
 bin.includes = META-INF/,\
                plugin.properties,\
                *.xml, *.html,book.css,concepts/, gettingStarted/, images/,\
                reference/, tasks/, tips/, whatsNew/, index*/
 
 
-bin.excludes = build.properties,\
-			   customBuildCallbacks.xml
+bin.excludes = build.properties
diff --git a/bundles/org.eclipse.platform.doc.user/customBuildCallbacks.xml b/bundles/org.eclipse.platform.doc.user/customBuildCallbacks.xml