Skip to content

Commit

Permalink
[eclipsesetup] Added option for 2.5.x (#1058)
Browse files Browse the repository at this point in the history
- Added branch 2.5.x as first installation option to all projects except bacnet and core
- Added label 3.0 to branch selection master to make clear it's for 3.0 development. When 2.5.x is removed this can be changed back.

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
  • Loading branch information
Hilbrand authored and kaikreuzer committed Jan 12, 2020
1 parent 73947ca commit be5ba33
Showing 1 changed file with 17 additions and 7 deletions.
24 changes: 17 additions & 7 deletions launch/openHAB2.setup
Original file line number Diff line number Diff line change
Expand Up @@ -2391,9 +2391,11 @@
rootFolder="${git.clone.openhab-distro.location/launch}"
locateNestedProjects="true"/>
</setupTask>
<stream
name="2.5.x"/>
<stream
name="master"
label=""/>
label="3.0"/>
</project>
<project name="2_addons2"
label="openHAB Add-ons">
Expand Down Expand Up @@ -2425,11 +2427,13 @@
<sourceLocator
rootFolder="${git.clone.openhab-addons.location/bundles}"
locateNestedProjects="true">
<excludedPath>ui/org.openhab.ui.cometvisu.php</excludedPath>
</sourceLocator>
</setupTask>
<stream
name="master"/>
name="2.5.x"/>
<stream
name="master"
label="3.0"/>
</project>
<project name="4_zigbee"
label="openHAB ZigBee Binding">
Expand All @@ -2456,9 +2460,11 @@
rootFolder="${git.clone.zigbeebinding.location}"
locateNestedProjects="true"/>
</setupTask>
<stream
name="2.5.x"/>
<stream
name="master"
label=""/>
label="3.0"/>
</project>
<project name="5_zwave"
label="openHAB Z-Wave Binding">
Expand All @@ -2484,9 +2490,11 @@
<sourceLocator
rootFolder="${git.clone.zwavebinding.location}"/>
</setupTask>
<stream
name="2.5.x"/>
<stream
name="master"
label=""/>
label="3.0"/>
</project>
<project name="6_bacnet"
label="openHAB BACNet Binding">
Expand Down Expand Up @@ -2540,9 +2548,11 @@
<sourceLocator
rootFolder="${git.clone.webui.location}"/>
</setupTask>
<stream
name="2.5.x"/>
<stream
name="master"
label=""/>
label="3.0"/>
</project>
<project name="10_core"
label="openHAB Core Framework">
Expand Down Expand Up @@ -2607,7 +2617,7 @@
encoding="UTF-8"/>
<stream
name="master"
label=""/>
label="3.0"/>
</project>
<logicalProjectContainer
xsi:type="setup:ProjectCatalog"
Expand Down

0 comments on commit be5ba33

Please sign in to comment.