Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDawid Pakuła2015-09-30 11:16:46 -0400
committerDawid Pakuła2015-09-30 11:43:56 -0400
commitf99dba3a35f6062cf13a08927109e8e7a2127f9a (patch)
treea86eb5be687f45a44355d9dfe4a4af65fdae6c09
parent9a118d68fecd3772b4fa8291405e1e69c67b235b (diff)
downloadorg.eclipse.dltk.sh-f99dba3a35f6062cf13a08927109e8e7a2127f9a.tar.gz
org.eclipse.dltk.sh-f99dba3a35f6062cf13a08927109e8e7a2127f9a.tar.xz
org.eclipse.dltk.sh-f99dba3a35f6062cf13a08927109e8e7a2127f9a.zip
No bug - Follow DLTK feature name convention
Change-Id: I388b655328d16e39d070d2230a80b6e858054ec5 Signed-off-by: Dawid Pakuła <zulus@w3des.net>
-rw-r--r--.gitignore2
-rw-r--r--features/org.eclipse.dltk.sh-feature/.project (renamed from features/org.eclipse.dltk.sh.feature/.project)2
-rw-r--r--features/org.eclipse.dltk.sh-feature/about.html (renamed from features/org.eclipse.dltk.sh.feature/about.html)0
-rw-r--r--features/org.eclipse.dltk.sh-feature/build.properties (renamed from features/org.eclipse.dltk.sh.feature/build.properties)0
-rw-r--r--features/org.eclipse.dltk.sh-feature/feature.properties (renamed from features/org.eclipse.dltk.sh.feature/feature.properties)0
-rw-r--r--features/org.eclipse.dltk.sh-feature/feature.xml (renamed from features/org.eclipse.dltk.sh.feature/feature.xml)16
-rw-r--r--features/org.eclipse.dltk.sh-feature/pom.xml (renamed from features/org.eclipse.dltk.sh.feature/pom.xml)2
-rw-r--r--features/org.eclipse.dltk.sh.sdk/.project17
-rw-r--r--features/org.eclipse.dltk.sh.sdk/about.html28
-rw-r--r--features/org.eclipse.dltk.sh.sdk/build.properties3
-rw-r--r--features/org.eclipse.dltk.sh.sdk/feature.properties12
-rw-r--r--features/org.eclipse.dltk.sh.sdk/feature.xml36
-rw-r--r--features/org.eclipse.dltk.sh.sdk/pom.xml25
-rw-r--r--pom.xml3
-rw-r--r--update.site/category.xml5
15 files changed, 137 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fb60f67
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+bin/
+target/
diff --git a/features/org.eclipse.dltk.sh.feature/.project b/features/org.eclipse.dltk.sh-feature/.project
index e206f16..be3c6ba 100644
--- a/features/org.eclipse.dltk.sh.feature/.project
+++ b/features/org.eclipse.dltk.sh-feature/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.dltk.sh.feature</name>
+ <name>org.eclipse.dltk.sh-feature</name>
<comment></comment>
<projects>
</projects>
diff --git a/features/org.eclipse.dltk.sh.feature/about.html b/features/org.eclipse.dltk.sh-feature/about.html
index 7c8477f..7c8477f 100644
--- a/features/org.eclipse.dltk.sh.feature/about.html
+++ b/features/org.eclipse.dltk.sh-feature/about.html
diff --git a/features/org.eclipse.dltk.sh.feature/build.properties b/features/org.eclipse.dltk.sh-feature/build.properties
index 41fa92f..41fa92f 100644
--- a/features/org.eclipse.dltk.sh.feature/build.properties
+++ b/features/org.eclipse.dltk.sh-feature/build.properties
diff --git a/features/org.eclipse.dltk.sh.feature/feature.properties b/features/org.eclipse.dltk.sh-feature/feature.properties
index bda44c7..bda44c7 100644
--- a/features/org.eclipse.dltk.sh.feature/feature.properties
+++ b/features/org.eclipse.dltk.sh-feature/feature.properties
diff --git a/features/org.eclipse.dltk.sh.feature/feature.xml b/features/org.eclipse.dltk.sh-feature/feature.xml
index 0d5f53f..5ad3757 100644
--- a/features/org.eclipse.dltk.sh.feature/feature.xml
+++ b/features/org.eclipse.dltk.sh-feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.eclipse.dltk.sh.feature"
- label="ShellEd"
+ id="org.eclipse.dltk.sh"
+ label="Dynamic Languages Toolkit - ShellEd IDE"
version="5.3.1.qualifier"
provider-name="ShellEd Project"
license-feature="org.eclipse.license"
@@ -23,6 +23,10 @@
<discovery label="Linux Tools" url="http://download.eclipse.org/linuxtools/update"/>
</url>
+ <requires>
+ <import plugin="org.eclipse.linuxtools.man.core"/>
+ </requires>
+
<plugin
id="org.eclipse.dltk.sh.core"
download-size="0"
@@ -43,12 +47,4 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
- <plugin
- id="org.eclipse.linuxtools.man.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
diff --git a/features/org.eclipse.dltk.sh.feature/pom.xml b/features/org.eclipse.dltk.sh-feature/pom.xml
index 16d42d3..2d192d0 100644
--- a/features/org.eclipse.dltk.sh.feature/pom.xml
+++ b/features/org.eclipse.dltk.sh-feature/pom.xml
@@ -17,7 +17,7 @@
<relativePath>../..</relativePath>
</parent>
- <artifactId>org.eclipse.dltk.sh.feature</artifactId>
+ <artifactId>org.eclipse.dltk.sh</artifactId>
<packaging>eclipse-feature</packaging>
<name>ShellEd Feature</name>
diff --git a/features/org.eclipse.dltk.sh.sdk/.project b/features/org.eclipse.dltk.sh.sdk/.project
new file mode 100644
index 0000000..39a41e8
--- /dev/null
+++ b/features/org.eclipse.dltk.sh.sdk/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.dltk.sh.sdk-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/features/org.eclipse.dltk.sh.sdk/about.html b/features/org.eclipse.dltk.sh.sdk/about.html
new file mode 100644
index 0000000..7c8477f
--- /dev/null
+++ b/features/org.eclipse.dltk.sh.sdk/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2008</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html> \ No newline at end of file
diff --git a/features/org.eclipse.dltk.sh.sdk/build.properties b/features/org.eclipse.dltk.sh.sdk/build.properties
new file mode 100644
index 0000000..41fa92f
--- /dev/null
+++ b/features/org.eclipse.dltk.sh.sdk/build.properties
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+ feature.properties,\
+ about.html
diff --git a/features/org.eclipse.dltk.sh.sdk/feature.properties b/features/org.eclipse.dltk.sh.sdk/feature.properties
new file mode 100644
index 0000000..b5a0c9d
--- /dev/null
+++ b/features/org.eclipse.dltk.sh.sdk/feature.properties
@@ -0,0 +1,12 @@
+# "description" property - description of the feature
+description=Shell Script Editor for Eclipse (SDK)
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2014 Red Hat Inc and others.\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n
+################ end of copyright property ####################################
diff --git a/features/org.eclipse.dltk.sh.sdk/feature.xml b/features/org.eclipse.dltk.sh.sdk/feature.xml
new file mode 100644
index 0000000..e75e177
--- /dev/null
+++ b/features/org.eclipse.dltk.sh.sdk/feature.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.dltk.sh.sdk"
+ label="Dynamic Languages Toolkit - ShellEd IDE SDK"
+ version="5.3.1.qualifier"
+ provider-name="ShellEd Project"
+ license-feature="org.eclipse.license"
+ license-feature-version="0.0.0">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.dltk.sh.core.source"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.dltk.sh.ui.source"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature> \ No newline at end of file
diff --git a/features/org.eclipse.dltk.sh.sdk/pom.xml b/features/org.eclipse.dltk.sh.sdk/pom.xml
new file mode 100644
index 0000000..e54715b
--- /dev/null
+++ b/features/org.eclipse.dltk.sh.sdk/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2011, Red Hat, Inc.
+
+ 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
+-->
+<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>
+
+ <parent>
+ <groupId>org.eclipse.dltk.sh</groupId>
+ <artifactId>parent</artifactId>
+ <version>5.3.1-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.dltk.sh.sdk</artifactId>
+ <packaging>eclipse-feature</packaging>
+
+ <name>ShellEd Feature (SDK)</name>
+
+</project>
diff --git a/pom.xml b/pom.xml
index 182dbe8..d889370 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,8 @@
<module>plugins/org.eclipse.dltk.sh.ui</module>
<module>tests/org.eclipse.dltk.sh.core.tests</module>
<module>tests/org.eclipse.dltk.sh.ui.tests</module>
- <module>features/org.eclipse.dltk.sh.feature</module>
+ <module>features/org.eclipse.dltk.sh-feature</module>
+ <module>features/org.eclipse.dltk.sh.sdk</module>
</modules>
<repositories>
<repository>
diff --git a/update.site/category.xml b/update.site/category.xml
index ba33e4c..f2f4e9d 100644
--- a/update.site/category.xml
+++ b/update.site/category.xml
@@ -3,7 +3,10 @@
<description>
ShellEd p2 repo.
</description>
- <feature url="features/org.eclipse.dltk.sh.feature_0.0.0.qualifier.jar" id="org.eclipse.dltk.sh.feature" version="0.0.0">
+ <feature url="features/org.eclipse.dltk.sh_0.0.0.qualifier.jar" id="org.eclipse.dltk.sh" version="0.0.0">
+ <category name="Shell Script"/>
+ </feature>
+ <feature url="features/org.eclipse.dltk.sh.sdk_0.0.0.qualifier.jar" id="org.eclipse.dltk.sh.sdk" version="0.0.0">
<category name="Shell Script"/>
</feature>
<category-def name="Shell Script" label="Shell Script">

Back to the top