[FIXUP]

HannesWell · Jan 26, 2025 · 6e0d024 · 6e0d024
1 parent 75975ed
commit 6e0d024
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 21 deletions.
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -19,5 +19,4 @@ jobs:
     with:
       botName: Eclipse Equinox Bot
       botMail: equinox-bot@eclipse.org
-      extra-setup-command: 'git clone --depth 1 https://github.com/eclipse-equinox/equinox.binaries.git binaries'
-      extra-maven-args: '-Dequinox.binaries.loc=$(pwd)/binaries'
+      extra-maven-args: '-Dequinox.binaries.loc=$(pwd)/binaries -Pfetch-natives'
diff --git a/launcher-binary-parent/pom.xml b/launcher-binary-parent/pom.xml
@@ -134,24 +134,6 @@
                 </configuration>
               </execution>
             </executions>
-            <dependencies>
-              <dependency>
-                <groupId>org.apache.ant</groupId>
-                <artifactId>ant</artifactId>
-                <version>1.10.14</version>
-              </dependency>
-              <dependency>
-                <groupId>ant-contrib</groupId>
-                <artifactId>ant-contrib</artifactId>
-                <version>1.0b3</version>
-                <exclusions>
-                  <exclusion>
-                    <groupId>ant</groupId>
-                    <artifactId>ant</artifactId>
-                  </exclusion>
-                </exclusions>
-              </dependency>
-            </dependencies>
           </plugin>
         </plugins>
       </build>

diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,8 @@
   <packaging>pom</packaging>
 
   <properties>
-    <tycho.scmUrl>scm:git:https://github.com/eclipse-equinox/equinox.git</tycho.scmUrl>
+    <scm.url>https://github.com/eclipse-equinox/equinox</scm.url>
+    <tycho.scmUrl>scm:git:${scm.url}.git</tycho.scmUrl>
     <!-- location of equinox.binaries project -->
     <!-- required by: org.eclipse.equinox.feature:org.eclipse.equinox.executable -->
     <!-- required by: org.eclipse.equinox.framework:launcher-binary-parent -->
@@ -229,6 +230,45 @@
 		    <module>bundles/org.eclipse.osgi.tests</module>
         </modules>
     </profile>
+    <profile>
+      <id>fetch-natives</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>fetch-absent-launcher-natives</id>
+                <phase>generate-resources</phase>
+                <goals>
+                   <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+                    <!-- See https://stackoverflow.com/a/53227117 and http://ant-contrib.sourceforge.net/tasks/tasks/index.html -->
+                    <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+                    <if>
+                      <not><resourceexists><file file="${equinox.binaries.loc}"/></resourceexists></not>
+                      <then>
+                        <exec executable="git">
+                          <arg line="clone --depth 1"/>
+                          <arg value="${scm.url}.binaries.git"/>
+                          <arg path="${equinox.binaries.loc}"/>
+                        </exec>
+                      </then>
+                      <else>
+                        <echo message="Skipping as Equinox-binaries git-repository already exists at: ${equinox.binaries.loc}"/>
+                      </else>
+                    </if>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 
   <build>
@@ -275,6 +315,28 @@
             </dependency-resolution>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.ant</groupId>
+              <artifactId>ant</artifactId>
+              <version>1.10.14</version>
+            </dependency>
+            <dependency>
+              <groupId>ant-contrib</groupId>
+              <artifactId>ant-contrib</artifactId>
+              <version>1.0b3</version>
+              <exclusions>
+                <exclusion>
+                  <groupId>ant</groupId>
+                  <artifactId>ant</artifactId>
+                </exclusion>
+              </exclusions>
+            </dependency>
+          </dependencies>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>