add oomph for bndtools.p2.repo

bndtools · Oct 21, 2024 · aa6a767 · aa6a767
1 parent 3cc30f8
commit aa6a767
Show file tree

Hide file tree

Showing 5 changed files with 407 additions and 28 deletions.
diff --git a/doc/dev_macosx.md b/doc/dev_macosx.md
@@ -1,8 +1,29 @@
 # bndtools.p2.repo
 
 ```bash
+##################################
+# testing with local file urls
+##################################
+
+# https://wiki.eclipse.org/Eclipse_Oomph_Authoring#Testing_a_Setup_in_a_Clean_Environment
+vmargs="-vmargs -Duser.home=$(pwd)/.oomph/user.home -Doomph.setup.user.home.redirect=true"
+
+# bnd next on master
+"/Applications/Eclipse Installer.app/Contents/MacOS/eclipse-inst" \
+    file:///$(pwd)/setup/config_ecl-latest_bnd-next_on_master.setup ${vmargs}
+
+# bnd next on next
+"/Applications/Eclipse Installer.app/Contents/MacOS/eclipse-inst" \
+    file:///$(pwd)/setup/config_ecl-latest_bnd-next_on_next.setup ${vmargs}
+
+# bnd release on master
+"/Applications/Eclipse Installer.app/Contents/MacOS/eclipse-inst" \
+    file:///$(pwd)/setup/config_ecl-latest_bnd-release_on_master.setup ${vmargs}
+
+# bnd release on next
 "/Applications/Eclipse Installer.app/Contents/MacOS/eclipse-inst" \
-    file:///$(pwd)/setup/config_bnd-master_ecl-latest.setup
+    file:///$(pwd)/setup/config_ecl-latest_bnd-release_on_next.setup ${vmargs}
+
 ```
 
 https://www.eclipse.org/setups/installer/?url=https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/configurations/OomphConfiguration.setup&show=true
@@ -11,15 +32,23 @@ https://shields.io/badges/static-badge
 
 
 ```bash
+##############################
+# launch with github setups
+##############################
+
+# bnd next on master
 "/Applications/Eclipse Installer.app/Contents/MacOS/eclipse-inst" \
     https://raw.githubusercontent.com/bndtools/bndtools.p2.repo/master/setup/config_ecl-latest_bnd-next_on_master.setup
 
+# bnd next on next
 "/Applications/Eclipse Installer.app/Contents/MacOS/eclipse-inst" \
     https://raw.githubusercontent.com/bndtools/bndtools.p2.repo/master/setup/config_ecl-latest_bnd-next_on_next.setup
 
+# bnd release on master
 "/Applications/Eclipse Installer.app/Contents/MacOS/eclipse-inst" \
     https://raw.githubusercontent.com/bndtools/bndtools.p2.repo/master/setup/config_ecl-latest_bnd-release_on_master.setup
 
+# bnd release on next
 "/Applications/Eclipse Installer.app/Contents/MacOS/eclipse-inst" \
     https://raw.githubusercontent.com/bndtools/bndtools.p2.repo/master/setup/config_ecl-latest_bnd-release_on_next.setup
 

diff --git a/setup/index.html b/setup/index.html
diff --git a/setup/prj-bnd.setup b/setup/prj-bnd.setup
@@ -43,8 +43,23 @@
   </setupTask>
   <setupTask
       xsi:type="git:GitCloneTask"
-      id="git.clone.bndtools"
-      remoteURI="https://github.com/bndtools/bndtools.p2.repo.git">
+      id="git.clone.bnd"
+      remoteURI="bndtools/bndtools.p2.repo">
+    <annotation
+        source="http://www.eclipse.org/oomph/setup/InducedChoices">
+      <detail
+          key="inherit">
+        <value>github.remoteURIs</value>
+      </detail>
+      <detail
+          key="label">
+        <value>${scope.project.label} Github repository</value>
+      </detail>
+      <detail
+          key="target">
+        <value>remoteURI</value>
+      </detail>
+    </annotation>
     <description>${scope.project.label}</description>
   </setupTask>
   <setupTask
@@ -126,7 +141,7 @@
         xsi:type="setup:EclipseIniTask"
         disabled="true"
         option="-Doomph.redirection.bndtools"
-        value="=https://raw.githubusercontent.com/bndtools/bnd/master/.../BndtoolsBnd.setup->${git.clone.bndtools.location|uri}/.../BndtoolsBnd.setup"
+        value="=https://raw.githubusercontent.com/bndtools/bnd/master/.../BndtoolsBnd.setup->${git.clone.bnd.location|uri}/.../BndtoolsBnd.setup"
         vm="true">
       <description>
         Set an Oomph redirection system property to redirect the logical location of this setup to its physical location in the Git clone.
@@ -181,7 +196,7 @@
     <setupTask
         xsi:type="projects:ProjectsImportTask">
       <sourceLocator
-          rootFolder="${git.clone.bndtools.location}"
+          rootFolder="${git.clone.bnd.location}"
           locateNestedProjects="true">
         <excludedPath>bndtools.test</excludedPath>
         <excludedPath>bndtools.core.test/resource</excludedPath>
@@ -226,7 +241,7 @@
         xsi:type="setup:EclipseIniTask"
         disabled="true"
         option="-Doomph.redirection.bndtools"
-        value="=https://raw.githubusercontent.com/bndtools/bnd/master/.../BndtoolsBnd.setup->${git.clone.bndtools.location|uri}/.../BndtoolsBnd.setup"
+        value="=https://raw.githubusercontent.com/bndtools/bnd/master/.../BndtoolsBnd.setup->${git.clone.bnd.location|uri}/.../BndtoolsBnd.setup"
         vm="true">
       <description>
         Set an Oomph redirection system property to redirect the logical location of this setup to its physical location in the Git clone.
@@ -281,7 +296,7 @@
     <setupTask
         xsi:type="projects:ProjectsImportTask">
       <sourceLocator
-          rootFolder="${git.clone.bndtools.location}"
+          rootFolder="${git.clone.bnd.location}"
           locateNestedProjects="true">
         <excludedPath>biz.aQute.bndlib.tests</excludedPath>
         <excludedPath>biz.aQute.repository</excludedPath>
@@ -293,7 +308,7 @@
     <setupTask
         xsi:type="maven:MavenImportTask">
       <sourceLocator
-          rootFolder="${git.clone.bndtools.location}/maven-plugins"/>
+          rootFolder="${git.clone.bnd.location}/maven-plugins"/>
     </setupTask>
     <setupTask
         xsi:type="setup:CompoundTask"