Changeset 598aab1f in rtems


Ignore:
Timestamp:
Aug 20, 2007, 2:12:48 AM (13 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
a23427e
Parents:
b11f3a6
Message:

2007-08-20 Chris Johns <chisj@…>

  • 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.
Location:
contrib/mingw
Files:
8 added
8 edited

Legend:

Unmodified
Added
Removed
  • contrib/mingw/ChangeLog

    rb11f3a6 r598aab1f  
     12007-08-20      Chris Johns <chisj@rtems.org>
     2
     3        * filewrite.nsi, getparameters.nsi, instance-check.nsi,
     4        mingw-path.nsi, sm-dummy.nsi, strslash.nsi, strstr.nsi,
     5        options.nsi: Added the shared between the 2 installer scripts.
     6       
     7        * msys-path.nsi: Fixed the last LF bug.
     8
     9        * rtems-autotools.nsi, rtems-tools.nsi: Fixed the instance check,
     10        added a start menu, remove pages from target installers.
     11       
     12        * rtems.ini: Fixed the URL links. Added support link.
     13
     14        * rtems_logo.bmp: Trimmed a little more to get a better image.
     15       
     16        * ba-wrap.sh: Stop on a error.
     17
     18        * build-exes.sh: Use the option parameter variables. Change the
     19        order the section appear in the installer.
     20       
    1212007-08-03      Chris Johns <chisj@rtems.org>
    222        * rtems_logo.bmp: Clipped to get the correct proportions
  • contrib/mingw/ba-wrap.sh

    rb11f3a6 r598aab1f  
    1313$source/build-autotools.sh $* 2>&1 >> $source/at-log.txt
    1414ec=$?
     15if [ $ec -ne 0 ]; then
     16  echo "ERROR: code '$ec'. Press Any Key to continue"
     17  read
     18fi
    1519exit $ec
  • contrib/mingw/build-exes.sh

    rb11f3a6 r598aab1f  
    171171  echo " ${t}_found:" >> $of
    172172  echo "  DetailPrint \"Installing: \$1\"" >> $of
    173   echo "  ExecWait '\"\$1\" /S /D=\$INSTDIR' \$0" >> $of
     173  echo "  ExecWait '\"\$1\" \$SilentOption \$DebugOption /D=\$INSTDIR' \$0" >> $of
    174174  echo "  BringToFront" >> $of
    175175  echo "  IntCmp \$0 0 +3" >> $of
     
    368368
    369369   echo "!include \"$treloc/rtems-files.nsi\"" >> $of
    370    echo "!include \"$source/rtems-tools.nsi\"" >> $of
     370   echo "!include \"$source/options.nsi\"" >> $of
    371371
    372372   if [ $n = $common_label ]; then
    373373     echo "!include \"$relocation/rtems-sections.nsi\"" >> $of
    374374   fi
     375
     376   echo "!include \"$source/rtems-tools.nsi\"" >> $of
    375377
    376378   echo "cp $source/rtems.ini $treloc/rtems.ini"
  • contrib/mingw/msys-path.nsi

    rb11f3a6 r598aab1f  
     1;
     2; $Id$
     3;
     4; RTEMS Tools Installer.
     5;
     6; Copyright Chris Johns (chrisj@rtems.org)
     7;
     8
     9!include "${RTEMS_SOURCE}/strslash.nsi"
     10
    111Function MsysPath
    212  Push $R0
     
    108118  Exch $R0
    109119FunctionEnd
     120
     121Function MSYSFstabUpdate
     122 Call MSYSDetectSilent
     123 Pop $R0
     124 Push $R0
     125 Push $INSTDIR
     126 Push '\\'
     127 Pop $R0
     128 Call StrSlash
     129 Pop $R1
     130 Pop $R0
     131 DetailPrint "Setting MSYS fstab: $R1 -> /opt/rtems-${PRODUCT_VERSION}"
     132 StrCpy $R1 "$R1 /opt/rtems-${PRODUCT_VERSION}$\n"
     133 FileOpen $9 "$R0\etc\fstab" a
     134 ifErrors 0 +3
     135   MessageBox MB_OK "Cannot open $R0\etc\fstab. MSYS mount point not added."
     136   Goto Close
     137 FileSeek $9 0 SET
     138ReadLoop:
     139 FileRead $9 $R2
     140 ifErrors Append
     141 StrCmp $R1 $R2 Close ReadLoop
     142Append:
     143 FileSeek $9 0 END
     144 StrCpy $R2 $R2 1 -1
     145 StrCmp $R2 "$\n" +2 0
     146 FileWrite $9 "$\n"
     147 FileWrite $9 $R1
     148Close:
     149 FileClose $9
     150 ClearErrors
     151FunctionEnd
  • contrib/mingw/rtems-autotools.nsi

    rb11f3a6 r598aab1f  
    1313!define PRODUCT_PUBLISHER "RTEM Project Team"
    1414!define PRODUCT_WEB_SITE  "http://www.rtems.org/"
     15!define PRODUCT_TITLE     "${PRODUCT_NAME} ${PRODUCT_VERSION} (${RTEMS_TARGET})"
     16!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_TITLE}"
     17!define PRODUCT_UNINST_ROOT_KEY "HKLM"
     18!define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir"
    1519
    1620; MUI 1.66 compatible ------
     
    2731!define MUI_COMPONENTSPAGE_SMALLDESC
    2832
    29 ; Welcome page
    30 !insertmacro MUI_PAGE_WELCOME
    31 ; Details of what will happen.
    32 Page custom RTEMSMessage
    33 ; License page
    34 ;!define MUI_LICENSEPAGE_CHECKBOX
    35 !insertmacro MUI_PAGE_LICENSE "${RTEMS_LICENSE_FILE}"
    36 ; Components page
    37 !insertmacro MUI_PAGE_COMPONENTS
    38 ; Directory page
    39 !insertmacro MUI_PAGE_DIRECTORY
     33; Start Menu Support
     34!include "${RTEMS_SOURCE}/sm-dummy.nsi"
     35var smfolder
     36!define MUI_STARTMENUPAGE_DISABLE
     37!define MUI_STARTMENUPAGE_DEFAULTFOLDER "RTEMS ${PRODUCT_VERSION}"
     38!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
     39!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
     40!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}"
     41!insertmacro MUI_PAGE_STARTMENU_DUMMY Application $smfolder
     42
    4043; Instfiles page
    4144!insertmacro MUI_PAGE_INSTFILES
    42 ; Finish page
    43 !insertmacro MUI_PAGE_FINISH
    4445
    4546; Uninstaller pages
     
    6465BrandingText "RTEMS ${RTEMS_TARGET} Tools v${PRODUCT_VERSION}"
    6566AllowRootDirInstall false
    66 AutoCloseWindow false
     67AutoCloseWindow true
    6768CRCCheck force
    6869
     70!include "${RTEMS_SOURCE}/instance-check.nsi"
     71!include "${RTEMS_SOURCE}/mingw-path.nsi"
    6972!include "${RTEMS_SOURCE}/msys-path.nsi"
     73!include "${RTEMS_SOURCE}/options.nsi"
     74!include "${RTEMS_SOURCE}/filewrite.nsi"
    7075
    7176Section "RTEMS ${RTEMS_TARGET} Tools" SecTools
    7277 SetDetailsView show
    7378 AddSize ${RTEMS_TOOLS_SIZE}
     79
     80 Call MSYSFstabUpdate
    7481
    7582 /*
     
    118125 Call StrSlash
    119126 Pop $R0
    120  DetailPrint "Building autoconf. Command window closes automatically."
    121  ExecWait '"$9\bin\sh" --login -c "$R1 -p /opt/rtems-${PRODUCT_VERSION} -b $R2 -c $R0"' $0
     127 DetailPrint "Building automake. Command window closes automatically. Debug:$DebugScriptOption"
     128 ExecWait '"$9\bin\sh" --login -c "$R1 $DebugScriptOption -p /opt/rtems-${PRODUCT_VERSION} -b $R2 -c $R0"' $0
    122129 BringToFront
    123130 IntCmp $0 0 +3
     
    138145 Call StrSlash
    139146 Pop $R0
    140  DetailPrint "Building automake. Command window closes automatically."
    141  ExecWait '"$9\bin\sh" --login -c "$R1 -p /opt/rtems-${PRODUCT_VERSION} -b $R2 -c $R0"' $0
     147 DetailPrint "Building automake. Command window closes automatically. Debug:$DebugScriptOption"
     148 ExecWait '"$9\bin\sh" --login -c "$R1 $DebugScriptOption -p /opt/rtems-${PRODUCT_VERSION} -b $R2 -c $R0"' $0
    142149 BringToFront
    143150 IntCmp $0 0 +3
     
    154161SectionEnd
    155162
    156 !macro FILE_WRITE_LINE Handle Text
    157   FileWrite     ${Handle} `${Text}`
    158   FileWriteByte ${Handle} "13"
    159   FileWriteByte ${Handle} "10"
    160 !macroend
    161 
    162163Function .onInit
    163   ;Extract InstallOptions INI files
    164   !insertmacro MUI_INSTALLOPTIONS_EXTRACT "rtems.ini"
    165 FunctionEnd
    166 
    167 Function RTEMSMessage
    168 
    169   !insertmacro MUI_HEADER_TEXT \
    170                "RTEMS Tools (Autoconf/Automake)" \
    171                "A tool set for the RTEMS operating system."
    172 
    173   ;Display the Install Options dialog
    174 
    175   Push $R0
    176   Push $R1
    177   Push $R2
    178 
    179     InstallOptions::initDialog /NOUNLOAD "$PLUGINSDIR\rtems.ini"
    180     Pop $R0
    181 
    182     GetDlgItem $R1 $R0 1200 ;1200 + Field number - 1
    183     ;$R1 contains the HWND of the first field
    184     CreateFont $R2 "Tahoma" "8" "300"
    185     SendMessage $R1 ${WM_SETFONT} $R2 0
    186        
    187     GetDlgItem $R1 $R0 1201 ;1200 + Field number - 1
    188     ;$R1 contains the HWND of the first field
    189     CreateFont $R2 "Tahoma" "12" "700"
    190     SendMessage $R1 ${WM_SETFONT} $R2 0
    191        
    192     GetDlgItem $R1 $R0 1202 ;1200 + Field number - 1
    193     ;$R1 contains the HWND of the first field
    194     CreateFont $R2 "Tahoma" "8" "300"
    195     SendMessage $R1 ${WM_SETFONT} $R2 0
    196        
    197     GetDlgItem $R1 $R0 1203 ;1200 + Field number - 1
    198     ;$R1 contains the HWND of the first field
    199     CreateFont $R2 "Tahoma" "8" "300"
    200     SendMessage $R1 ${WM_SETFONT} $R2 0
    201        
    202     GetDlgItem $R1 $R0 1204 ;1200 + Field number - 1
    203     ;$R1 contains the HWND of the first field
    204     CreateFont $R2 "Tahoma" "8" "300"
    205     SendMessage $R1 ${WM_SETFONT} $R2 0
    206        
    207     GetDlgItem $R1 $R0 1205 ;1200 + Field number - 1
    208     ;$R1 contains the HWND of the first field
    209     CreateFont $R2 "Tahoma" "8" "300"
    210     SendMessage $R1 ${WM_SETFONT} $R2 0
    211        
    212     GetDlgItem $R1 $R0 1206 ;1200 + Field number - 1
    213     ;$R1 contains the HWND of the first field
    214     CreateFont $R2 "Tahoma" "8" "300"
    215     SendMessage $R1 ${WM_SETFONT} $R2 0
    216        
    217     InstallOptions::show
    218     Pop $R0
    219 
    220   Pop $R2
    221   Pop $R1
    222   Pop $R0
    223 
     164  ;Check if we are the correct instance for our mode.
     165  Call CheckInstance
     166  ;Handle the Command line options
     167  Call CheckSilent
     168  Call CheckDebug
     169  ;See if MinGW and MSYS are installed
     170  Call MinGWDetect
     171  Call MSYSDetect
    224172FunctionEnd
    225173
     
    324272FunctionEnd
    325273
    326 ; Push $filenamestring (e.g. 'c:\this\and\that\filename.htm')
    327 ; Push '\\'
    328 ; Pop $R0
    329 ; Call StrSlash
    330 ; Pop $R0
    331 ; ;Now $R0 contains 'c:/this/and/that/filename.htm'
    332 Function StrSlash
    333  Exch $R0
    334  Push $R1
    335  Push $R2
    336  StrCpy $R1 0
    337 loop:
    338   IntOp $R1 $R1 - 1
    339   StrCpy $R2 $R0 1 $R1
    340   StrCmp $R2 "" done
    341  StrCmp $R2 "\" 0 loop ;" keep to get Emacs for fontlock
    342   StrCpy $R2 $R0 $R1
    343    Push $R1
    344   IntOp $R1 $R1 + 1
    345   StrCpy $R1 $R0 "" $R1
    346  StrCpy $R0 "$R2/$R1"
    347    Pop $R1
    348   IntOp $R1 $R1 - 1
    349  Goto loop
    350 done:
    351  Pop $R2
    352  Pop $R1
    353  Exch $R0
    354 FunctionEnd
    355 
    356274Section -Post
    357275 StrCpy $R0 "$INSTDIR\rtems${PRODUCT_VERSION}-${RTEMS_BUILD_VERSION}-tools-${RTEMS_TARGET}-uninst.exe"
     276 StrCpy $R1 "RTEMS ${RTEMS_TARGET} Tools.lnk"
    358277 WriteUninstaller "$R0"
    359  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
     278 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_TITLE}" \
    360279                  "DisplayName" "$(^Name)"
    361  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
     280 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_TITLE}" \
    362281                  "UninstallString" "$R0"
    363  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
     282 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_TITLE}" \
    364283                  "DisplayVersion" "${PRODUCT_VERSION} Build-${RTEMS_BUILD_VERSION}"
    365  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
     284 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_TITLE}" \
    366285                  "URLInfoAbout" "${PRODUCT_WEB_SITE}"
    367  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
     286 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_TITLE}" \
    368287                  "Publisher" "${PRODUCT_PUBLISHER}"
     288 !insertmacro MUI_STARTMENU_GETFOLDER "Application" $R2
     289 !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
     290 CreateDirectory "$SMPROGRAMS\$R2"
     291 CreateDirectory "$SMPROGRAMS\$R2\Uninstall"
     292 CreateShortCut "$SMPROGRAMS\$R2\Uninstall\$R1" "$R0"
     293 !insertmacro MUI_STARTMENU_WRITE_END
    369294SectionEnd
    370295
    371296Section Uninstall
    372297 SetDetailsView show
    373  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
     298 DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_TITLE}"
    374299 DetailPrint "Delete the installed files"
    375300 Push "$INSTDIR\Uninstall\${RTEMS_AUTOCONF}-files"
     
    389314 RMDir "$INSTDIR\Packages\Source"
    390315 RMDir "$INSTDIR\Packages\Build"
     316 !insertmacro MUI_STARTMENU_GETFOLDER "Application" $smfolder
     317 Delete "$SMPROGRAMS\$smfolder\Uninstall\RTEMS ${RTEMS_TARGET} Tools.lnk"
    391318 Delete $INSTDIR\rtems${PRODUCT_VERSION}-${RTEMS_BUILD_VERSION}-tools-${RTEMS_TARGET}-uninst.exe
    392319 RMDir "$INSTDIR"
    393320 DetailPrint "All done."
    394  SetAutoClose false
     321 SetAutoClose true
    395322SectionEnd
  • contrib/mingw/rtems-tools.nsi

    rb11f3a6 r598aab1f  
    1313!define PRODUCT_PUBLISHER "RTEMS Project Team"
    1414!define PRODUCT_WEB_SITE  "http://www.rtems.org/"
     15!ifdef COMMON_FILES
     16!define PRODUCT_TITLE     "${PRODUCT_NAME} ${PRODUCT_VERSION} (Build ${RTEMS_BUILD_VERSION})"
     17!else
     18!define PRODUCT_TITLE     "${PRODUCT_NAME} ${PRODUCT_VERSION} (${RTEMS_TARGET})"
     19!endif
     20!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_TITLE}"
     21!define PRODUCT_UNINST_ROOT_KEY "HKLM"
     22!define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir"
    1523
    1624; MUI 1.66 compatible ------
     
    1826
    1927; MUI Settings
     28!define MUI_FUNCTION_GUIINIT
    2029!define MUI_ABORTWARNING
    2130!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
     
    2736!define MUI_COMPONENTSPAGE_SMALLDESC
    2837
     38!ifdef COMMON_FILES
    2939; Welcome page
    3040!insertmacro MUI_PAGE_WELCOME
     
    3242Page custom RTEMSMessage
    3343; License page
    34 ;!define MUI_LICENSEPAGE_CHECKBOX
    3544!insertmacro MUI_PAGE_LICENSE "${RTEMS_LICENSE_FILE}"
    3645; Components page
    3746!insertmacro MUI_PAGE_COMPONENTS
     47
    3848; Directory page
     49!define MUI_PAGE_HEADER_SUBTEXT "Choose the folder in which to install the RTEMS Tools."
     50!define MUI_DIRECTORYPAGE_TEXT_TOP "${PRODUCT_NAME} will install RTEMS Tools in the following directory. To install in a different folder click Browse and select another folder. Click Next to continue."
    3951!insertmacro MUI_PAGE_DIRECTORY
     52!endif
     53
     54; Start menu page
     55!ifndef COMMON_FILES
     56!include "${RTEMS_SOURCE}/sm-dummy.nsi"
     57!endif
     58var smfolder
     59!define MUI_STARTMENUPAGE_NODISABLE
     60!define MUI_STARTMENUPAGE_DEFAULTFOLDER "RTEMS ${PRODUCT_VERSION}"
     61!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
     62!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
     63!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}"
     64!ifdef COMMON_FILES
     65!insertmacro MUI_PAGE_STARTMENU Application $smfolder
     66!else
     67!insertmacro MUI_PAGE_STARTMENU_DUMMY Application $smfolder
     68!endif
     69
    4070; Instfiles page
    4171!insertmacro MUI_PAGE_INSTFILES
     72
     73!ifdef COMMON_FILES
    4274; Finish page
    4375!insertmacro MUI_PAGE_FINISH
     76!endif
    4477
    4578; Uninstaller pages
     
    5790!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
    5891
     92!ifdef COMMON_FILES
     93Name "${PRODUCT_NAME} ${PRODUCT_VERSION} (Build ${RTEMS_BUILD_VERSION})"
     94OutFile "${RTEMS_BINARY}/rtems${PRODUCT_VERSION}-tools-${RTEMS_BUILD_VERSION}.exe"
     95BrandingText "RTEMS Tools v${PRODUCT_VERSION}"
     96AutoCloseWindow false
     97!else
    5998Name "${PRODUCT_NAME} ${PRODUCT_VERSION} (${RTEMS_TARGET})"
    60 !ifdef COMMON_FILES
    61 OutFile "${RTEMS_BINARY}/rtems${PRODUCT_VERSION}-tools-${RTEMS_BUILD_VERSION}.exe"
    62 !else
    6399OutFile "${RTEMS_BINARY}/${RTEMS_OUTFILE}"
     100BrandingText "RTEMS ${RTEMS_TARGET} Tools v${PRODUCT_VERSION}"
     101AutoCloseWindow true
    64102!endif
    65103InstallDir "C:\opt\rtems-${PRODUCT_VERSION}"
    66104ShowInstDetails show
    67105ShowUnInstDetails show
    68 BrandingText "RTEMS ${RTEMS_TARGET} Tools v${PRODUCT_VERSION}"
    69106AllowRootDirInstall false
    70 AutoCloseWindow false
    71107CRCCheck force
    72108
     109!include "${RTEMS_SOURCE}/instance-check.nsi"
    73110!include "${RTEMS_SOURCE}/msys-path.nsi"
     111!include "${RTEMS_SOURCE}/options.nsi"
     112!include "${RTEMS_SOURCE}/filewrite.nsi"
    74113
    75114Section -SecFiles
     
    87126!endif
    88127
    89 !macro FILE_WRITE_LINE Handle Text
    90   FileWrite     ${Handle} `${Text}`
    91   FileWriteByte ${Handle} "13"
    92   FileWriteByte ${Handle} "10"
    93 !macroend
    94 
    95128Function .onInit
     129  ;Check if we are the correct instance for our mode.
     130  Call CheckInstance
    96131  ;Extract InstallOptions INI files
    97132  !insertmacro MUI_INSTALLOPTIONS_EXTRACT "rtems.ini"
     133  ;Handle the Command line options
     134  Call CheckSilent
     135  Call CheckDebug
     136  Call MSYSFstabUpdate
    98137FunctionEnd
    99138
    100139Function RTEMSMessage
    101 
    102140  !insertmacro MUI_HEADER_TEXT \
    103                "RTEMS Tools (${RTEMS_TARGET})" \
     141               "RTEMS Tools (Build ${RTEMS_BUILD_VERSION})" \
    104142               "A tool set for the RTEMS operating system."
    105143
     
    110148  Push $R2
    111149
    112     InstallOptions::initDialog /NOUNLOAD "$PLUGINSDIR\rtems.ini"
    113     Pop $R0
    114 
    115     GetDlgItem $R1 $R0 1200 ;1200 + Field number - 1
    116     ;$R1 contains the HWND of the first field
    117     CreateFont $R2 "Tahoma" "8" "300"
    118     SendMessage $R1 ${WM_SETFONT} $R2 0
    119        
    120     GetDlgItem $R1 $R0 1201 ;1200 + Field number - 1
    121     ;$R1 contains the HWND of the first field
    122     CreateFont $R2 "Tahoma" "12" "700"
    123     SendMessage $R1 ${WM_SETFONT} $R2 0
    124        
    125     GetDlgItem $R1 $R0 1202 ;1200 + Field number - 1
    126     ;$R1 contains the HWND of the first field
    127     CreateFont $R2 "Tahoma" "8" "300"
    128     SendMessage $R1 ${WM_SETFONT} $R2 0
    129        
    130     GetDlgItem $R1 $R0 1203 ;1200 + Field number - 1
    131     ;$R1 contains the HWND of the first field
    132     CreateFont $R2 "Tahoma" "8" "300"
    133     SendMessage $R1 ${WM_SETFONT} $R2 0
    134        
    135     GetDlgItem $R1 $R0 1204 ;1200 + Field number - 1
    136     ;$R1 contains the HWND of the first field
    137     CreateFont $R2 "Tahoma" "8" "300"
    138     SendMessage $R1 ${WM_SETFONT} $R2 0
    139        
    140     GetDlgItem $R1 $R0 1205 ;1200 + Field number - 1
    141     ;$R1 contains the HWND of the first field
    142     CreateFont $R2 "Tahoma" "8" "300"
    143     SendMessage $R1 ${WM_SETFONT} $R2 0
    144        
    145     GetDlgItem $R1 $R0 1206 ;1200 + Field number - 1
    146     ;$R1 contains the HWND of the first field
    147     CreateFont $R2 "Tahoma" "8" "300"
    148     SendMessage $R1 ${WM_SETFONT} $R2 0
    149        
    150     InstallOptions::show
    151     Pop $R0
    152 
     150  InstallOptions::initDialog /NOUNLOAD "$PLUGINSDIR\rtems.ini"
     151  Pop $R0
     152
     153  GetDlgItem $R1 $R0 1200 ;1200 + Field number - 1
     154  ;$R1 contains the HWND of the first field
     155  CreateFont $R2 "Tahoma" "8" "300"
     156  SendMessage $R1 ${WM_SETFONT} $R2 0
     157     
     158  GetDlgItem $R1 $R0 1201 ;1200 + Field number - 1
     159  ;$R1 contains the HWND of the first field
     160  CreateFont $R2 "Tahoma" "12" "700"
     161  SendMessage $R1 ${WM_SETFONT} $R2 0
     162     
     163  GetDlgItem $R1 $R0 1202 ;1200 + Field number - 1
     164  ;$R1 contains the HWND of the first field
     165  CreateFont $R2 "Tahoma" "8" "300"
     166  SendMessage $R1 ${WM_SETFONT} $R2 0
     167     
     168  GetDlgItem $R1 $R0 1203 ;1200 + Field number - 1
     169  ;$R1 contains the HWND of the first field
     170  CreateFont $R2 "Tahoma" "8" "300"
     171  SendMessage $R1 ${WM_SETFONT} $R2 0
     172     
     173  GetDlgItem $R1 $R0 1204 ;1200 + Field number - 1
     174  ;$R1 contains the HWND of the first field
     175  CreateFont $R2 "Tahoma" "8" "300"
     176  SendMessage $R1 ${WM_SETFONT} $R2 0
     177     
     178  GetDlgItem $R1 $R0 1205 ;1200 + Field number - 1
     179  ;$R1 contains the HWND of the first field
     180  CreateFont $R2 "Tahoma" "8" "300"
     181  SendMessage $R1 ${WM_SETFONT} $R2 0
     182     
     183  GetDlgItem $R1 $R0 1206 ;1200 + Field number - 1
     184  ;$R1 contains the HWND of the first field
     185  CreateFont $R2 "Tahoma" "8" "300"
     186  SendMessage $R1 ${WM_SETFONT} $R2 0
     187     
     188  InstallOptions::show
     189  Pop $R0
    153190  Pop $R2
    154191  Pop $R1
    155192  Pop $R0
    156 
    157193FunctionEnd
    158194
    159 ; Push $filenamestring (e.g. 'c:\this\and\that\filename.htm')
    160 ; Push '\\'
    161 ; Pop $R0
    162 ; Call StrSlash
    163 ; Pop $R0
    164 ; ;Now $R0 contains 'c:/this/and/that/filename.htm'
    165 Function StrSlash
    166  Exch $R0
    167  Push $R1
    168  Push $R2
    169  StrCpy $R1 0
    170 loop:
    171   IntOp $R1 $R1 - 1
    172   StrCpy $R2 $R0 1 $R1
    173   StrCmp $R2 "" done
    174  StrCmp $R2 "\" 0 loop  ; "
    175   StrCpy $R2 $R0 $R1
    176    Push $R1
    177   IntOp $R1 $R1 + 1
    178   StrCpy $R1 $R0 "" $R1
    179  StrCpy $R0 "$R2/$R1"
    180    Pop $R1
    181   IntOp $R1 $R1 - 1
    182  Goto loop
    183 done:
    184  Pop $R2
    185  Pop $R1
    186  Exch $R0
    187 FunctionEnd
    188 
    189195!ifdef COMMON_FILES
    190196Section -BatchFiles
    191  FileOpen $9 $INSTDIR\rtems.bat w
     197 FileOpen $9 $INSTDIR\rtems-env.bat w
    192198 !insertmacro FILE_WRITE_LINE $9 "@echo off"
    193199 !insertmacro FILE_WRITE_LINE $9 "rem RTEMS batch file: ${RTEMS_VERSION}-${RTEMS_BUILD_VERSION}"
     
    202208 FileClose $9
    203209
    204  FileOpen $9 $INSTDIR\rtems-cmd.bat w
     210 FileOpen $9 $INSTDIR\rtems.bat w
    205211 !insertmacro FILE_WRITE_LINE $9 "@echo off"
    206212 !insertmacro FILE_WRITE_LINE $9 "rem RTEMS batch file: ${RTEMS_VERSION}-${RTEMS_BUILD_VERSION}"
    207213 !insertmacro FILE_WRITE_LINE $9 "If $\"x%OS%x$\" == $\"xWindows_NTx$\" Goto WinNT"
    208  !insertmacro FILE_WRITE_LINE $9 "start command.com /e:4096 /k $INSTDIR\rtems.bat %1 %2 %3 %4"
     214 !insertmacro FILE_WRITE_LINE $9 "start command.com /e:4096 /k $INSTDIR\rtems-env.bat %1 %2 %3 %4"
    209215 !insertmacro FILE_WRITE_LINE $9 "exit"
    210216 !insertmacro FILE_WRITE_LINE $9 ":WinNT"
    211  !insertmacro FILE_WRITE_LINE $9 "start cmd.exe /k $INSTDIR\rtems.bat %1 %2 %3 %4"
     217 !insertmacro FILE_WRITE_LINE $9 "start cmd.exe /k $INSTDIR\rtems-env.bat %1 %2 %3 %4"
    212218 !insertmacro FILE_WRITE_LINE $9 "exit"
    213219 FileClose $9
     
    217223 !insertmacro FILE_WRITE_LINE $9 "rem RTEMS batch file: ${RTEMS_VERSION}-${RTEMS_BUILD_VERSION}"
    218224 !insertmacro FILE_WRITE_LINE $9 "rem We can only handle 9 parameters. More is too hard."
    219  !insertmacro FILE_WRITE_LINE $9 "call $INSTDIR\rtems.bat"
     225 !insertmacro FILE_WRITE_LINE $9 "call $INSTDIR\rtems-env.bat"
    220226 !insertmacro FILE_WRITE_LINE $9 "%1 %2 %3 %4 %5 %6 %7 %8 %9"
    221227 FileClose $9
     
    236242 FileClose $9
    237243SectionEnd
    238 
    239 Section -MSYSLinks
    240  Call MSYSDetectSilent
    241  Pop $R0
    242  ifFileExists "$R0\etc\fstab" 0 Done
    243   Push $R0
    244   Push $INSTDIR
    245   Push '\\'
    246   Pop $R0
    247   Call StrSlash
    248   Pop $R1
    249   Pop $R0
    250   DetailPrint "Setting MSYS fstab: $R1 -> /opt/rtems-${PRODUCT_VERSION}"
    251   StrCpy $R1 "$R1 /opt/rtems-${PRODUCT_VERSION}$\n"
    252   FileOpen $9 "$R0\etc\fstab" a
    253   ifErrors 0 +3
    254     MessageBox MB_OK "Cannot open $R0\etc\fstab. MSYS mount point no added."
    255     Goto Close
    256   FileSeek $9 0 SET
    257  ReadLoop:
    258   FileRead $9 $R2
    259   ifErrors Append
    260   StrCmp $R1 $R2 Close ReadLoop
    261  Append:
    262   FileSeek $9 0 END
    263   FileWrite $9 $R1
    264  Close:
    265   FileClose $9
    266  Done:
    267   ClearErrors
    268 SectionEnd
    269244!endif
    270245
     
    272247!ifdef COMMON_FILES
    273248 StrCpy $R0 "$INSTDIR\rtems${PRODUCT_VERSION}-${RTEMS_BUILD_VERSION}-tools-uninst.exe"
     249 StrCpy $R1 "RTEMS Tools.lnk"
    274250!else
    275251 StrCpy $R0 "$INSTDIR\rtems${PRODUCT_VERSION}-${RTEMS_BUILD_VERSION}-tools-${RTEMS_TARGET}-uninst.exe"
     252 StrCpy $R1 "RTEMS ${RTEMS_TARGET} Tools.lnk"
     253 !insertmacro MUI_STARTMENU_GETFOLDER "Application" $smfolder
    276254!endif
    277255 WriteUninstaller "$R0"
    278  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
     256 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_TITLE}" \
    279257                  "DisplayName" "$(^Name)"
    280  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
     258 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_TITLE}" \
    281259                  "UninstallString" "$R0"
    282  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
     260 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_TITLE}" \
    283261                  "DisplayVersion" "${PRODUCT_VERSION} Build-${RTEMS_BUILD_VERSION}"
    284  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
     262 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_TITLE}" \
    285263                  "URLInfoAbout" "${PRODUCT_WEB_SITE}"
    286  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
     264 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_TITLE}" \
    287265                  "Publisher" "${PRODUCT_PUBLISHER}"
     266 !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
     267 CreateDirectory "$SMPROGRAMS\$smfolder"
     268!ifdef COMMON_FILES
     269 SetOutPath $INSTDIR
     270 WriteIniStr "$INSTDIR\RTEMS.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
     271 WriteIniStr "$INSTDIR\RTEMS-Wiki.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}wiki"
     272 WriteIniStr "$INSTDIR\RTEMS-Documentation.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}onlinedocs/releases/rtemsdocs-4.7.99.2/share/rtems/html/"
     273 WriteIniStr "$INSTDIR\RTEMS-Support.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}support.html"
     274 CreateShortCut "$SMPROGRAMS\$smfolder\RTEMS Tools.lnk" "$INSTDIR\rtems.bat"
     275 CreateShortCut "$SMPROGRAMS\$smfolder\RTEMS Website.lnk" "$INSTDIR\RTEMS.url"
     276 CreateShortCut "$SMPROGRAMS\$smfolder\RTEMS Wiki.lnk" "$INSTDIR\RTEMS-Wiki.url"
     277 CreateShortCut "$SMPROGRAMS\$smfolder\RTEMS Documentation.lnk" "$INSTDIR\RTEMS-Documentation.url"
     278 CreateShortCut "$SMPROGRAMS\$smfolder\RTEMS Support.lnk" "$INSTDIR\RTEMS-Support.url"
     279!endif
     280 CreateDirectory "$SMPROGRAMS\$smfolder\Uninstall"
     281 CreateShortCut "$SMPROGRAMS\$smfolder\Uninstall\$R1" "$R0"
     282 !insertmacro MUI_STARTMENU_WRITE_END
    288283SectionEnd
    289284
    290285Function un.onInit
    291286 MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \
    292             "Are you sure you want to uninstall RTEMS Tools (${RTEMS_TARGET})?" IDYES +2
     287            "Are you sure you want to uninstall ${PRODUCT_TITLE} ?" IDYES +2
    293288 Abort
    294289FunctionEnd
     
    296291Section Uninstall
    297292 SetDetailsView show
    298  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
    299  DetailPrint "Delete the installed files"
    300  !insertmacro RTEMS_DELETE_FILES
     293 StrCpy $2 0
    301294!ifdef COMMON_FILES
    302295 FindFirst $0 $1 "$INSTDIR\rtems${PRODUCT_VERSION}-${RTEMS_BUILD_VERSION}-tools-*-uninst.exe"
    303296 Uninstall_Targets:
    304297  StrCmp $1 "" Uninstall_Targets_Done
     298  IntCmp $2 0 0 +3
     299  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \
     300             "You have tools installed. Are you sure you want to uninstall all RTEMS Tools ?" IDYES +2
     301    Abort
     302  StrCpy $2 1
    305303  DetailPrint "Uninstalling $1"
    306   ExecWait '"$INSTDIR\$1" /S'
     304  ExecWait '"$INSTDIR\$1" $SilentOption $DebugOption'
    307305  Delete $1
    308306  BringToFront
     
    311309 Uninstall_Targets_Done:
    312310 FindClose $0
     311!endif
     312 DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
     313 DetailPrint "Delete the installed files"
     314 !insertmacro RTEMS_DELETE_FILES
     315 !insertmacro MUI_STARTMENU_GETFOLDER "Application" $smfolder
     316!ifdef COMMON_FILES
    313317 Delete "$INSTDIR\AUTHORS"
    314318 Delete "$INSTDIR\COPYING"
    315319 Delete "$INSTDIR\README"
    316320 Delete "$INSTDIR\rtems.bat"
    317  Delete "$INSTDIR\rtems-cmd.bat"
     321 Delete "$INSTDIR\rtems-env.bat"
    318322 Delete "$INSTDIR\sh-run.bat"
    319323 Delete "$INSTDIR\vs-make.sh"
     324 Delete "$INSTDIR\RTEMS.url"
     325 Delete "$INSTDIR\RTEMS-Wiki.url"
     326 Delete "$INSTDIR\RTEMS-Documentation.url"
     327 Delete "$INSTDIR\RTEMS-Support.url"
     328 RMDir /r "$SMPROGRAMS\$smfolder"
    320329 Delete "$INSTDIR\rtems${PRODUCT_VERSION}-${RTEMS_BUILD_VERSION}-tools-uninst.exe"
    321330!else
     331 Delete "$SMPROGRAMS\$smfolder\Uninstall\RTEMS ${RTEMS_TARGET} Tools.lnk"
    322332 Delete "$INSTDIR\rtems${PRODUCT_VERSION}-${RTEMS_BUILD_VERSION}-tools-${RTEMS_TARGET}-uninst.exe"
    323  Delete "$INSTDIR\Packages"
    324333!endif
    325334 RMDir "$INSTDIR"
    326335 DetailPrint "All done."
     336!ifdef COMMON_FILES
    327337 SetAutoClose false
    328 SectionEnd
     338!else
     339 SetAutoClose true
     340!endif
     341SectionEnd
  • contrib/mingw/rtems.ini

    rb11f3a6 r598aab1f  
    88
    99[Settings]
    10 NumFields=8
     10NumFields=10
    1111
    1212[Field 1]
    1313Type=Label
    14 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.
     14Text=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.
    1515Left=0
    1616Right=292
    17 Top=25
    18 Bottom=87
     17Top=15
     18Bottom=74
    1919
    2020[Field 2]
     
    3030Text=http://www.rtems.org/wiki/index.php/MinGW_Tools_for_Windows
    3131State=http://www.rtems.org/wiki/index.php/MinGW_Tools_for_Windows
    32 Left=71
    33 Right=292
    34 Top=100
    35 Bottom=108
     32Left=50
     33Right=271
     34Top=117
     35Bottom=125
    3636
    3737[Field 4]
    3838Type=Link
    39 Text=http://www.rtems.org/
    40 State=http://www.rtems.org/
    41 Left=71
    42 Right=187
    43 Top=89
     39Text=http://www.rtems.org/support.html
     40State=http://www.rtems.org/support.html
     41Left=78
     42Right=217
     43Top=91
    4444Bottom=99
    4545
    4646[Field 5]
    4747Type=Link
     48Text=http://www.rtems.org/
     49State=http://www.rtems.org/
     50Left=50
     51Right=166
     52Top=106
     53Bottom=116
     54
     55[Field 6]
     56Type=Link
    4857Text=http://www.mingw.org/
    4958State=http://www.mingw.org/
    50 Left=71
    51 Right=196
    52 Top=112
    53 Bottom=120
    54 
    55 [Field 6]
    56 Type=Label
    57 Text=RTEMS Website
    58 Left=2
    59 Right=65
    60 Top=89
    61 Bottom=97
     59Left=50
     60Right=175
     61Top=127
     62Bottom=135
    6263
    6364[Field 7]
    6465Type=Label
    65 Text=Tools Wiki
    66 Left=2
    67 Right=46
    68 Top=101
    69 Bottom=109
     66Text=RTEMS
     67Left=16
     68Right=44
     69Top=106
     70Bottom=114
    7071
    7172[Field 8]
    7273Type=Label
     74Text=Tools Wiki
     75Left=6
     76Right=46
     77Top=116
     78Bottom=124
     79
     80[Field 9]
     81Type=Label
    7382Text=MinGW Website
    74 Left=2
    75 Right=57
    76 Top=112
    77 Bottom=120
     83Left=18
     84Right=45
     85Top=127
     86Bottom=135
    7887
     88[Field 10]
     89Type=Label
     90Text=Professional RTEMS Support is available from OAR. Contact them for a quote.
     91Left=8
     92Right=292
     93Top=78
     94Bottom=88
     95
Note: See TracChangeset for help on using the changeset viewer.