Skip to content

Commit

Permalink
4.4.2 2018-09
Browse files Browse the repository at this point in the history
  • Loading branch information
ilg-ul committed Sep 30, 2018
1 parent 7834a03 commit bd506fa
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 8 deletions.
28 changes: 25 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
The EPP Build
=============
The EPP Build with GNU MCU Eclipse plug-ins
==========================================

The GNU MCU Eclipse EPP project
-------------------------------

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.

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.

The original Eclipse EPP project
--------------------------------

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

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

mvn clean verify -Pepp.package.ccp
mvn clean verify -Pepp.package.rcp

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

mvn clean package -Pepp.package.ccp
mvn clean package -Pepp.package.rcp

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

-Declipse.simultaneous.release.repository="http://download.eclipse.org/releases/2018-09"

Changes from Eclipse version
----------------------------

- a `gnumcueclipse` branch was added
- the URL of the GNU MCU Eclipse update site was added to the list of repositories
- epp.product: the list of GNU MCU Eclipse features was added to the list of included features
- the baseUri bug affecting builds on machines with spaces in folder names was fixed
- the name of the generated archive was changed to include `gnumcueclipse`
- the top README.md (this file) was slightly edited
4 changes: 2 additions & 2 deletions packages/org.eclipse.epp.package.cpp/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</property>
<property
name="aboutText"
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;">
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;">
</property>
<property
name="startupForegroundColor"
Expand Down Expand Up @@ -46,7 +46,7 @@
</property>
<property
name="introTitle"
value="Welcome to the Eclipse IDE for C/C++ Developers">
value="Welcome to the Eclipse IDE for GNU ARM &amp; RISC-V C/C++ Developers">
</property>
<property
name="introBrandingImageText"
Expand Down
16 changes: 14 additions & 2 deletions releng/org.eclipse.epp.config/parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@
<eclipse.simultaneous.release.name>2018-09 (4.9.0)</eclipse.simultaneous.release.name>
<!-- Upstream p2 repository, used as a source for pre-compiled build artifacts -->
<eclipse.simultaneous.release.repository>http://download.eclipse.org/staging/2018-09/</eclipse.simultaneous.release.repository>

<!-- <gnumcueclipse.repository>http://gnu-mcu-eclipse.netlify.com/v4-neon-updates-test</gnumcueclipse.repository> -->
<gnumcueclipse.repository>http://gnu-mcu-eclipse.netlify.com/v4-neon-updates</gnumcueclipse.repository>
<gnumcueclipse.version>4.4.2</gnumcueclipse.version>
</properties>

<!--
Expand Down Expand Up @@ -78,6 +82,11 @@
<url>http://download.eclipse.org/cbi/updates/license/</url>
<layout>p2</layout>
</repository>
<repository>
<id>gnu-mcu-eclipse</id>
<layout>p2</layout>
<url>${gnumcueclipse.repository}</url>
</repository>
</repositories>

<build>
Expand Down Expand Up @@ -363,17 +372,20 @@
<rootFolders>
<macosx>Eclipse.app</macosx>
</rootFolders>
<archiveFileName>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</archiveFileName>
<!-- <archiveFileName>${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}</archiveFileName> -->
<archiveFileName>${build}-gnumcueclipse-${gnumcueclipse.version}-${eclipse.simultaneous.release.id}</archiveFileName>
</product>
</products>
<profile>${project.artifactId}</profile>
</configuration>
</plugin>
<!--
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-dmg-packager</artifactId>
<version>${cbi.version}</version>
</plugin>
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Expand All @@ -387,7 +399,7 @@
<copy todir="${basedir}/../../archive">
<fileset dir="${project.build.directory}/products">
<include name="*.zip" />
<include name="*linux*.tar.gz" />
<include name="*.tar.gz" />
<include name="*.dmg" />
</fileset>
</copy>
Expand Down
3 changes: 2 additions & 1 deletion releng/org.eclipse.epp.config/parent/product/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
<artifactId>tycho-p2-director-plugin</artifactId>
</plugin>

<!--
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-dmg-packager</artifactId>
Expand All @@ -104,7 +105,7 @@
</execution>
</executions>
</plugin>

-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Expand Down

0 comments on commit bd506fa

Please sign in to comment.