Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVivian Kong2008-04-28 10:12:59 -0400
committerVivian Kong2008-04-28 10:12:59 -0400
commit237a4df396c3eed2b3f35c2d4aec7eab3a2fd048 (patch)
treed67bc216f42161b0d4b243d3b094418869a5cdbf
parentff740bc2731be5eb3c5bb32bcd589ef0c1410516 (diff)
downloadorg.eclipse.cdt-237a4df396c3eed2b3f35c2d4aec7eab3a2fd048.tar.gz
org.eclipse.cdt-237a4df396c3eed2b3f35c2d4aec7eab3a2fd048.tar.xz
org.eclipse.cdt-237a4df396c3eed2b3f35c2d4aec7eab3a2fd048.zip
fix source build
-rw-r--r--releng/org.eclipse.cdt.platform-feature/sourceTemplateFeature/build.properties10
-rw-r--r--releng/org.eclipse.cdt.platform-feature/sourceTemplateFeature/feature.xml43
-rw-r--r--releng/org.eclipse.cdt.sdk-feature/build.properties6
-rw-r--r--releng/org.eclipse.cdt.sdk-feature/feature.xml22
4 files changed, 22 insertions, 59 deletions
diff --git a/releng/org.eclipse.cdt.platform-feature/sourceTemplateFeature/build.properties b/releng/org.eclipse.cdt.platform-feature/sourceTemplateFeature/build.properties
index 231dfcf148..b0e11e37f3 100644
--- a/releng/org.eclipse.cdt.platform-feature/sourceTemplateFeature/build.properties
+++ b/releng/org.eclipse.cdt.platform-feature/sourceTemplateFeature/build.properties
@@ -9,5 +9,11 @@
# IBM Corporation - initial API and implementation
###############################################################################
-generate.feature@org.eclipse.cdt.gnu.build.source = org.eclipse.cdt.gnu.build
-generate.feature@org.eclipse.cdt.gnu.debug.source = org.eclipse.cdt.gnu.debug
+bin.includes = feature.xml,\
+ eclipse_update_120.jpg,\
+ feature.properties,\
+ license.html,\
+ epl-v10.html
+
+#generate.feature@org.eclipse.cdt.gnu.build.source = org.eclipse.cdt.gnu.build
+#generate.feature@org.eclipse.cdt.gnu.debug.source = org.eclipse.cdt.gnu.debug
diff --git a/releng/org.eclipse.cdt.platform-feature/sourceTemplateFeature/feature.xml b/releng/org.eclipse.cdt.platform-feature/sourceTemplateFeature/feature.xml
deleted file mode 100644
index 30249321a7..0000000000
--- a/releng/org.eclipse.cdt.platform-feature/sourceTemplateFeature/feature.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.cdt.source"
- label="%featureName"
- version="5.0.0.qualifier"
- provider-name="Eclipse.org">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/ganymede"/>
- </url>
-
- <includes
- id="org.eclipse.cdt.gnu.build.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.cdt.gnu.debug.source"
- version="0.0.0"/>
-
- <plugin id="org.eclipse.cdt.source" version="5.0.0.qualifier" />
- <plugin id="org.eclipse.cdt.source.aix.motif.ppc" version="5.0.0.qualifier" fragment="true" os="aix" arch="ppc" ws="motif" />
- <plugin id="org.eclipse.cdt.source.linux.gtk.x86" version="5.0.0.qualifier" fragment="true" os="linux" arch="x86" ws="gtk" />
- <plugin id="org.eclipse.cdt.source.linux.gtk.x86_64" version="5.0.0.qualifier" fragment="true" os="linux" arch="x86_64" ws="gtk" />
- <plugin id="org.eclipse.cdt.source.linux.gtk.ppc" version="5.0.0.qualifier" fragment="true" os="linux" arch="ppc" ws="gtk" />
- <plugin id="org.eclipse.cdt.source.linux.gtk.ia64" version="5.0.0.qualifier" fragment="true" os="linux" arch="ia64" ws="gtk" />
- <plugin id="org.eclipse.cdt.source.macosx.carbon.ppc" version="5.0.0.qualifier" fragment="true" os="macosx" arch="ppc" ws="carbon" />
- <plugin id="org.eclipse.cdt.source.qnx.photon.x86" version="5.0.0.qualifier" fragment="true" os="qnx" arch="x86" ws="photon" />
- <plugin id="org.eclipse.cdt.source.solaris.motif.sparc" version="5.0.0.qualifier" fragment="true" os="solaris" arch="sparc" ws="motif" />
- <plugin id="org.eclipse.cdt.source.win32.win32.x86" version="5.0.0.qualifier" fragment="true" os="win32" arch="x86" ws="win32" />
-
-</feature>
diff --git a/releng/org.eclipse.cdt.sdk-feature/build.properties b/releng/org.eclipse.cdt.sdk-feature/build.properties
index 8fb4210f17..8b09e58d4e 100644
--- a/releng/org.eclipse.cdt.sdk-feature/build.properties
+++ b/releng/org.eclipse.cdt.sdk-feature/build.properties
@@ -14,6 +14,6 @@ bin.includes = feature.xml,\
license.html,\
epl-v10.html
-generate.plugin@org.eclipse.cdt.platform.source=org.eclipse.cdt.platform
-generate.plugin@org.eclipse.cdt.gnu.build.source=org.eclipse.cdt.gnu.build
-generate.plugin@org.eclipse.cdt.gnu.debug.source=org.eclipse.cdt.gnu.debug
+generate.feature@org.eclipse.cdt.platform.source=org.eclipse.cdt.platform
+generate.feature@org.eclipse.cdt.gnu.build.source=org.eclipse.cdt.gnu.build
+generate.feature@org.eclipse.cdt.gnu.debug.source=org.eclipse.cdt.gnu.debug
diff --git a/releng/org.eclipse.cdt.sdk-feature/feature.xml b/releng/org.eclipse.cdt.sdk-feature/feature.xml
index 8555d5f83d..54affb0938 100644
--- a/releng/org.eclipse.cdt.sdk-feature/feature.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/feature.xml
@@ -20,23 +20,23 @@
<url>
<update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/ganymede"/>
</url>
-
- <requires>
- <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
- <import feature="org.eclipse.cdt" version="5.0.0" match="compatible"/>
- </requires>
-
- <plugin
+
+ <includes
id="org.eclipse.cdt.platform.source"
version="0.0.0"/>
-
- <plugin
+
+ <includes
id="org.eclipse.cdt.gnu.build.source"
version="0.0.0"/>
-
- <plugin
+
+ <includes
id="org.eclipse.cdt.gnu.debug.source"
version="0.0.0"/>
+
+ <requires>
+ <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
+ <import feature="org.eclipse.cdt" version="5.0.0" match="compatible"/>
+ </requires>
<plugin
id="org.eclipse.cdt.sdk"

Back to the top