Skip to content

Commit

Permalink
Added IDF Feature and target definition to build the plug-ins
Browse files Browse the repository at this point in the history
Defined IDF target definition to compile the plug-ins against
Defined IDF update site plug-in
Updated IDF feature
Target build defined for CDT 6.5 and Eclipse 2018-09
Updating tycho to 1.3.0
  • Loading branch information
kolipakakondal committed Feb 19, 2019
1 parent 7c2e725 commit 3a45736
Show file tree
Hide file tree
Showing 24 changed files with 190 additions and 106 deletions.
1 change: 1 addition & 0 deletions bundles/com.espressif.idf.core/.gitignore
@@ -0,0 +1 @@
/target/
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
8 changes: 3 additions & 5 deletions bundles/com.espressif.idf.core/META-INF/MANIFEST.MF
Expand Up @@ -8,10 +8,8 @@ Automatic-Module-Name: com.espressif.idf.core
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: com.espressif.idf.core,
com.espressif.idf.core.util
Require-Bundle: org.eclipse.swt,
org.eclipse.core.filesystem,
org.eclipse.osgi.util;visibility:=reexport,
org.eclipse.osgi;visibility:=reexport,
org.eclipse.core.runtime;visibility:=reexport
Require-Bundle: org.eclipse.osgi.util;visibility:=reexport,
org.eclipse.core.runtime;visibility:=reexport,
org.eclipse.core.filesystem;visibility:=reexport
Bundle-Activator: com.espressif.idf.core.IDFCorePlugin
Bundle-ActivationPolicy: lazy
1 change: 0 additions & 1 deletion bundles/com.espressif.idf.core/bin/.gitignore

This file was deleted.

@@ -0,0 +1,6 @@
FileUtil_CopyingMsg=Copying of {0}
FileUtil_DesDirNotavailable=the destination directory could not be created
FileUtil_DestinationNotaDir=the destination is not a directory
FileUtil_SourceDirNotavailable=the source directory is not readable
FileUtil_UnableToCopy=Unable to copy {0} to {1} because {2}
FileUtil_WritableProblemMsg=the destination directory is not writable
14 changes: 14 additions & 0 deletions bundles/com.espressif.idf.core/pom.xml
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>com.espressif.idf.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<parent>
<groupId>com.espressif.ide</groupId>
<artifactId>com.espressif.ide.bundles</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
</project>
2 changes: 1 addition & 1 deletion bundles/com.espressif.idf.ui/.classpath
Expand Up @@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
Expand Down
@@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=11

This file was deleted.

15 changes: 5 additions & 10 deletions bundles/com.espressif.idf.ui/META-INF/MANIFEST.MF
Expand Up @@ -5,20 +5,15 @@ Bundle-SymbolicName: com.espressif.idf.ui;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: com.espressif.idf.ui.UIPlugin
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui.ide,
org.eclipse.core.resources,
org.eclipse.pde.runtime;visibility:=reexport,
org.eclipse.pde.ui;visibility:=reexport,
org.eclipse.cdt;visibility:=reexport,
org.eclipse.cdt.core;visibility:=reexport,
org.eclipse.cdt.managedbuilder.ui;visibility:=reexport,
org.eclipse.cdt.managedbuilder.core;visibility:=reexport,
com.espressif.idf.core;visibility:=reexport,
org.eclipse.cdt.cmake.core,
org.eclipse.cdt.cmake.ui,
org.eclipse.tools.templates.ui
Bundle-RequiredExecutionEnvironment: JavaSE-9
org.eclipse.tools.templates.ui,
org.eclipse.swt;visibility:=reexport,
org.eclipse.ui;visibility:=reexport
Automatic-Module-Name: com.espressif.idf.ui
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
4 changes: 3 additions & 1 deletion bundles/pom.xml
Expand Up @@ -16,14 +16,16 @@
</parent>

<modules>
<module>com.espressif.idf.core</module>
<module>com.espressif.idf.ui</module>
</modules>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>1.0.0</version>
<version>1.3.0</version>
<extensions>true</extensions>
</plugin>
</plugins>
Expand Down
4 changes: 2 additions & 2 deletions features/com.espressif.idf.feature/feature.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="com.espressif.idf.feature"
label="IDF Feature"
label="Espressif IDF Feature"
version="1.0.0.qualifier"
provider-name="ESPRESSIF">
provider-name="ESPRESSIF SYSTEMS (SHANGHAI) CO., LTD">

