Move the copy of resources from ant to maven

ShahzaibIbrahim · Jan 12, 2024 · f725bb0 · f725bb0
1 parent 931ad78
commit f725bb0
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 60 deletions.
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/buildDoc.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
@@ -10,56 +10,9 @@
 	</target>
 
 	<target name="all" depends="init" unless="index.present">
-		<antcall target="convertSchemaToHtml" />
-		<antcall target="examplesDocCopy" />
 		<antcall target="generateJavadoc" />
 	</target>
 
-	<target name="convertSchemaToHtml" if="eclipse.running">
-		<property name="dest" value="reference/extension-points" />
-		<property name="platformSearchPath" value="${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.ua},${eclipse.platform.ui.bundles}" />
-		<property name="runtimeSearchPath" value="${rt.equinox.bundles.bundles},${rt.equinox.framework.bundles},${rt.equinox.p2.bundles}" />
-		<property name="searchPaths" value="${platformSearchPath},${runtimeSearchPath}" />
-
-		<record name="${basedir}/target/platformconvert.txt" loglevel="warn" action="start"/>
-		<!--copy extra files linked to by generated extension point doc-->
-		<copy file="${eclipse.platform.ua}/org.eclipse.ui.cheatsheets/schema/cheatSheetContentFileSpec.html" todir="${dest}"/>
-		<copy file="${eclipse.platform.ua}/org.eclipse.ui.cheatsheets/schema/cheatSheetContentFileSpec.exsd" todir="${dest}"/>
-		<copy file="${eclipse.platform.ua}/org.eclipse.ui.cheatsheets/schema/compositeContentFile.html" todir="${dest}"/>
-		<copy file="${eclipse.platform.ua}/org.eclipse.ui.cheatsheets/schema/compositeContentFile.exsd" todir="${dest}"/>
-		<!--copy extra HTML file linked to by generated extension point doc-->
-		<copy file="${eclipse.platform.ua}/org.eclipse.ui.intro/schema/introContentFileSpec.html" todir="${dest}"/>
-		<record name="${basedir}/target/platformconvert.txt" action="stop"/>
-	</target>
-
-	<target name="examplesDocCopy" >
-		<copy todir="samples">
-			<fileset dir="${eclipse.platform.team.examples}">
-				<include name="org.eclipse.compare.examples/doc-html/"/>
-				<include name="org.eclipse.compare.examples.xml/doc-html/"/>
-				<include name="org.eclipse.team.examples.filesystem/doc-html/"/>
-			</fileset>
-		</copy>
-		<copy todir="samples">
-			<fileset dir="${eclipse.platform.swt.examples}">
-				<include name="org.eclipse.swt.examples/doc-html/"/>
-				<include name="org.eclipse.swt.examples.views/doc-html/"/>
-				<include name="org.eclipse.swt.examples.launcher/doc-html/"/>
-				<include name="org.eclipse.swt.examples.ole.win32/doc-html/"/>
-			</fileset>
-		</copy>
-		<copy todir="samples">
-			<fileset dir="${eclipse.platform.ui.examples}">
-				<include name="org.eclipse.ui.examples.fieldassist/doc-html/"/>
-				<include name="org.eclipse.ui.examples.multipageeditor/doc-html/"/>
-				<include name="org.eclipse.ui.examples.propertysheet/doc-html/"/>
-				<include name="org.eclipse.ui.examples.readmetool/doc-html/"/>
-				<include name="org.eclipse.ui.examples.undo/doc-html/"/>
-				<include name="org.eclipse.ui.examples.javaeditor/doc-html/"/>
-			</fileset>
-		</copy>
-	</target>
-
 	<target name="getJavadocPath" depends="getEclipseJavadocPath" unless="javadocExecutable">
 		<!-- WARNING: Ant bug: The <available> task overrides an already set property! https://bugs.eclipse.org/431236#c12 -->
 		<available file="${java.home}/../bin/javadoc.exe" property="javadocExecutable" value="${java.home}/../bin/javadoc.exe"/>

diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
@@ -50,6 +50,28 @@
       </activation>
       <build>
         <plugins>
+		  <plugin>
+		    <artifactId>maven-clean-plugin</artifactId>
+		    <configuration>
+		      <filesets>
+		        <fileset>
+		          <directory>reference/api</directory>
+		        </fileset>
+		        <fileset>
+				    <directory>reference/extension-points</directory>
+				    <excludes>
+				      <exclude>index.html</exclude>
+				    </excludes>
+				  </fileset>
+				  <fileset>
+				    <directory>samples</directory>
+				    <excludes>
+				      <exclude>samples.html</exclude>
+				    </excludes>
+				  </fileset>
+		      </filesets>
+		    </configuration>
+		  </plugin>
           <plugin>
             <groupId>org.eclipse.tycho</groupId>
             <artifactId>target-platform-configuration</artifactId>
@@ -376,7 +398,84 @@
 						</configuration>
 					</execution>
 				</executions>
