From 8e6327a29be44c3284327abc02928b33dea09088 Mon Sep 17 00:00:00 2001 From: Daron Chabot Date: Wed, 25 Feb 2009 03:43:47 +0000 Subject: Addition of Hello World template and RTEMS icons to preference page and About Eclipse dialog. --- org.rtems.cdt.feature/about.html | 12 ++ org.rtems.cdt.feature/build.properties | 4 - org.rtems.cdt.feature/feature.xml | 22 +--- org.rtems.cdt.update/artifacts.xml | 70 +++++++++-- org.rtems.cdt.update/content.xml | 139 ++++++++++++++++++++- org.rtems.cdt.update/copyUpdateSite.sh | 11 ++ .../features/org.rtems.cdt_1.0.0.jar | Bin 803 -> 0 bytes .../features/org.rtems.cdt_1.0.1.jar | Bin 10692 -> 0 bytes .../features/org.rtems.cdt_1.1.0.jar | Bin 0 -> 10996 bytes .../plugins/org.rtems.cdt_1.0.0.jar | Bin 33938 -> 0 bytes .../plugins/org.rtems.cdt_1.1.0.jar | Bin 0 -> 113059 bytes org.rtems.cdt.update/site.xml | 2 +- org.rtems.cdt/META-INF/MANIFEST.MF | 2 +- org.rtems.cdt/about.ini | 7 ++ org.rtems.cdt/about.mappings | 3 + org.rtems.cdt/about.properties | 14 +++ org.rtems.cdt/build.properties | 7 +- org.rtems.cdt/icons/rtems_logo-128x128.png | Bin 0 -> 21678 bytes org.rtems.cdt/icons/rtems_logo-32x32.png | Bin 0 -> 2188 bytes org.rtems.cdt/icons/rtems_logo-48x48.png | Bin 0 -> 4122 bytes org.rtems.cdt/icons/rtems_logo-64x32.png | Bin 0 -> 5804 bytes org.rtems.cdt/icons/rtems_logo-64x64.png | Bin 0 -> 6526 bytes org.rtems.cdt/icons/rtems_logo.png | Bin 0 -> 35353 bytes org.rtems.cdt/plugin.xml | 20 +++ .../org/rtems/cdt/preferences/PreferencePage.java | 2 + org.rtems.cdt/templates/hello/src/init.c | 36 ++++++ org.rtems.cdt/templates/hello/src/system.h | 40 ++++++ org.rtems.cdt/templates/hello/template.properties | 3 + org.rtems.cdt/templates/hello/template.xml | 51 ++++++++ 29 files changed, 399 insertions(+), 46 deletions(-) create mode 100644 org.rtems.cdt.feature/about.html create mode 100755 org.rtems.cdt.update/copyUpdateSite.sh delete mode 100644 org.rtems.cdt.update/features/org.rtems.cdt_1.0.0.jar delete mode 100644 org.rtems.cdt.update/features/org.rtems.cdt_1.0.1.jar create mode 100644 org.rtems.cdt.update/features/org.rtems.cdt_1.1.0.jar delete mode 100644 org.rtems.cdt.update/plugins/org.rtems.cdt_1.0.0.jar create mode 100644 org.rtems.cdt.update/plugins/org.rtems.cdt_1.1.0.jar create mode 100644 org.rtems.cdt/about.ini create mode 100644 org.rtems.cdt/about.mappings create mode 100644 org.rtems.cdt/about.properties create mode 100644 org.rtems.cdt/icons/rtems_logo-128x128.png create mode 100644 org.rtems.cdt/icons/rtems_logo-32x32.png create mode 100644 org.rtems.cdt/icons/rtems_logo-48x48.png create mode 100644 org.rtems.cdt/icons/rtems_logo-64x32.png create mode 100644 org.rtems.cdt/icons/rtems_logo-64x64.png create mode 100644 org.rtems.cdt/icons/rtems_logo.png create mode 100644 org.rtems.cdt/templates/hello/src/init.c create mode 100644 org.rtems.cdt/templates/hello/src/system.h create mode 100644 org.rtems.cdt/templates/hello/template.properties create mode 100644 org.rtems.cdt/templates/hello/template.xml diff --git a/org.rtems.cdt.feature/about.html b/org.rtems.cdt.feature/about.html new file mode 100644 index 0000000..a388210 --- /dev/null +++ b/org.rtems.cdt.feature/about.html @@ -0,0 +1,12 @@ + + + + +Eclipse.org Software User Agreement + + + +

