2007-08-20 Chris Johns <chisj@rtems.org>

        * filewrite.nsi, getparameters.nsi, instance-check.nsi,
        mingw-path.nsi, sm-dummy.nsi, strslash.nsi, strstr.nsi,
        options.nsi: Added the shared between the 2 installer scripts.

        * msys-path.nsi: Fixed the last LF bug.

        * rtems-autotools.nsi, rtems-tools.nsi: Fixed the instance check,
        added a start menu, remove pages from target installers.

        * rtems.ini: Fixed the URL links. Added support link.

        * rtems_logo.bmp: Trimmed a little more to get a better image.

        * ba-wrap.sh: Stop on a error.

        * build-exes.sh: Use the option parameter variables. Change the
        order the section appear in the installer.

1 files changed, 49 insertions, 32 deletions

diff --git a/contrib/mingw/rtems.ini b/contrib/mingw/rtems.ini
index d4a0185daa..225ae371aa 100644
--- a/contrib/mingw/rtems.ini
+++ b/contrib/mingw/rtems.ini
@@ -7,15 +7,15 @@
 ;
 
 [Settings]
-NumFields=8
+NumFields=10
 
 [Field 1]
 Type=Label
-Text=RTEMS Tools for Windows is a set of MinGW tools suitable for compiling RTEMS and RTEMS applications. You should install download and install the MinGW runtime and if you wish to build RTEMS and if you need autoconf or automake support the MSYS and MSYS DTK packages as well. You can find the MinGW and MSYS installers on the MinGW web site.\r\n\r\nFurther information and the source code with patches can be located via the Wiki.
+Text=RTEMS Tools for Windows is a set of MinGW tools suitable for compiling RTEMS and RTEMS applications. You should download and install the MinGW runtime and if you wish to build RTEMS or if you need autoconf or automake support the MSYS and MSYS DTK packages as well. You can find the MinGW and MSYS installers on the MinGW web site under the link below.\r\n\r\nFurther information and the source code with patches can be located via the Wiki.
 Left=0
 Right=292
-Top=25
-Bottom=87
+Top=15
+Bottom=74
 
 [Field 2]
 Type=Label
@@ -29,50 +29,67 @@ Bottom=12
 Type=Link
 Text=http://www.rtems.org/wiki/index.php/MinGW_Tools_for_Windows
 State=http://www.rtems.org/wiki/index.php/MinGW_Tools_for_Windows
-Left=71
-Right=292
-Top=100
-Bottom=108
+Left=50
+Right=271
+Top=117
+Bottom=125
 
 [Field 4]
 Type=Link
-Text=http://www.rtems.org/
-State=http://www.rtems.org/
-Left=71
-Right=187
-Top=89
+Text=http://www.rtems.org/support.html
+State=http://www.rtems.org/support.html
+Left=78
+Right=217
+Top=91
 Bottom=99
 
 [Field 5]
 Type=Link
+Text=http://www.rtems.org/
+State=http://www.rtems.org/
+Left=50
+Right=166
+Top=106
+Bottom=116
+
+[Field 6]
+Type=Link
 Text=http://www.mingw.org/
 State=http://www.mingw.org/
-Left=71
-Right=196
-Top=112
-Bottom=120
+Left=50
+Right=175
+Top=127
+Bottom=135
 
-[Field 6]
+[Field 7]
 Type=Label
-Text=RTEMS Website
-Left=2
-Right=65
-Top=89
-Bottom=97
+Text=RTEMS
+Left=16
+Right=44
+Top=106
+Bottom=114
 
-[Field 7]
+[Field 8]
 Type=Label
 Text=Tools Wiki
-Left=2
+Left=6
 Right=46
-Top=101
-Bottom=109
+Top=116
+Bottom=124
 
-[Field 8]
+[Field 9]
 Type=Label
 Text=MinGW Website
-Left=2
-Right=57
-Top=112
-Bottom=120
+Left=18
+Right=45
+Top=127
+Bottom=135
+
+[Field 10]
+Type=Label
+Text=Professional RTEMS Support is available from OAR. Contact them for a quote.
+Left=8
+Right=292
+Top=78
+Bottom=88