Skip to content

Commit

Permalink
Simplify/minimize the target platform
Browse files Browse the repository at this point in the history
This uses Oomph's latest improved target platform generator support.

Also ensure that the p2 update site is complete with regard to all of
BIRT's dependencies.
  • Loading branch information
merks committed Nov 20, 2023
1 parent f8f47f6 commit 96394b3
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 338 deletions.
2 changes: 1 addition & 1 deletion build/org.eclipse.birt.p2updatesite/birtdesigner.product
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<launcherArgs>
<programArgs>-product
org.eclipse.epp.package.reporting.product
org.eclipse.birt.designer
--launcher.defaultAction
openFile
-showsplash
Expand Down
2 changes: 1 addition & 1 deletion build/org.eclipse.birt.p2updatesite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<includeAllDependencies>false</includeAllDependencies>
<includeAllDependencies>true</includeAllDependencies>
</configuration>
</plugin>

Expand Down
69 changes: 0 additions & 69 deletions build/org.eclipse.birt.p2updatesite/site.xml

This file was deleted.

15 changes: 6 additions & 9 deletions build/org.eclipse.birt.releng/BIRT.setup
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@
</detail>
<detail
key="singleLocation">
<value>false</value>
<value>true</value>
</detail>
<detail
key="sortLocations">
Expand All @@ -412,7 +412,7 @@
</detail>
<detail
key="ignoreJavaRequirements">
<value>false</value>
<value>true</value>
</detail>
<detail
key="generateVersions">
Expand All @@ -424,6 +424,10 @@
</detail>
<detail
key="generateImplicitUnits">
<value>false</value>
</detail>
<detail
key="ignorePropertiesMatchRequirements">
<value>true</value>
</detail>
</annotation>
Expand Down Expand Up @@ -462,13 +466,6 @@
</setupTask>
<stream name="master"
label="Workspace setup for branch master">
<setupTask
xsi:type="setup:EclipseIniTask"
option="-Doomph.redirection.birt.old"
value="=https://raw.githubusercontent.com/eclipse/birt/master/build/org.eclipse.birt.releng/BIRT.setup->${git.clone.birt.location|uri}/build/org.eclipse.birt.releng/BIRT.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.</description>
</setupTask>
<setupTask
xsi:type="setup:EclipseIniTask"
option="-Doomph.redirection.birt"
Expand Down
Loading

0 comments on commit 96394b3

Please sign in to comment.