Eclipse Foundation Software User Agreement

+ + + \ No newline at end of file diff --git a/org.rtems.cdt.feature/build.properties b/org.rtems.cdt.feature/build.properties index 94bb883..e69de29 100644 --- a/org.rtems.cdt.feature/build.properties +++ b/org.rtems.cdt.feature/build.properties @@ -1,4 +0,0 @@ -bin.includes = feature.xml,\ - feature.properties,\ - license.html,\ - epl-v10.html diff --git a/org.rtems.cdt.feature/feature.xml b/org.rtems.cdt.feature/feature.xml index 9706e60..a50485c 100644 --- a/org.rtems.cdt.feature/feature.xml +++ b/org.rtems.cdt.feature/feature.xml @@ -2,7 +2,7 @@ @@ -21,24 +21,4 @@ - - - - - - - - - - - - - - - diff --git a/org.rtems.cdt.update/artifacts.xml b/org.rtems.cdt.update/artifacts.xml index 4261a11..9c8464e 100644 --- a/org.rtems.cdt.update/artifacts.xml +++ b/org.rtems.cdt.update/artifacts.xml @@ -3,30 +3,24 @@ - + - + - + - - - - - - - - + + @@ -47,5 +41,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.rtems.cdt.update/content.xml b/org.rtems.cdt.update/content.xml index 0ba51cc..d400c86 100644 --- a/org.rtems.cdt.update/content.xml +++ b/org.rtems.cdt.update/content.xml @@ -3,13 +3,13 @@ - + - + @@ -452,5 +452,140 @@ Bundle-Version: 1.0.0 %copyright + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + (org.eclipse.update.install.features=true) + + + + + + + %license + + + + %copyright + + + + + + + + + + + + + + + + + + + + + + + (org.eclipse.update.install.features=true) + + + + + + + + + true + + + + + + %license + + + + %copyright + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Bundle-Vendor: Embedded Brains GmbH +Bundle-ManifestVersion: 2 +Bundle-Activator: org.rtems.cdt.Activator +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Name: RTEMS CDT Plug-in +Import-Package: org.eclipse.cdt.core.model,org.eclipse.cdt.managedbuilder.ui.wizards,org.eclipse.jface.resource,org.eclipse.ui.wizards.newresource +Require-Bundle: org.eclipse.cdt.managedbuilder.core,org.eclipse.swt,org.eclipse.ui,org.eclipse.core.resources,org.eclipse.cdt.ui,org.eclipse.core.runtime,org.eclipse.cdt.managedbuilder.ui,org.eclipse.cdt.core +Bundle-ActivationPolicy: lazy +Manifest-Version: 1.0 +Bundle-SymbolicName: org.rtems.cdt;singleton:=true +Bundle-Version: 1.1.0 + + + + diff --git a/org.rtems.cdt.update/copyUpdateSite.sh b/org.rtems.cdt.update/copyUpdateSite.sh new file mode 100755 index 0000000..75b08e4 --- /dev/null +++ b/org.rtems.cdt.update/copyUpdateSite.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +SRCDIR=$1 +DESTDIR=$2 +COPYCMD="cp -r" + +set -ex + +${COPYCMD} ${SRCDIR}/features ${SRCDIR}/plugins \ + ${SRCDIR}/web ${SRCDIR}/site.xml ${SRCDIR}/index.html \ + ${DESTDIR} diff --git a/org.rtems.cdt.update/features/org.rtems.cdt_1.0.0.jar b/org.rtems.cdt.update/features/org.rtems.cdt_1.0.0.jar deleted file mode 100644 index 44fe220..0000000 Binary files a/org.rtems.cdt.update/features/org.rtems.cdt_1.0.0.jar and /dev/null differ diff --git a/org.rtems.cdt.update/features/org.rtems.cdt_1.0.1.jar b/org.rtems.cdt.update/features/org.rtems.cdt_1.0.1.jar deleted file mode 100644 index 0b1faa7..0000000 Binary files a/org.rtems.cdt.update/features/org.rtems.cdt_1.0.1.jar and /dev/null differ diff --git a/org.rtems.cdt.update/features/org.rtems.cdt_1.1.0.jar b/org.rtems.cdt.update/features/org.rtems.cdt_1.1.0.jar new file mode 100644 index 0000000..03cb949 Binary files /dev/null and b/org.rtems.cdt.update/features/org.rtems.cdt_1.1.0.jar differ diff --git a/org.rtems.cdt.update/plugins/org.rtems.cdt_1.0.0.jar b/org.rtems.cdt.update/plugins/org.rtems.cdt_1.0.0.jar deleted file mode 100644 index 92878ae..0000000 Binary files a/org.rtems.cdt.update/plugins/org.rtems.cdt_1.0.0.jar and /dev/null differ diff --git a/org.rtems.cdt.update/plugins/org.rtems.cdt_1.1.0.jar b/org.rtems.cdt.update/plugins/org.rtems.cdt_1.1.0.jar new file mode 100644 index 0000000..dddc3bf Binary files /dev/null and b/org.rtems.cdt.update/plugins/org.rtems.cdt_1.1.0.jar differ diff --git a/org.rtems.cdt.update/site.xml b/org.rtems.cdt.update/site.xml index 0ae97ec..18d8a7b 100644 --- a/org.rtems.cdt.update/site.xml +++ b/org.rtems.cdt.update/site.xml @@ -1,6 +1,6 @@ - + diff --git a/org.rtems.cdt/META-INF/MANIFEST.MF b/org.rtems.cdt/META-INF/MANIFEST.MF index 04bf62d..21dd38f 100644 --- a/org.rtems.cdt/META-INF/MANIFEST.MF +++ b/org.rtems.cdt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: RTEMS CDT Plug-in Bundle-SymbolicName: org.rtems.cdt;singleton:=true -Bundle-Version: 1.0.1 +Bundle-Version: 1.1.0 Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.cdt.managedbuilder.core, org.eclipse.swt, diff --git a/org.rtems.cdt/about.ini b/org.rtems.cdt/about.ini new file mode 100644 index 0000000..8f5761d --- /dev/null +++ b/org.rtems.cdt/about.ini @@ -0,0 +1,7 @@ +# about.ini +# contains info about the RTEMS CDT support feature. +# "%key" are externalized strings defined in about.properties + +aboutText=%about + +featureImage=icons/rtems_logo-32x32.png \ No newline at end of file diff --git a/org.rtems.cdt/about.mappings b/org.rtems.cdt/about.mappings new file mode 100644 index 0000000..9bdadf0 --- /dev/null +++ b/org.rtems.cdt/about.mappings @@ -0,0 +1,3 @@ + +# version number +0=1.1.0 \ No newline at end of file diff --git a/org.rtems.cdt/about.properties b/org.rtems.cdt/about.properties new file mode 100644 index 0000000..fe3665d --- /dev/null +++ b/org.rtems.cdt/about.properties @@ -0,0 +1,14 @@ +# about.properties +# contains externalized strings utilized within about.properties +# fill-ins (e.g. {0}) are supplied by about.mappings + +about=RTEMS CDT Support\n\ +\n\ +Version: {0}\n\ +\n\ +(c) Embedded Brains GmbH and others. 2008, 2009. All rights reserved.\n\ +Visit http://www.rtems.com\n\ +\n\ +This offering is powered by Eclipse technology and includes\n\ +Eclipse plug-ins that can be installed and used with other\n\ +Eclipse (3.4)-based offerings. \ No newline at end of file diff --git a/org.rtems.cdt/build.properties b/org.rtems.cdt/build.properties index f0f1974..8b13789 100644 --- a/org.rtems.cdt/build.properties +++ b/org.rtems.cdt/build.properties @@ -1,6 +1 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - license.html + diff --git a/org.rtems.cdt/icons/rtems_logo-128x128.png b/org.rtems.cdt/icons/rtems_logo-128x128.png new file mode 100644 index 0000000..0d908d0 Binary files /dev/null and b/org.rtems.cdt/icons/rtems_logo-128x128.png differ diff --git a/org.rtems.cdt/icons/rtems_logo-32x32.png b/org.rtems.cdt/icons/rtems_logo-32x32.png new file mode 100644 index 0000000..9eb92b6 Binary files /dev/null and b/org.rtems.cdt/icons/rtems_logo-32x32.png differ diff --git a/org.rtems.cdt/icons/rtems_logo-48x48.png b/org.rtems.cdt/icons/rtems_logo-48x48.png new file mode 100644 index 0000000..7dad6ad Binary files /dev/null and b/org.rtems.cdt/icons/rtems_logo-48x48.png differ diff --git a/org.rtems.cdt/icons/rtems_logo-64x32.png b/org.rtems.cdt/icons/rtems_logo-64x32.png new file mode 100644 index 0000000..0251a60 Binary files /dev/null and b/org.rtems.cdt/icons/rtems_logo-64x32.png differ diff --git a/org.rtems.cdt/icons/rtems_logo-64x64.png b/org.rtems.cdt/icons/rtems_logo-64x64.png new file mode 100644 index 0000000..0a440c5 Binary files /dev/null and b/org.rtems.cdt/icons/rtems_logo-64x64.png differ diff --git a/org.rtems.cdt/icons/rtems_logo.png b/org.rtems.cdt/icons/rtems_logo.png new file mode 100644 index 0000000..ddd0bae Binary files /dev/null and b/org.rtems.cdt/icons/rtems_logo.png differ diff --git a/org.rtems.cdt/plugin.xml b/org.rtems.cdt/plugin.xml index 9eabb6a..d141430 100644 --- a/org.rtems.cdt/plugin.xml +++ b/org.rtems.cdt/plugin.xml @@ -386,4 +386,24 @@ + + + + + + diff --git a/org.rtems.cdt/src/org/rtems/cdt/preferences/PreferencePage.java b/org.rtems.cdt/src/org/rtems/cdt/preferences/PreferencePage.java index c56379a..de9cb5d 100644 --- a/org.rtems.cdt/src/org/rtems/cdt/preferences/PreferencePage.java +++ b/org.rtems.cdt/src/org/rtems/cdt/preferences/PreferencePage.java @@ -25,6 +25,7 @@ package org.rtems.cdt.preferences; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.preference.DirectoryFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; +import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.IWorkbench; import org.rtems.cdt.Activator; @@ -37,6 +38,7 @@ public class PreferencePage super( GRID); setPreferenceStore( Activator.getDefault().getPreferenceStore()); setDescription( "Select the RTEMS base installation path and the board support package (BSP) installation path. This provides the default values for all projects."); + setImageDescriptor(Activator.imageDescriptorFromPlugin("org.rtems.cdt", "icons/rtems_logo-64x64.png")); } public void createFieldEditors() { diff --git a/org.rtems.cdt/templates/hello/src/init.c b/org.rtems.cdt/templates/hello/src/init.c new file mode 100644 index 0000000..e02a23c --- /dev/null +++ b/org.rtems.cdt/templates/hello/src/init.c @@ -0,0 +1,36 @@ +/* Init + * + * This routine is the initialization task for this test program. + * It is called from init_exec and has the responsibility for creating + * and starting the tasks that make up the test. If the time of day + * clock is required for the test, it should also be set to a known + * value by this function. + * + * Input parameters: NONE + * + * Output parameters: NONE + * + * COPYRIGHT (c) 1989-1999. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * + * $Id$ + */ + +#define CONFIGURE_INIT +#include "system.h" +#include +#include + +rtems_task Init( + rtems_task_argument ignored +) +{ + printf( "\n\n*** HELLO WORLD TEST ***\n" ); + printf( "Hello World\n" ); + printf( "*** END OF HELLO WORLD TEST ***\n" ); + exit( 0 ); +} diff --git a/org.rtems.cdt/templates/hello/src/system.h b/org.rtems.cdt/templates/hello/src/system.h new file mode 100644 index 0000000..a4ac1a5 --- /dev/null +++ b/org.rtems.cdt/templates/hello/src/system.h @@ -0,0 +1,40 @@ +/* system.h + * + * This include file contains information that is included in every + * function in the test set. + * + * COPYRIGHT (c) 1989-1999. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * + * $Id$ + */ + +#include + +/* functions */ + +rtems_task Init( + rtems_task_argument argument +); + +/* configuration information */ + +#include /* for device driver prototypes */ + +/* NOTICE: the clock driver is explicitly disabled */ +#define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 1 + +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE + +#define CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM + +#include + +/* end of include file */ diff --git a/org.rtems.cdt/templates/hello/template.properties b/org.rtems.cdt/templates/hello/template.properties new file mode 100644 index 0000000..af22a9e --- /dev/null +++ b/org.rtems.cdt/templates/hello/template.properties @@ -0,0 +1,3 @@ +#Template Default Values +RTEMS.Hello.Template.Label=RTEMS Hello-World Project +RTEMS.Hello.Template.Label.Description=The prototypical "Hello World" project. Creates a single folder for sources. diff --git a/org.rtems.cdt/templates/hello/template.xml b/org.rtems.cdt/templates/hello/template.xml new file mode 100644 index 0000000..5feb599 --- /dev/null +++ b/org.rtems.cdt/templates/hello/template.xml @@ -0,0 +1,51 @@ + + + -- cgit v1.2.3