Clean up of plugin.xml and addition of simpler, "Hello World" template.

Removed shared-lib option from c/c++ linker tools: RTEMS doesn't support shared libs.

Removed -D_REENTRANT flag. I've no idea where that came from: it's not in RTEMS or newlib.

Added more stringent test for empty RTEMS_BSP_DEFINED_SYMBOLS environment variable.
NOTE: none of the defs (provided by Robert) for this variable are necessary.

1 files changed, 24 insertions, 38 deletions

diff --git a/org.rtems.cdt.toolchain/plugin.xml b/org.rtems.cdt.toolchain/plugin.xml
index 66a67d7..7dde72a 100644
--- a/org.rtems.cdt.toolchain/plugin.xml
+++ b/org.rtems.cdt.toolchain/plugin.xml
@@ -70,18 +70,18 @@
             id="cdt.managedbuild.toolchain.gnu.rtems.base"

             name="RTEMS Toolchain"

             archList="all"

-            osList="win32"

+            osList="all"

             configurationEnvironmentSupplier="org.rtems.cdt.toolchain.RtemsEnvironmentVariableSupplier"

             isToolChainSupported="org.rtems.cdt.toolchain.IsRtemsToolChainSupported"

             scannerConfigDiscoveryProfileId="org.rtems.cdt.toolchain.RtemsGccManagedMakePerProjectProfile"

             targetTool="cdt.managedbuild.tool.gnu.cpp.linker.rtems.base;cdt.managedbuild.tool.gnu.c.linker.rtems.base;cdt.managedbuild.tool.gnu.archiver">

             

           <targetPlatform

-              id="cdt.managedbuild.target.gnu.platform.rtems.base"

-              name="Target Platform RTEMS"

-              binaryParser="org.eclipse.cdt.core.PE"                                  

-              osList="win32"                      

-              archList="all">

+                archList="all"

+                binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE"

+                id="cdt.managedbuild.target.gnu.platform.rtems.base"

+                name="Target Platform RTEMS"

+                osList="other">

           </targetPlatform>

           

           <builder 

@@ -144,7 +144,7 @@
                    valueType="string">

               </option>

               <option

-                  defaultValue="-qrtems -D_REENTRANT -c -fmessage-length=0"

+                  defaultValue="-qrtems -c -fmessage-length=0"

                   id="rtems.gnu.c.compiler.option.misc.other" 

                   superClass="gnu.c.compiler.option.misc.other">

               </option>

@@ -190,7 +190,7 @@
                    valueType="string">

               </option>

               <option

-                  defaultValue="-qrtems -D_REENTRANT -c -fmessage-length=0"

+                  defaultValue="-qrtems -c -fmessage-length=0"

                   id="rtems.gnu.cpp.compiler.option.other.other"

                   superClass="gnu.cpp.compiler.option.other.other">

               </option>

@@ -379,23 +379,10 @@
                    valueType="string">

             </option>

             <option

-                   defaultValue="-qrtems -D_REENTRANT"

+                   defaultValue="-qrtems"

                    id="rtems.gnu.c.link.option.ldflags"

                    superClass="gnu.c.link.option.ldflags">

             </option>

-            <option

-                   defaultValue="true"

-                   name="%RTEMS.C.Linker.Shared.Libgcc"

-                   category="gnu.c.link.category.shared"

-                   command="-shared-libgcc" 

-                   id="rtems.gnu.c.link.option.shared.libgcc"

-                   valueType="boolean">

-            </option>

-            <outputType

-               id="cdt.managedbuild.tool.gnu.c.linker.rtems.so.output.base"

-               superClass="cdt.managedbuild.tool.gnu.c.linker.output.so"

-               outputs="dll">

-            </outputType>

           </tool>

           

           <tool

@@ -578,24 +565,11 @@
                    valueType="string">

             </option>

             <option

-               defaultValue="-qrtems -D_REENTRANT"

-               id="rtems.gnu.cpp.link.option.other.flags"

-               superClass="gnu.cpp.link.option.flags">

+                  defaultValue="-qrtems"

+                  id="rtems.gnu.cpp.link.option.ldflags"

+                  superClass="gnu.c.link.option.ldflags">

             </option>

-            <option

-               defaultValue="true"

-               name="%RTEMS.CPP.Linker.Shared.Libgcc"

-               category="gnu.cpp.link.category.shared"

-               command="-shared-libgcc"

-               id="rtems.gnu.cpp.link.option.shared.libgcc" 

-               valueType="boolean">

-             </option>

             

-            <outputType

-               id="cdt.managedbuild.tool.gnu.cpp.linker.rtems.so.output.base"

-               superClass="cdt.managedbuild.tool.gnu.cpp.linker.output.so"

-               outputs="dll">

-            </outputType>

           </tool>                  

 

         </toolChain>                                   

@@ -744,6 +718,12 @@
             filterPattern=".*"

             projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">

       </template>

+      <template

+            filterPattern=".*"

+            id="org.rtems.cdt.toolchain.templates.hello"

+            location="$nl$/templates/hello/template.xml"

+            projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">

+      </template>

    </extension>

    

    <extension

@@ -754,6 +734,12 @@
                id="cdt.managedbuild.toolchain.gnu.rtems.base">

          </toolChain>

       </template>

+      <template

+            id="org.rtems.cdt.toolchain.templates.hello">

+         <toolChain

+               id="cdt.managedbuild.toolchain.gnu.rtems.base">

+         </toolChain>

+      </template>

    </extension>

 

 </plugin>