update landing page

Signed-off-by: Peter Kirschner <[email protected]>
bndtools · Oct 22, 2024 · d32ab44 · d32ab44
1 parent 5a1cda5
commit d32ab44
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 50 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .tags.list
 .download/
-.oomph/
+.oomph/
+.DS_Store
diff --git a/doc/dev_macosx.md b/doc/dev_macosx.md
@@ -10,19 +10,23 @@ vmargs="-vmargs -Duser.home=$(pwd)/.oomph/user.home -Doomph.setup.user.home.redi
 
 # bnd next on master
 "/Applications/Eclipse Installer.app/Contents/MacOS/eclipse-inst" \
-    file:///$(pwd)/setup/config_ecl-latest_bnd-next_on_master.setup ${vmargs}
+    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}
+    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}
+    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_ecl-latest_bnd-release_on_next.setup ${vmargs}
+    file:///$(pwd)/setup/config_ecl-latest_bnd-release_on_next.setup ${vmargs} &
+
+# bndtools.p2.repo
+"/Applications/Eclipse Installer.app/Contents/MacOS/eclipse-inst" \
+    file:///$(pwd)/setup/config_bndtools.p2.repo.setup ${vmargs} &
 
 ```
 

diff --git a/setup/config_bndtools.p2.repo.setup b/setup/config_bndtools.p2.repo.setup
@@ -35,8 +35,6 @@
           value="https://bndtools.jfrog.io/bndtools/update-snapshot"
           label="snapshot (JFrog)"/>
     </setupTask>
-    <stream
-        href="prj-bnd.setup#//@streams[name='master']"/>
     <stream
         href="prj-bndtools.p2.repo.setup#//@streams[name='master']"/>
     <description>The bnd workspace provides cool stuff.</description>

diff --git a/setup/prj-bndtools.p2.repo.setup b/setup/prj-bndtools.p2.repo.setup
@@ -9,8 +9,8 @@
     xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
     xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
     xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/projects/1.0 index:/models/Projects.ecore"
-    name="bndtools"
-    label="bndtools/bnd">
+    name="bndtools.p2.repo"
+    label="bndtools/bndtools.p2.repo">
   <annotation
       source="ConfigurationReference">
     <reference
@@ -93,7 +93,7 @@
         xsi:type="setup:ResourceCreationTask"
         targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs">
       <content>
-        WORKSPACE_NAME=bnd-${scope.project.stream.label}
+        WORKSPACE_NAME=bndtools.p2.repo-${scope.project.stream.label}
         org.eclipse.ui.internal.views.markers.CachedMarkerBuilderorg.eclipse.ui.views.ProblemView=&lt;?xml version\=&quot;1.0&quot; encoding\=&quot;UTF-8&quot;?>\n&lt;filterGroups andFilters\=&quot;false&quot; markerLimit\=&quot;250&quot; markerLimitEnabled\=&quot;true&quot;>\n&lt;filterGroup IMemento.internal.id\=&quot;org.eclipse.ui.ide.projectErrorsWarningsGrouping&quot; enabled\=&quot;true&quot; filterLimit\=&quot;-1&quot; scope\=&quot;3&quot;>\n&lt;fieldFilter IMemento.internal.id\=&quot;org.eclipse.ui.ide.severityAndDescriptionField&quot; containsModifier\=&quot;CONTAINS&quot; containsText\=&quot;&quot; selectedSeverities\=&quot;6&quot;/>\n&lt;fieldFilter IMemento.internal.id\=&quot;org.eclipse.ui.ide.markerType&quot;/>\n&lt;/filterGroup>\n&lt;filterGroup IMemento.internal.id\=&quot;org.eclipse.ui.ide.selectedErrorsWarningsGrouping&quot; enabled\=&quot;false&quot; filterLimit\=&quot;-1&quot; scope\=&quot;2&quot;>\n&lt;fieldFilter IMemento.internal.id\=&quot;org.eclipse.ui.ide.severityAndDescriptionField&quot; containsModifier\=&quot;CONTAINS&quot; containsText\=&quot;&quot; selectedSeverities\=&quot;6&quot;/>\n&lt;fieldFilter IMemento.internal.id\=&quot;org.eclipse.ui.ide.markerType&quot;/>\n&lt;/filterGroup>\n&lt;filterGroup IMemento.internal.id\=&quot;org.eclipse.ui.ide.selectedWarningsGrouping&quot; enabled\=&quot;false&quot; filterLimit\=&quot;-1&quot; scope\=&quot;2&quot;>\n&lt;fieldFilter IMemento.internal.id\=&quot;org.eclipse.ui.ide.severityAndDescriptionField&quot; containsModifier\=&quot;CONTAINS&quot; containsText\=&quot;&quot; selectedSeverities\=&quot;2&quot;/>\n&lt;fieldFilter IMemento.internal.id\=&quot;org.eclipse.ui.ide.markerType&quot;/>\n&lt;/filterGroup>\n&lt;filterGroup IMemento.internal.id\=&quot;org.eclipse.ui.ide.errorsFilter&quot; enabled\=&quot;false&quot; filterLimit\=&quot;-1&quot; scope\=&quot;0&quot;>\n&lt;fieldFilter IMemento.internal.id\=&quot;org.eclipse.ui.ide.severityAndDescriptionField&quot; containsModifier\=&quot;CONTAINS&quot; containsText\=&quot;&quot; selectedSeverities\=&quot;4&quot;/>\n&lt;fieldFilter IMemento.internal.id\=&quot;org.eclipse.ui.ide.markerType&quot;/>\n&lt;/filterGroup>\n&lt;/filterGroups>
 
       </content>
@@ -166,15 +166,6 @@
     <setupTask
         xsi:type="setup:CompoundTask"
         name="JRE">
-      <setupTask
-          xsi:type="setup.p2:P2Task"
-          label="JRE17">
-        <requirement
-            name="a.jre.org.eclipse.justj.openjdk.hotspot.jre.full"
-            versionRange="[17.0.0,17.0.0]"/>
-        <repository
-            url="https://download.eclipse.org/justj/jres/17/updates/release"/>
-      </setupTask>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="JRE21">

diff --git a/site/index.html b/site/index.html
@@ -47,50 +47,88 @@
     <h1>bndtools - oomph - setups</h1>
 
     <p>Select eclipse and bndtools version (release/snapshot). </br>
-        Depending on your selection you will get the latest stable eclipse version with bndtools plugin in released or
-        the snapshot version</p>
 
-    <h2>released bndtools for bugfixing of latest released bndtools sources</h2>
-    <div><a
-            href="eclipse+installer:https://raw.githubusercontent.com/bndtools/bndtools.p2.repo/master/setup/config_ecl-latest_bnd-release_on_master.setup">
-            <img src="https://img.shields.io/static/v1?logo=eclipseide&label=eclipse%20%2B%20bndtools%20release&message=bndtools%20:%20master&style=for-the-badge&logoColor=white&labelColor=963508&color=gray"
-                alt="eclipse + bnd release on bndtools next" /></a>
-    </div>
+    <table class="table">
+        <thead>
+            <tr>
+                <th scope="col">PURPOSE</th>
+                <th scope="col">ECLIPSE VERSION</th>
+                <th scope="col">BNDTOOLS VERSION</th>
+                <th scope="col">SOURCE BRANCH</th>
+                <th scope="col">OOMPH LINK</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <th scope="row">bugfix release</th>
+                <td>latest</td>
+                <td>Rel 7.0.0</td>
+                <td>master</td>
+                <td><a
+                        href="eclipse+installer:https://raw.githubusercontent.com/bndtools/bndtools.p2.repo/master/setup/config_ecl-latest_bnd-release_on_master.setup">
+                        <img src="https://img.shields.io/static/v1?logo=eclipseide&label=eclipse%20%2B%20bndtools%20release&message=bndtools%20:%20master&style=for-the-badge&logoColor=white&labelColor=963508&color=gray"
+                            alt="eclipse + bnd release on bndtools next" /></a>
+                </td>
+            </tr>
+            <tr>
+                <th scope="row">bugfix release</th>
+                <td>latest</td>
+                <td>latest SNAPSHOT</td>
+                <td>master</td>
+                <td><a
+                        href="eclipse+installer:https://raw.githubusercontent.com/bndtools/bndtools.p2.repo/master/setup/config_ecl-latest_bnd-next_on_master.setup">
+                        <img src="https://img.shields.io/static/v1?logo=eclipseide&label=eclipse%20%2B%20bndtools%20snapshot&message=bndtools%20:%20master&style=for-the-badge&logoColor=white&labelColor=orange&color=gray"
+                            alt="eclipse + bnd snapshot on bndtools next" /></a>
+                </td>
+            </tr>
+            <tr>
+                <th scope="row">feature dev</th>
+                <td>latest</td>
+                <td>Rel 7.0.0</td>
+                <td>next</td>
+                <td><a
+                        href="eclipse+installer:https://raw.githubusercontent.com/bndtools/bndtools.p2.repo/master/setup/config_ecl-latest_bnd-next_on_next.setup">
+                        <img src="https://img.shields.io/static/v1?logo=eclipseide&label=eclipse%20%2B%20bndtools%20snapshot&message=bndtools%20:%20next&style=for-the-badge&logoColor=white&labelColor=963508&color=lightgray"
+                            alt="eclipse + bnd snapshot on bndtools next" alt="latest eclipse - bnd master" /></a>
+                </td>
+            </tr>
+            <tr>
+                <th scope="row">feature dev</th>
+                <td>latest</td>
+                <td>SNAPSHOT</td>
+                <td>next</td>
+                <td><a
+                        href="eclipse+installer:https://raw.githubusercontent.com/bndtools/bndtools.p2.repo/master/setup/config_ecl-latest_bnd-next_on_next.setup">
+                        <img src="https://img.shields.io/static/v1?logo=eclipseide&label=eclipse%20%2B%20bndtools%20snapshot&message=bndtools%20:%20next&style=for-the-badge&logoColor=white&labelColor=orange&color=lightgray"
+                            alt="eclipse - bnd snapshot on branch next" /></a>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+
+
     <!-- Button to toggle the expandable section -->
-    <button class="toggle-btn" onclick="toggleContent()">display terminal instructions</button>
+    <!--
+            <button class="toggle-btn" onclick="toggleContent()">display terminal instructions</button>
     <div id="expandableContent">
         <small>
             <pre><code id="oomph">"/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</code></pre>
         </small>
         <button class="copy-btn" onclick="copyToClipboard('oomph')">copy oomph command</button>
     </div>
-
-    <h2>snapshot bndtools for bugfixing of latest released bndtools sources</h2>
-    <div><a
-            href="eclipse+installer:https://raw.githubusercontent.com/bndtools/bndtools.p2.repo/master/setup/config_ecl-latest_bnd-next_on_master.setup">
-            <img src="https://img.shields.io/static/v1?logo=eclipseide&label=eclipse%20%2B%20bndtools%20snapshot&message=bndtools%20:%20master&style=for-the-badge&logoColor=white&labelColor=orange&color=gray"
-                alt="eclipse + bnd snapshot on bndtools next" /></a>
-    </div>
-
-    <h2>released bndtools for snapshot development</h2>
-    <div><a
-            href="eclipse+installer:https://raw.githubusercontent.com/bndtools/bndtools.p2.repo/master/setup/config_ecl-latest_bnd-release_on_next.setup">
-            <img src="https://img.shields.io/static/v1?logo=eclipseide&label=eclipse%20%2B%20bndtools%20release&message=bndtools%20:%20next&style=for-the-badge&logoColor=white&labelColor=963508&color=lightgray"
-                alt="eclipse + bnd release on bndtools master" /></a>
-    </div>
-
-    <h2>snapshot bndtools for snapshot development</h2>
-    <div><a
-            href="eclipse+installer:https://raw.githubusercontent.com/bndtools/bndtools.p2.repo/master/setup/config_ecl-latest_bnd-next_on_next.setup">
-            <img src="https://img.shields.io/static/v1?logo=eclipseide&label=eclipse%20%2B%20bndtools%20snapshot&message=bndtools%20:%20next&style=for-the-badge&logoColor=white&labelColor=orange&color=lightgray"
-                alt="eclipse + bnd snapshot on bndtools next" alt="latest eclipse - bnd master" /></a>
-    </div>
-
+-->
     <h2>p2 repository</h2>
     <div>
         <a href="p2.html">provided repos</a>
     </div>
+
+    <h2>oomph config for this repo</h2>
+    <div>><a
+            href="eclipse+installer:https://raw.githubusercontent.com/bndtools/bndtools.p2.repo/master/setup/config_ecl-latest_bnd-next_on_next.setup">
+            <img src="https://img.shields.io/static/v1?logo=eclipseide&label=eclipse%20%2B%20bndtools.p2.repo&message=branch%20:%20master&style=for-the-badge&logoColor=white&labelColor=orange&color=lightgray"
+                alt="eclipse on bndtools.p2.repo branch next" /></a>
+    </div>
     <!--[if lt IE 7]>
             <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="#">upgrade your browser</a> to improve your experience.</p>
         <![endif]-->