mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 18:56:02 +02:00
Code Issues Wiki Activity

Merge remote branch 'cdt/master' into sd90

Browse source
This commit is contained in:
Andrew Gvozdev 2011-09-13 14:13:54 -04:00
commit d01d0bfd60
16 changed files with 122 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java
View file

@ -79,6 +79,8 @@ public class CProjectDescriptionStorageTests extends BaseTestCase {
for (IResource child : cProj.getProject().getFolder(".csettings").members())
child.setReadOnly(false);
}
// Wait for a few seconds for the indexer to get going so we avoid deadlock
Thread.sleep(2000);
// Delete the project
CProjectHelper.delete(cProj);
}

15
core/org.eclipse.cdt.core.tests/pom.xml
View file

@ -15,6 +15,14 @@
<artifactId>org.eclipse.cdt.core.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
<repositories>
<repository>
<id>cdt.repo</id>
<url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url>
<layout>p2</layout>
</repository>
</repositories>
<build>
<plugins>
<plugin>
@ -28,6 +36,13 @@
<include>**/AutomatedIntegrationSuite.*</include>
</includes>
<testFailureIgnore>true</testFailureIgnore>
<dependencies>
<dependency>
<artifactId>org.eclipse.cdt.feature.group</artifactId>
<version>8.0.0.${buildQualifier}</version>
<type>p2-installable-unit</type>
</dependency>
</dependencies>
</configuration>
</plugin>
</plugins>

2
debug/org.eclipse.cdt.debug.mi.core/pom.xml
View file

@ -11,7 +11,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<version>7.1.100-SNAPSHOT</version>
<version>7.2.0-SNAPSHOT</version>
<artifactId>org.eclipse.cdt.debug.mi.core</artifactId>
<packaging>eclipse-plugin</packaging>
</project>

1
doc/org.eclipse.cdt.doc.isv/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/cdtconvert.txt

14
doc/org.eclipse.cdt.doc.isv/buildDoc.xml
View file

@ -10,13 +10,13 @@
<target name="convertSchemaToHtml" if="eclipse.running">
<property name="dest" value="reference/extension-points" />
<record name="${basedir}/cdtconvert.txt" action="start"/>
<pde.convertSchemaToHTML manifest="../org.eclipse.cdt.core/plugin.xml" destination="${dest}" />
<pde.convertSchemaToHTML manifest="../org.eclipse.cdt.ui/plugin.xml" destination="${dest}" />
<pde.convertSchemaToHTML manifest="../org.eclipse.cdt.debug.core/plugin.xml" destination="${dest}" />
<pde.convertSchemaToHTML manifest="../org.eclipse.cdt.make.core/plugin.xml" destination="${dest}" />
<pde.convertSchemaToHTML manifest="../org.eclipse.cdt.make.ui/plugin.xml" destination="${dest}" />
<pde.convertSchemaToHTML manifest="../org.eclipse.cdt.managedbuilder.core/plugin.xml" destination="${dest}" />
<pde.convertSchemaToHTML manifest="../org.eclipse.cdt.managedbuilder.ui/plugin.xml" destination="${dest}" />
<pde.convertSchemaToHTML manifest="../../core/org.eclipse.cdt.core/plugin.xml" destination="${dest}" />
<pde.convertSchemaToHTML manifest="../../core/org.eclipse.cdt.ui/plugin.xml" destination="${dest}" />
<pde.convertSchemaToHTML manifest="../../debug/org.eclipse.cdt.debug.core/plugin.xml" destination="${dest}" />
<pde.convertSchemaToHTML manifest="../../build/org.eclipse.cdt.make.core/plugin.xml" destination="${dest}" />
<pde.convertSchemaToHTML manifest="../../build/org.eclipse.cdt.make.ui/plugin.xml" destination="${dest}" />
<pde.convertSchemaToHTML manifest="../../build/org.eclipse.cdt.managedbuilder.core/plugin.xml" destination="${dest}" />
<pde.convertSchemaToHTML manifest="../../build/org.eclipse.cdt.managedbuilder.ui/plugin.xml" destination="${dest}" />
<record name="${basedir}/cdtconvert.txt" action="stop"/>
</target>