<description url="http://www.example.com/description">
[Enter Feature Description here.]
Expand Down
18 changes: 10 additions & 8 deletions features/com.espressif.idf.feature/pom.xml
@@ -1,11 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.espressif.idf.feature</groupId>
<artifactId>com.espressif.idf.feature</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<parent>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.espressif.idf.feature</groupId>
<artifactId>com.espressif.idf.feature</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<parent>
<groupId>com.espressif.ide</groupId>
<artifactId>com.espressif.ide.features</artifactId>
<version>1.0.0-SNAPSHOT</version>
Expand Down
31 changes: 14 additions & 17 deletions features/pom.xml
@@ -1,20 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.espressif.ide</groupId>
<artifactId>com.espressif.ide.features</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>com.espressif.ide</groupId>
<artifactId>com.espressif.ide.features</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
<groupId>com.espressif.ide</groupId>
<artifactId>com.espressif.ide.root</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<parent>
<groupId>com.espressif.ide</groupId>
<artifactId>com.espressif.ide.root</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>

<modules>
</modules>
<modules>
<module>com.espressif.idf.feature</module>
</modules>
</project>
80 changes: 79 additions & 1 deletion releng/com.espressif.ide.configuration/pom.xml
Expand Up @@ -8,9 +8,87 @@
<packaging>pom</packaging>

<properties>
<tycho-version>1.0.0</tycho-version>
<tycho-version>1.3.0</tycho-version>
<tycho-extras.version>${tycho-version}</tycho-extras.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>

<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>

<!-- Target definition-->
<target>
<artifact>
<groupId>com.espressif.ide</groupId>
<artifactId>com.espressif.ide.target</artifactId>
<version>1.0.0-SNAPSHOT</version>
</artifact>
</target>
<resolver>p2</resolver>
<pomDependencies>consider</pomDependencies>
<environments>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
</environments>
</configuration>
</plugin>
<!-- use last git commit timestamp as build qualifier for plugins -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho-version}</version>
<dependencies>
<dependency>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-buildtimestamp-jgit</artifactId>
<version>${tycho-extras.version}</version>
</dependency>
</dependencies>
<configuration>
<timestampProvider>jgit</timestampProvider>
<jgit.ignore>
pom.xml
.polyglot.build.properties
</jgit.ignore>
<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
</configuration>
</plugin>
</plugins>
</build>

</project>
30 changes: 30 additions & 0 deletions releng/com.espressif.ide.target/com.espressif.ide.target.target
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="com.espressif.ide.target" sequenceNumber="25">
<locations>

<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
<unit id="org.eclipse.test.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.9/"/>
</location>

<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.cmake.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/cdt/releases/9.5"/>
</location>

<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
<repository location="https://download.eclipse.org/tm/updates/4.5.0/repository/"/>
</location>

<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="javax.xml.bind" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
</target>
6 changes: 5 additions & 1 deletion releng/com.espressif.ide.target/pom.xml
Expand Up @@ -2,10 +2,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.espressif.ide</groupId>
<artifactId>com.espressif.ide.target</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-target-definition</packaging>

<parent>
<groupId>com.espressif.ide</groupId>
<artifactId>com.espressif.ide.releng</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>com.espressif.ide.target</artifactId>
</project>
38 changes: 0 additions & 38 deletions releng/com.espressif.ide.update/.classpath

This file was deleted.

1 change: 1 addition & 0 deletions releng/com.espressif.ide.update/.gitignore
@@ -1 +1,2 @@
/target/
/bin/
@@ -1,6 +1,2 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8

This file was deleted.

This file was deleted.

7 changes: 7 additions & 0 deletions releng/com.espressif.ide.update/category.xml
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/com.espressif.idf.feature_1.0.0.qualifier.jar" id="com.espressif.idf.feature" version="1.0.0.qualifier">
<category name="com.espressif.idf"/>
</feature>
<category-def name="com.espressif.idf" label="Espressif IDF"/>
</site>

0 comments on commit 3a45736

Please sign in to comment.