Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2015-11-26 01:12:57 +0000
committerTom Schindl2015-11-26 01:14:30 +0000
commit33137ca8a8bb4f7a5c913fddafb25f2adef75ccf (patch)
tree6b867a94a26007aca19013c397efa8de33b6e02d
parent1c9ef7aaab15ef7eb099f09c3293b22c33efc22e (diff)
downloadorg.eclipse.efxclipse-33137ca8a8bb4f7a5c913fddafb25f2adef75ccf.tar.gz
org.eclipse.efxclipse-33137ca8a8bb4f7a5c913fddafb25f2adef75ccf.tar.xz
org.eclipse.efxclipse-33137ca8a8bb4f7a5c913fddafb25f2adef75ccf.zip
adding gmodel to build
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.gmodel.ui/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.gmodel.ui/pom.xml34
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.gmodel/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.gmodel/pom.xml34
-rwxr-xr-xreleng/org.eclipse.fx.ide.releng/pom.xml5
-rw-r--r--releng/tooling/org.eclipse.fx.ide.gmod.feature/.project17
-rw-r--r--releng/tooling/org.eclipse.fx.ide.gmod.feature/build.properties1
-rw-r--r--releng/tooling/org.eclipse.fx.ide.gmod.feature/feature.xml158
-rw-r--r--releng/tooling/org.eclipse.fx.ide.gmod.feature/pom.xml16
9 files changed, 267 insertions, 2 deletions
diff --git a/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/META-INF/MANIFEST.MF
index 90fc98969..e72349210 100644
--- a/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.fx.ide.gmodel.ui
Bundle-Vendor: My Company
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
Bundle-SymbolicName: org.eclipse.fx.ide.gmodel.ui; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.fx.ide.gmodel;visibility:=reexport,
diff --git a/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/pom.xml b/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/pom.xml
new file mode 100755
index 000000000..3e53d7e25
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.gmodel.ui/pom.xml
@@ -0,0 +1,34 @@
+<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>
+ <name>e(fx)clipse - IDE - GModel UI</name>
+ <groupId>org.eclipse.fx.ide</groupId>
+ <artifactId>org.eclipse.fx.ide.gmodel.ui</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+ <parent>
+ <groupId>org.eclipse.fx.ide</groupId>
+ <artifactId>releng</artifactId>
+ <relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
+ <version>2.1.0-SNAPSHOT</version>
+ </parent>
+
+ <build>
+ <resources>
+ <!-- to ensure that the feature lookup of the ui test works -->
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>META-INF/</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project> \ No newline at end of file
diff --git a/bundles/tooling/org.eclipse.fx.ide.gmodel/META-INF/MANIFEST.MF b/bundles/tooling/org.eclipse.fx.ide.gmodel/META-INF/MANIFEST.MF
index f780ff1dd..2762650a0 100644
--- a/bundles/tooling/org.eclipse.fx.ide.gmodel/META-INF/MANIFEST.MF
+++ b/bundles/tooling/org.eclipse.fx.ide.gmodel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.fx.ide.gmodel
Bundle-Vendor: My Company
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
Bundle-SymbolicName: org.eclipse.fx.ide.gmodel; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext;visibility:=reexport,
diff --git a/bundles/tooling/org.eclipse.fx.ide.gmodel/pom.xml b/bundles/tooling/org.eclipse.fx.ide.gmodel/pom.xml
new file mode 100755
index 000000000..1d7ea7966
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.gmodel/pom.xml
@@ -0,0 +1,34 @@
+<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>
+ <name>e(fx)clipse - IDE - GModel Core</name>
+ <groupId>org.eclipse.fx.ide</groupId>
+ <artifactId>org.eclipse.fx.ide.gmodel</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+ <parent>
+ <groupId>org.eclipse.fx.ide</groupId>
+ <artifactId>releng</artifactId>
+ <relativePath>../../../releng/org.eclipse.fx.ide.releng/pom.xml</relativePath>
+ <version>2.1.0-SNAPSHOT</version>
+ </parent>
+
+ <build>
+ <resources>
+ <!-- to ensure that the feature lookup of the ui test works -->
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>META-INF/</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project> \ No newline at end of file
diff --git a/releng/org.eclipse.fx.ide.releng/pom.xml b/releng/org.eclipse.fx.ide.releng/pom.xml
index e5e2d2db9..c27a8cf31 100755
--- a/releng/org.eclipse.fx.ide.releng/pom.xml
+++ b/releng/org.eclipse.fx.ide.releng/pom.xml
@@ -67,6 +67,10 @@
<module>../../bundles/tooling/org.eclipse.fx.ide.l10n</module>
<module>../../bundles/tooling/org.eclipse.fx.ide.l10n.ui</module>
+ <!-- gmod -->
+ <module>../../bundles/tooling/org.eclipse.fx.ide.gmodel</module>
+ <module>../../bundles/tooling/org.eclipse.fx.ide.gmodel.ui</module>
+
<module>../../bundles/code/org.eclipse.fx.code.editor.ldef.ui</module>
<!-- Mobile -->
@@ -82,6 +86,7 @@
<module>../tooling/org.eclipse.fx.ide.mobile.feature</module>
<module>../tooling/org.eclipse.fx.ide.l10n.feature</module>
<module>../tooling/org.eclipse.fx.ide.ldef.feature</module>
+ <module>../tooling/org.eclipse.fx.ide.gmod.feature</module>
<module>../tooling/org.eclipse.fx.ide.feature</module>
<module>../org.eclipse.fx.ide.updatesite</module>
diff --git a/releng/tooling/org.eclipse.fx.ide.gmod.feature/.project b/releng/tooling/org.eclipse.fx.ide.gmod.feature/.project
new file mode 100644
index 000000000..daf2b0f8f
--- /dev/null
+++ b/releng/tooling/org.eclipse.fx.ide.gmod.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.fx.ide.gmod.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/releng/tooling/org.eclipse.fx.ide.gmod.feature/build.properties b/releng/tooling/org.eclipse.fx.ide.gmod.feature/build.properties
new file mode 100644
index 000000000..64f93a9f0
--- /dev/null
+++ b/releng/tooling/org.eclipse.fx.ide.gmod.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/releng/tooling/org.eclipse.fx.ide.gmod.feature/feature.xml b/releng/tooling/org.eclipse.fx.ide.gmod.feature/feature.xml
new file mode 100644
index 000000000..331c7b375
--- /dev/null
+++ b/releng/tooling/org.eclipse.fx.ide.gmod.feature/feature.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.fx.ide.gmod.feature"
+ label="GModel Feature"
+ version="2.1.0.qualifier">
+
+ <description url="http://www.example.com/description">
+ GModel Feature to model generic serialized data
+ </description>
+
+ <copyright>
+ Copyright (c) 2015 Eclipse.org and others.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+ </copyright>
+
+ <license url="http://www.eclipse.org/legal/epl-v10.html">
+ Eclipse Foundation Software User Agreement
+April 9, 2014
+
+Usage Of Content
+
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+BELOW, THEN YOU MAY NOT USE THE CONTENT.
+
+Applicable Licenses
+
+Unless otherwise indicated, all Content made available by the
+Eclipse Foundation is provided to you under the terms and conditions of
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
+For purposes of the EPL, "Program" will mean the Content.
+
+Content includes, but is not limited to, source code, object code,
+documentation and other files maintained in the Eclipse Foundation source code
+repository ("Repository") in software modules ("Modules") and made available
+as downloadable archives ("Downloads").
+
+ - Content may be structured and packaged into modules to facilitate delivering,
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),
+ plug-in fragments ("Fragments"), and features ("Features").
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)
+ in a directory named "plugins".
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.
+ Each Feature may be packaged as a sub-directory in a directory named "features".
+ Within a Feature, files named "feature.xml" may contain a list of the names and version
+ numbers of the Plug-ins and/or Fragments associated with that Feature.
+ - Features may also include other Features ("Included Features"). Within a Feature, files
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.
+
+The terms and conditions governing Plug-ins and Fragments should be
+contained in files named "about.html" ("Abouts"). The terms and
+conditions governing Features and Included Features should be contained
+in files named "license.html" ("Feature Licenses"). Abouts and Feature
+Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:
+
+ - The top-level (root) directory
+ - Plug-in and Fragment directories
+ - Inside Plug-ins and Fragments packaged as JARs
+ - Sub-directories of the directory named "src" of certain Plug-ins
+ - Feature directories
+
+Note: if a Feature made available by the Eclipse Foundation is installed using the
+Provisioning Technology (as defined below), you must agree to a license ("Feature
+Update License") during the installation process. If the Feature contains
+Included Features, the Feature Update License should either provide you
+with the terms and conditions governing the Included Features or inform
+you where you can locate them. Feature Update Licenses may be found in
+the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the
+terms and conditions (or references to such terms and conditions) that
+govern your use of the associated Content in that directory.
+
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
+
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License
+is provided, please contact the Eclipse Foundation to determine what terms and conditions
+govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include,
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for
+the purpose of allowing users to install software, documentation, information and/or
+other materials (collectively "Installable Software"). This capability is provided with
+the intent of allowing such users to install, extend and update Eclipse-based products.
+Information about packaging Installable Software is available at
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").
+
+You may use Provisioning Technology to allow other parties to install Installable Software.
+You shall be responsible for enabling the applicable license agreements relating to the
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+in accordance with the Specification. By using Provisioning Technology in such a manner and
+making it available in accordance with the Specification, you further acknowledge your
+agreement to, and the acquisition of all necessary rights to permit the following:
+
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,
+ extending or updating the functionality of an Eclipse-based product.
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that
+ govern the use of the Installable Software ("Installable Software Agreement") and such
+ Installable Software Agreement shall be accessed from the Target Machine in accordance
+ with the Specification. Such Installable Software Agreement must inform the user of the
+ terms and conditions that govern the Installable Software and must solicit acceptance by
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation
+ of the Installable Software.
+
+Cryptography
+
+Content may contain encryption software. The country in which you are
+currently may have restrictions on the import, possession, and use,
+and/or re-export to another country, of encryption software. BEFORE
+using any encryption software, please check the country's laws,
+regulations and policies concerning the import, possession, or use, and
+re-export of encryption software, to see if this is permitted.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
+ </license>
+
+ <plugin
+ id="org.eclipse.fx.ide.gmodel"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.fx.ide.gmodel.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/releng/tooling/org.eclipse.fx.ide.gmod.feature/pom.xml b/releng/tooling/org.eclipse.fx.ide.gmod.feature/pom.xml
new file mode 100644
index 000000000..c554a5a6c
--- /dev/null
+++ b/releng/tooling/org.eclipse.fx.ide.gmod.feature/pom.xml
@@ -0,0 +1,16 @@
+<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>
+ <name>e(fx)clipse - IDE - Features - GMod</name>
+ <groupId>org.eclipse.fx.ide</groupId>
+ <artifactId>org.eclipse.fx.ide.gmod.feature</artifactId>
+ <packaging>eclipse-feature</packaging>
+
+ <parent>
+ <groupId>org.eclipse.fx.ide</groupId>
+ <artifactId>releng</artifactId>
+ <relativePath>../../org.eclipse.fx.ide.releng/pom.xml</relativePath>
+ <version>2.1.0-SNAPSHOT</version>
+ </parent>
+
+</project> \ No newline at end of file

Back to the top