17
memory/org.eclipse.cdt.debug.ui.memory.source-feature/.project Normal file
View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.cdt.debug.ui.memory.source-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>

1
memory/org.eclipse.cdt.debug.ui.memory.source-feature/build.properties Normal file
View file

@ -0,0 +1 @@
bin.includes = feature.xml

0
memory/org.eclipse.cdt.debug.ui.memory-feature/sourceTemplateFeature/eclipse_update_120.jpg → memory/org.eclipse.cdt.debug.ui.memory.source-feature/eclipse_update_120.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

0
memory/org.eclipse.cdt.debug.ui.memory-feature/sourceTemplateFeature/epl-v10.html → memory/org.eclipse.cdt.debug.ui.memory.source-feature/epl-v10.html
View file

0
memory/org.eclipse.cdt.debug.ui.memory-feature/sourceTemplateFeature/feature.properties → memory/org.eclipse.cdt.debug.ui.memory.source-feature/feature.properties
View file

52
memory/org.eclipse.cdt.debug.ui.memory.source-feature/feature.xml Normal file
View file

@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.cdt.debug.ui.memory.source"
label="%featureName"
version="2.1.100.qualifier"
provider-name="%providerName">
<description>
%description
</description>
<copyright>
%copyright
</copyright>
<license url="%licenseURL">
%license
</license>
<url>
<update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/indigo"/>
</url>
<plugin
id="org.eclipse.cdt.debug.ui.memory.search.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.cdt.debug.ui.memory.traditional.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.cdt.debug.ui.memory.transport.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.cdt.debug.ui.memory.memorybrowser.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

0
memory/org.eclipse.cdt.debug.ui.memory-feature/sourceTemplateFeature/license.html → memory/org.eclipse.cdt.debug.ui.memory.source-feature/license.html
View file

17
memory/org.eclipse.cdt.debug.ui.memory.source-feature/pom.xml Normal file
View file

@ -0,0 +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>
<parent>
<groupId>org.eclipse.cdt</groupId>
<artifactId>cdt-parent</artifactId>
<version>8.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<version>2.1.100-SNAPSHOT</version>
<artifactId>org.eclipse.cdt.debug.ui.memory.source</artifactId>
<packaging>eclipse-feature</packaging>
</project>

7
p2/org.eclipse.cdt.p2-feature/feature.xml
View file

@ -25,4 +25,11 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.cdt.p2.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

1
pom.xml
View file

@ -135,6 +135,7 @@
<module>memory/org.eclipse.cdt.debug.ui.memory.traditional</module>
<module>memory/org.eclipse.cdt.debug.ui.memory.transport</module>
<module>memory/org.eclipse.cdt.debug.ui.memory-feature</module>
<module>memory/org.eclipse.cdt.debug.ui.memory.source-feature</module>
<module>cross/org.eclipse.cdt.build.crossgcc</module>
<module>cross/org.eclipse.cdt.build.crossgcc-feature</module>

1
releng/org.eclipse.cdt.repo/category.xml
View file

@ -9,6 +9,7 @@
<feature url="features/org.eclipse.cdt.xlc.feature_0.0.0.qualifier.jar" id="org.eclipse.cdt.xlc.feature" version="0.0.0"/>
<feature url="features/org.eclipse.cdt.util_0.0.0.qualifier.jar" id="org.eclipse.cdt.util" version="0.0.0"/>
<feature url="features/org.eclipse.cdt.debug.ui.memory_0.0.0.qualifier.jar" id="org.eclipse.cdt.debug.ui.memory" version="0.0.0"/>
<feature url="features/org.eclipse.cdt.debug.ui.memory.source_0.0.0.qualifier.jar" id="org.eclipse.cdt.debug.ui.memory.source" version="0.0.0"/>
<feature url="features/org.eclipse.cdt.build.crossgcc_0.0.0.qualifier.jar" id="org.eclipse.cdt.build.crossgcc" version="0.0.0"/>
<feature url="features/org.eclipse.cdt.launch.remote_0.0.0.qualifier.jar" id="org.eclipse.cdt.launch.remote" version="0.0.0"/>
<feature url="features/org.eclipse.cdt.msw_0.0.0.qualifier.jar" id="org.eclipse.cdt.msw" version="0.0.0"/>