Skip to content

Commit bd506fa

Browse files
committed
4.4.2 2018-09
1 parent 7834a03 commit bd506fa

File tree

4 files changed

+43
-8
lines changed

4 files changed

+43
-8
lines changed

README.md

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1-
The EPP Build
2-
=============
1+
The EPP Build with GNU MCU Eclipse plug-ins
2+
==========================================
3+
4+
The GNU MCU Eclipse EPP project
5+
-------------------------------
6+
7+
The [GNU MCU Eclipse EPP](https://github.com/gnu-mcu-eclipse/org.eclipse.epp.packages) project is a fork of the original Eclipse EPP project that adds the [GNU MCU Eclipse](https://github.com/gnu-mcu-eclipse) plug-ins and intentionally **does not** go into further customisations, so that installing these binary packages is equivalent to installing the original Eclipse distribution followed by adding new software from the GNU MCU Eclipse update site.
8+
9+
The GNU MCU Eclipse binaries are available from the [GitHub Releases](https://github.com/gnu-mcu-eclipse/org.eclipse.epp.packages/releases); the release schedule generally follows the Eclipse release schedule.
10+
11+
The original Eclipse EPP project
12+
--------------------------------
313

414
The [Eclipse Packaging Project (EPP)](http://www.eclipse.org/epp/) provides
515
the download packages based on the content of the yearly Simultaneous Release.
@@ -11,9 +21,10 @@ Build a Package Locally
1121

1222
It's *easy* to run the build locally! All you need is Maven and then you need
1323
to tell Maven which package(s) to build via profile. As an example, the following
14-
command from the root of the Git repository builds the RCP/RAP package against
24+
command from the root of the Git repository builds the CPP, RCP/RAP package against
1525
the Simultaneous Release staging p2 repository:
1626

27+
mvn clean verify -Pepp.package.ccp
1728
mvn clean verify -Pepp.package.rcp
1829

1930
This build creates output in two places:
@@ -31,6 +42,7 @@ details see [bug 426416](https://bugs.eclipse.org/bugs/show_bug.cgi?id=426416).
3142
At the moment it is advised to run the build command on Windows with `package`
3243
only:
3344

45+
mvn clean package -Pepp.package.ccp
3446
mvn clean package -Pepp.package.rcp
3547

3648
In addition to that it is not possible to create zip and tar.gz archives on
@@ -80,3 +92,13 @@ following argument to the Maven command line, the EPP build will read its input
8092
composite Eclipse 2018-09 repository:
8193

8294
-Declipse.simultaneous.release.repository="http://download.eclipse.org/releases/2018-09"
95+
96+
Changes from Eclipse version
97+
----------------------------
98+
99+
- a `gnumcueclipse` branch was added
100+
- the URL of the GNU MCU Eclipse update site was added to the list of repositories
101+
- epp.product: the list of GNU MCU Eclipse features was added to the list of included features
102+
- the baseUri bug affecting builds on machines with spaces in folder names was fixed
103+
- the name of the generated archive was changed to include `gnumcueclipse`
104+
- the top README.md (this file) was slightly edited

packages/org.eclipse.epp.package.cpp/plugin.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</property>
1919
<property
2020
name="aboutText"
21-
value="Eclipse IDE for C/C++ Developers&#x0A;&#x0A;Version: {1}&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2018. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. The Eclipse logo cannot be altered without Eclipse's permission. Eclipse logos are provided for use under the Eclipse logo and trademark guidelines, https://www.eclipse.org/logotm/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.&#x0A;&#x0A;This product includes software developed by other open source projects including the Apache Software Foundation, https://www.apache.org/.&#x0A;">
21+
value="Eclipse IDE for GNU ARM &amp; RISC-V C/C++ Developers&#x0A;&#x0A;Version: {1}&#x0A;Build id: {0}&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2018. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. The Eclipse logo cannot be altered without Eclipse's permission. Eclipse logos are provided for use under the Eclipse logo and trademark guidelines, https://www.eclipse.org/logotm/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.&#x0A;&#x0A;This product includes software developed by other open source projects including the Apache Software Foundation, https://www.apache.org/.&#x0A;">
2222
</property>
2323
<property
2424
name="startupForegroundColor"
@@ -46,7 +46,7 @@
4646
</property>
4747
<property
4848
name="introTitle"
49-
value="Welcome to the Eclipse IDE for C/C++ Developers">
49+
value="Welcome to the Eclipse IDE for GNU ARM &amp; RISC-V C/C++ Developers">
5050
</property>
5151
<property
5252
name="introBrandingImageText"

releng/org.eclipse.epp.config/parent/pom.xml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@
4444
<eclipse.simultaneous.release.name>2018-09 (4.9.0)</eclipse.simultaneous.release.name>
4545
<!-- Upstream p2 repository, used as a source for pre-compiled build artifacts -->
4646
<eclipse.simultaneous.release.repository>http://download.eclipse.org/staging/2018-09/</eclipse.simultaneous.release.repository>
47+
48+
<!-- <gnumcueclipse.repository>http://gnu-mcu-eclipse.netlify.com/v4-neon-updates-test</gnumcueclipse.repository> -->
49+
<gnumcueclipse.repository>http://gnu-mcu-eclipse.netlify.com/v4-neon-updates</gnumcueclipse.repository>
50+
<gnumcueclipse.version>4.4.2</gnumcueclipse.version>
4751
</properties>
4852

4953
<!--
@@ -78,6 +82,11 @@
7882
<url>http://download.eclipse.org/cbi/updates/license/</url>
7983
<layout>p2</layout>
8084
</repository>
85+
<repository>
86+
<id>gnu-mcu-eclipse</id>
87+
<layout>p2</layout>
88+
<url>${gnumcueclipse.repository}</url>
89+
</repository>
8190
</repositories>
8291

8392
<build>
@@ -363,17 +372,20 @@
363372
<rootFolders>
364373
<macosx>Eclipse.app</macosx>
365374
</rootFolders>
366-
<archiveFileName>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</archiveFileName>
375+
<!-- <archiveFileName>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</archiveFileName> -->
376+
<archiveFileName>${build}-gnumcueclipse-${gnumcueclipse.version}-${eclipse.simultaneous.release.id}</archiveFileName>
367377
</product>
368378
</products>
369379
<profile>${project.artifactId}</profile>
370380
</configuration>
371381
</plugin>
382+
<!--
372383
<plugin>
373384
<groupId>org.eclipse.cbi.maven.plugins</groupId>
374385
<artifactId>eclipse-dmg-packager</artifactId>
375386
<version>${cbi.version}</version>
376387
</plugin>
388+
-->
377389
<plugin>
378390
<groupId>org.apache.maven.plugins</groupId>
379391
<artifactId>maven-antrun-plugin</artifactId>
@@ -387,7 +399,7 @@
387399
<copy todir="${basedir}/../../archive">
388400
<fileset dir="${project.build.directory}/products">
389401
<include name="*.zip" />
390-
<include name="*linux*.tar.gz" />
402+
<include name="*.tar.gz" />
391403
<include name="*.dmg" />
392404
</fileset>
393405
</copy>

releng/org.eclipse.epp.config/parent/product/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
<artifactId>tycho-p2-director-plugin</artifactId>
8888
</plugin>
8989

90+
<!--
9091
<plugin>
9192
<groupId>org.eclipse.cbi.maven.plugins</groupId>
9293
<artifactId>eclipse-dmg-packager</artifactId>
@@ -104,7 +105,7 @@
104105
</execution>
105106
</executions>
106107
</plugin>
107-
108+
-->
108109
<plugin>
109110
<groupId>org.apache.maven.plugins</groupId>
110111
<artifactId>maven-antrun-plugin</artifactId>

0 commit comments

Comments
 (0)