-			</plugin>
+		  </plugin>
+		  <plugin>
+	        <artifactId>maven-resources-plugin</artifactId>
+	        <executions>
+	          <execution>
+	            <id>copy-extension-resources</id>
+	            <phase>process-resources</phase>
+	            <goals>
+	              <goal>copy-resources</goal>
+	            </goals>
+	            <configuration>
+	              <outputDirectory>${basedir}/reference/extension-points</outputDirectory>
+	              <resources>          
+	                <resource>
+	                  <directory>${basedir}/${eclipse.platform.ua}/org.eclipse.ui.cheatsheets/schema/</directory>
+	                  <filtering>false</filtering>
+	                  	<includes>
+			                <include>cheatSheetContentFileSpec.html</include>
+			                <include>cheatSheetContentFileSpec.exsd</include>
+			                <include>compositeContentFile.html</include>
+			                <include>compositeContentFile.exsd</include>
+			                <include>org.eclipse.ui.intro/schema/introContentFileSpec.html</include>
+		            	</includes>
+	                </resource>
+	                <resource>
+	                  <directory>${basedir}/${eclipse.platform.ua}/org.eclipse.ui.intro/schema/</directory>
+	                  <filtering>false</filtering>
+	                  	<includes>
+			                <include>introContentFileSpec.html</include>
+		            	</includes>
+	                </resource>
+	              </resources>              
+	            </configuration>            
+	          </execution>
+	          <execution>
+	            <id>copy-example-resources</id>
+	            <phase>process-resources</phase>
+	            <goals>
+	              <goal>copy-resources</goal>
+	            </goals>
+	            <configuration>
+	              <outputDirectory>${basedir}/samples</outputDirectory>
+	              <resources>          
+	                <resource>
+	                  <directory>${basedir}/${eclipse.platform.team.examples}</directory>
+	                  <filtering>false</filtering>
+	                  	<includes>
+			                <include>org.eclipse.compare.examples/doc-html/*.*</include>
+			                <include>org.eclipse.compare.examples.xml/doc-html/*.*</include>
+			                <include>org.eclipse.team.examples.filesystem/doc-html/*.*</include>
+		            	</includes>
+	                </resource>
+	                <resource>
+	                  <directory>${basedir}/${eclipse.platform.swt.examples}</directory>
+	                  <filtering>false</filtering>
+	                  	<includes>
+			                <include>org.eclipse.swt.examples/doc-html/*.*</include>
+			                <include>org.eclipse.swt.examples.views/doc-html/*.*</include>
+			                <include>org.eclipse.swt.examples.launcher/doc-html/*.*</include>
+			                <include>org.eclipse.swt.examples.ole.win32/doc-html/*.*</include>
+		            	</includes>
+	                </resource>
+	                <resource>
+	                  <directory>${basedir}/${eclipse.platform.ui.examples}</directory>
+	                  <filtering>false</filtering>
+	                  	<includes>
+			                <include>org.eclipse.ui.examples.fieldassist/doc-html/*.*</include>
+			                <include>org.eclipse.ui.examples.multipageeditor/doc-html/*.*</include>
+			                <include>org.eclipse.ui.examples.propertysheet/doc-html/*.*</include>
+			                <include>org.eclipse.ui.examples.undo/doc-html/*.*</include>
+			                <include>org.eclipse.ui.examples.javaeditor/doc-html/*.*</include>
+		            	</includes>
+	                </resource>
+	              </resources>              
+	            </configuration>            
+	          </execution>
+	        </executions>
+	      </plugin>	
           <plugin>
             <groupId>org.eclipse.tycho.extras</groupId>
             <artifactId>tycho-eclipserun-plugin</artifactId>

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
@@ -36,7 +36,6 @@
        a better way?
     -->
     <platform.doc.isv.javadoc>../../eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/target/doc.bin.log</platform.doc.isv.javadoc>
-    <platform.doc.isv.schema>../../eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/target/platformconvert.txt</platform.doc.isv.schema>
   </properties>
 
   <!--

diff --git a/...se.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml b/...se.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml
@@ -24,11 +24,6 @@
       <outputDirectory>/eclipse-testing</outputDirectory>
       <destName>platform.doc.isv.javadoc.txt</destName>
     </file>
-    <file>
-      <source>${platform.doc.isv.schema}</source>
-      <outputDirectory>/eclipse-testing</outputDirectory>
-      <destName>platform.doc.isv.schema.txt</destName>
-    </file>
     <file>
       <source>${project.build.directory}/eclipse-junit-tests.zip</source>
       <outputDirectory>/eclipse-testing</outputDirectory>

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
@@ -51,11 +51,6 @@
       tofile="${buildDirectory}/compilelogs/platform.doc.isv.javadoc.txt"
       failonerror="false"
       quiet="true" />
-    <copy
-      file="${AGGR_DIR}/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/target/platformconvert.txt"
-      tofile="${buildDirectory}/compilelogs/platform.doc.isv.schema.txt"
-      failonerror="false"
-      quiet="true" />
     <copy
       file="${AGGR_DIR}/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/target/jdtconvert.txt"
       tofile="${buildDirectory}/compilelogs/jdt.doc.isv.schema.txt"

diff --git a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/test.xml b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/test.xml
@@ -232,7 +232,7 @@
 
       <property
         name="vmargs"
-        value="-DdownloadHost=${downloadHost} -DbuildId=${buildId} -DRELENGTEST.JAVADOC.URLS=${JAVADOC_OUTPUT_LOCATION}/platform.doc.isv.javadoc.txt,${JAVADOC_OUTPUT_LOCATION}/platform.doc.isv.schema.txt"  />
+        value="-DdownloadHost=${downloadHost} -DbuildId=${buildId} -DRELENGTEST.JAVADOC.URLS=${JAVADOC_OUTPUT_LOCATION}/platform.doc.isv.javadoc.txt"  />
     </ant>
   </target>