Skip to content

Commit

Permalink
Use submodule to include the equinox.binaries
Browse files Browse the repository at this point in the history
Currently the user needs to checkout two repositories side-by-side and
specify the location of it at the commandline to fully build equinox.

This includes the other repository as a submodule now to make it easier
for users/buildscripts as they can see the content of both repositories
as one linear directory structure.
  • Loading branch information
laeubi committed Jan 4, 2024
1 parent d52b39e commit 893d46f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "rt.equinox.binaries"]
path = rt.equinox.binaries
url = https://github.com/eclipse-equinox/equinox.binaries.git
9 changes: 1 addition & 8 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,14 @@ pipeline {
jdk 'temurin-jdk17-latest'
}
stages {
stage('get binaries') {
steps{
dir ('rt.equinox.binaries') {
checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption', timeout: 120]], submoduleCfg: [], userRemoteConfigs: [[url: 'https://github.com/eclipse-equinox/equinox.binaries.git']]])
}
}
}
stage('Build') {
steps {
sh 'git submodule update --init --recursive --remote'
sh """
mvn clean verify --batch-mode --fail-at-end -Dmaven.repo.local=$WORKSPACE/.m2/repository \
-Pbree-libs -Papi-check -Pjavadoc\
-Dcompare-version-with-baselines.skip=false \
-Dproject.build.sourceEncoding=UTF-8 \
-Drt.equinox.binaries.loc=$WORKSPACE/rt.equinox.binaries
"""
}
post {
Expand Down
3 changes: 3 additions & 0 deletions features/org.eclipse.equinox.executable.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@
<name>!longnotexistingproperty</name>
</property>
</activation>
<properties>
<rt.equinox.binaries.loc>${project.basedir}/../../rt.equinox.binaries</rt.equinox.binaries.loc>
</properties>
<build>
<plugins>
<plugin>
Expand Down
1 change: 1 addition & 0 deletions rt.equinox.binaries
Submodule rt.equinox.binaries added at e186a1

0 comments on commit 893d46f

Please sign in to comment.