Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorMikhail Sennikovsky2007-05-25 16:12:08 +0000
committerMikhail Sennikovsky2007-05-25 16:12:08 +0000
commit094d2cb0bad63ac224b11e83ac8e4337b47c8bd3 (patch)
treec16eec75cc4e404b1c73b5fa467b4abb4d3e9a8c /build
parent3dfc3412a5ccafe019637279999ffb2908579c82 (diff)
downloadorg.eclipse.cdt-094d2cb0bad63ac224b11e83ac8e4337b47c8bd3.tar.gz
org.eclipse.cdt-094d2cb0bad63ac224b11e83ac8e4337b47c8bd3.tar.xz
org.eclipse.cdt-094d2cb0bad63ac224b11e83ac8e4337b47c8bd3.zip
1. Patch from Bala Torati (Symbian) to the [Bug 184390] [Template Engine] Hellow World templates should allow specifying the project source location
2. enabling additional MBS tests
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AllManagedBuildTests.java2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCAnsiProject/template.xml6
-rw-r--r--build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCCProject/template.xml1
3 files changed, 4 insertions, 5 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AllManagedBuildTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AllManagedBuildTests.java
index cc03a47266c..21f21c4f0ac 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AllManagedBuildTests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AllManagedBuildTests.java
@@ -56,7 +56,7 @@ public class AllManagedBuildTests {
// suite.addTest(ManagedBuildCoreTests20.suite());
// suite.addTest(ManagedBuildCoreTests.suite());
// suite.addTest(ManagedProjectUpdateTests.suite());
-// suite.addTest(ManagedCommandLineGeneratorTest.suite());
+ suite.addTest(ManagedCommandLineGeneratorTest.suite());
// suite.addTest(ResourceBuildCoreTests.suite());
suite.addTest(ManagedProject21MakefileTests.suite());
suite.addTest(ManagedProject30MakefileTests.suite());
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCAnsiProject/template.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCAnsiProject/template.xml
index 9f7244f3243..66a545fea2e 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCAnsiProject/template.xml
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCAnsiProject/template.xml
@@ -35,7 +35,7 @@
type="input"
default="%HelloWorld.sourceDir.default"
pattern="[a-zA-Z0-9]+"
- mandatory="true"
+ mandatory="false"
persist="true"/>
</property-group>
@@ -47,7 +47,7 @@
<process type="org.eclipse.cdt.core.CreateSourceFolder">
<simple name="projectName" value="$(projectName)"/>
- <simple name="path" value="src"/>
+ <simple name="path" value="$(sourceDir)"/>
</process>
<process type="org.eclipse.cdt.core.AddFiles">
@@ -55,7 +55,7 @@
<complex-array name="files">
<element>
<simple name="source" value="src/Basename.c"/>
- <simple name="target" value="src/$(projectName).c"/>
+ <simple name="target" value="$(sourceDir)/$(projectName).c"/>
<simple name="replaceable" value="true"/>
</element>
</complex-array>
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCCProject/template.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCCProject/template.xml
index 65888acfaf6..07a0ad67417 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCCProject/template.xml
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCCProject/template.xml
@@ -34,7 +34,6 @@
type="input"
default="%HelloWorld.sourceDir.default"
pattern="[a-zA-Z0-9]+"
- mandatory="true"
persist="true"/>
</property-group>

Back to the top