Changeset 56f6b907 in rtems


Ignore:
Timestamp:
Aug 4, 2007, 6:24:12 AM (13 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
5332bc6e
Parents:
26ccaab0
Message:

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

  • rtems_logo.bmp: Clipped to get the correct proportions in the installer's header.
  • upload.sh: Install only the specific build installers.
  • rtems.ini: Change to show the actual web paths.
  • version: Build 15.
  • build-exes.sh, msys-path.nsi, rtems-autotools.nsi, rtems-tools.nsi: Fixed MSYS path detection. Fixed the uninstaller registry data. Changed the way the top level is generated. Now all the sections are added no matter what target is specified.
Location:
contrib/mingw
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • contrib/mingw/ChangeLog

    r26ccaab0 r56f6b907  
     12007-08-03      Chris Johns <chisj@rtems.org>
     2        * rtems_logo.bmp: Clipped to get the correct proportions
     3        in the installer's header.
     4
     5        * upload.sh: Install only the specific build installers.
     6
     7        * rtems.ini: Change to show the actual web paths.
     8
     9        * version: Build 15.
     10
     11        * build-exes.sh, msys-path.nsi, rtems-autotools.nsi,
     12        rtems-tools.nsi: Fixed MSYS path detection. Fixed the uninstaller
     13        registry data. Changed the way the top level is generated. Now all
     14        the sections are added no matter what target is specified.
     15
    1162007-07-28      Chris Johns <chisj@rtems.org>
    217        * README, build-rpms.sh, rtems.ini, build-exes.sh,
  • contrib/mingw/build-exes.sh

    r26ccaab0 r56f6b907  
    99#
    1010
    11 echo $*
     11echo $0 $*
    1212
    1313source=$(dirname $0)
     
    131131
    132132#
     133# Write target installer code.
     134#
     135# $1 - target
     136# $2 - target section test
     137# $3 - size of the tools
     138# $4 - Installer output file name
     139# $5 - Output file
     140#
     141target_installer_exec()
     142{
     143  local t=$1
     144  local tst=$2
     145  local size_in_k=$3
     146  local outfile=$4
     147  local of=$5
     148
     149  echo "" >> $of
     150  echo "; Target: $t" >> $of
     151  echo "Section \"${!tst}\" Section_$t" >> $of
     152  echo " AddSize $size_in_k" >> $of
     153  echo " StrCpy \$1 \$EXEDIR\\$outfile" >> $of
     154  echo " DetailPrint \"Checking for \$1\"" >> $of
     155  echo " IfFileExists \$1 ${t}_found" >> $of
     156  echo " StrCpy \$1 \$INSTDIR\\Packages\\$outfile" >> $of
     157  echo " DetailPrint \"Checking for \$1\"" >> $of
     158  echo " IfFileExists \$1 ${t}_found" >> $of
     159  echo "  SetOutPath \"\$INSTDIR\Packages\"" >> $of
     160  echo "  DetailPrint \"Downloading $rtems_url/$outfile\"" >> $of
     161  echo "  NSISdl::download $rtems_url/$outfile $outfile" >> $of
     162  echo "  Pop \$R0" >> $of
     163  echo "  StrCmp \$R0 \"success\" ${t}_found_2 ${t}_not_found_2" >> $of
     164  echo " ${t}_not_found_2:" >> $of
     165  echo "   SetDetailsView show" >> $of
     166  echo "   DetailPrint \"Download failed: \$R0\"" >> $of
     167  echo "   MessageBox MB_OK \"Download failed: \$R0\"" >> $of
     168  echo "   Goto ${t}_done" >> $of
     169  echo " ${t}_found_2:" >> $of
     170  echo "   Strcpy \$1 \"\$INSTDIR\\Packages\\$outfile\"" >> $of
     171  echo " ${t}_found:" >> $of
     172  echo "  DetailPrint \"Installing: \$1\"" >> $of
     173  echo "  ExecWait '\"\$1\" /S /D=\$INSTDIR' \$0" >> $of
     174  echo "  BringToFront" >> $of
     175  echo "  IntCmp \$0 0 +3" >> $of
     176  echo "   MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \"${!tst} install failed. Do you wish to continue ?\" IDYES +2" >> $of
     177  echo "   Abort" >> $of
     178  echo " ${t}_done:" >> $of
     179  echo "SectionEnd" >> $of
     180}
     181
     182#
     183# Get the size if kilo-bytes of the package as the listed files.
     184#
     185# $1 - relocation directory of installed files.
     186#
     187get_size_in_k()
     188{
     189  if [ ! -d $1 ]; then
     190    terminate "target directory not found: $1"
     191  fi
     192  if [ ! -f $1/files.txt ]; then
     193    terminate "target files not found: $1/files.txt"
     194  fi
     195
     196  local here=$(pwd)
     197  check "getting the current directory"
     198  cd $1
     199  check "changing directory: $1"
     200
     201  local size_in_k=$(du -c -k $(cat files.txt) | grep total | sed -e "s/\t.*//g")
     202  check "getting total size"
     203
     204  cd $here
     205  check "changing directory: $here"
     206
     207  echo $size_in_k
     208}
     209
     210#
    133211# Create the installer given the architecture and package.
    134212#
     
    136214# $2 - package
    137215# $3 - package name
     216# $4 - outfile
     217#
    138218create_installer()
    139219{
     
    141221  local t=$2
    142222  local n=$3
     223  local outfile=$4
    143224
    144225  rpm_options="--ignoreos --force --nodeps --noorder "
     
    174255   echo "$files" > $treloc/files.txt
    175256   check "write the file list"
     257
     258   size_in_k=$(get_size_in_k $treloc)
    176259
    177260   of=$treloc/rtems-files.nsi
     
    266349   check "make the RTEMS binary install point: $rtems_binary"
    267350
    268    outfile=rtems$version-tools-$n-$tool_build.exe
    269 
    270351   of=$treloc/rtems.nsi
    271352   echo "!define RTEMS_TARGET \"$n\"" > $of
     
    280361   echo "!define RTEMS_OUTFILE \"$outfile\"" >> $of
    281362   echo "!define TOOL_PREFIX \"$prefix\"" >> $of
     363   echo "!define RTEMS_TOOLS_SIZE \"$size_in_k\"" >> $of
    282364
    283365   if [ $n = $common_label ]; then
     
    296378   check "coping the dialog definition file: $treloc/rtems.ini"
    297379
    298    echo "makensis $of"
    299    $makensis $of
    300    check "making the installer: $of"
    301 
    302    if [ $n != $common_label ]; then
    303      of=$relocation/rtems-sections.nsi
    304      tst=${t}_section_text
    305      echo "" >> $of
    306      echo "; Target: $t" >> $of
    307      echo "Section \"${!tst}\" Section_$t" >> $of
    308      echo " StrCpy \$1 \$EXEDIR\\$outfile" >> $of
    309      echo " DetailPrint \"Checking for \$1\"" >> $of
    310      echo " IfFileExists \$1 ${t}_found" >> $of
    311      echo " StrCpy \$1 \$INSTDIR\\Packages\\$outfile" >> $of
    312      echo " DetailPrint \"Checking for \$1\"" >> $of
    313      echo " IfFileExists \$1 ${t}_found" >> $of
    314      echo "  SetOutPath \"\$INSTDIR\\Packages\"" >> $of
    315      echo "  DetailPrint \"Downloading $rtems_url/$outfile\"" >> $of
    316      echo "  NSISdl::download $rtems_url/$outfile $outfile" >> $of
    317      echo "  Pop \$R0" >> $of
    318      echo "  StrCmp \$R0 \"success\" ${t}_found_2 ${t}_not_found_2" >> $of
    319      echo " ${t}_not_found_2:" >> $of
    320      echo "   SetDetailsView show" >> $of
    321      echo "   DetailPrint \"Download failed: \$R0\"" >> $of
    322      echo "   MessageBox MB_OK \"Download failed: \$R0\"" >> $of
    323      echo "   Goto ${t}_done" >> $of
    324      echo " ${t}_found_2:" >> $of
    325      echo "   Strcpy \$1 \"\$INSTDIR\\Packages\\$outfile\"" >> $of
    326      echo " ${t}_found:" >> $of
    327      echo "  DetailPrint \"Installing: \$1\"" >> $of
    328      echo "  ExecWait '\"\$1\" /S'" >> $of
    329      echo "  BringToFront" >> $of
    330      echo " ${t}_done:" >> $of
    331      echo "SectionEnd" >> $of
    332    else
     380   if [ $n = $common_label ]; then
    333381     echo "Section -SecCommon" >> $of
    334382     echo " SetOutPath \"\$INSTDIR"\" >> $of
     
    338386     echo "SectionEnd" >> $of
    339387   fi
     388
     389   echo "makensis $of"
     390   $makensis $of
     391   check "making the installer: $of"
     392
    340393  fi
    341394}
     
    360413  $mkdir -p $rtems_binary
    361414  check "make the RTEMS binary install point: $rtems_binary"
     415
     416  size_in_k=2000
    362417
    363418  outfile=rtems$version-tools-$n-$tool_build.exe
     
    375430  echo "!define RTEMS_OUTFILE \"$outfile\"" >> $of
    376431  echo "!define TOOL_PREFIX \"$prefix\"" >> $of
     432  echo "!define RTEMS_TOOLS_SIZE \"$size_in_k\"" >> $of
    377433
    378434  . $source/autoconf.def
     
    421477  $makensis $of
    422478  check "making the installer: $of"
    423 
    424   of=$relocation/rtems-sections.nsi
    425   tst=${t}_section_text
    426   echo "" >> $of
    427   echo "; Target: $t" >> $of
    428   echo "Section \"${!tst}\" Section_$t" >> $of
    429   echo " StrCpy \$1 \$EXEDIR\\$outfile" >> $of
    430   echo " IfFileExists \$1 ${t}_found" >> $of
    431   echo "  SetOutPath \"\$INSTDIR\Packages\"" >> $of
    432   echo "  DetailPrint \"Downloading $rtems_url/$outfile\"" >> $of
    433   echo "  NSISdl::download $rtems_url/$outfile $outfile" >> $of
    434   echo "  Pop \$R0" >> $of
    435   echo "  StrCmp \$R0 \"success\" ${t}_found_2 ${t}_not_found_2" >> $of
    436   echo " ${t}_not_found_2:" >> $of
    437   echo "   SetDetailsView show" >> $of
    438   echo "   DetailPrint \"Download failed: \$R0\"" >> $of
    439   echo "   MessageBox MB_OK \"Download failed: \$R0\"" >> $of
    440   echo "   Goto ${t}_done" >> $of
    441   echo " ${t}_found_2:" >> $of
    442   echo "   Strcpy \$1 \"\$INSTDIR\\Packages\\$outfile\"" >> $of
    443   echo " ${t}_found:" >> $of
    444   echo "  DetailPrint \"Installing: \$1\"" >> $of
    445   echo "  ExecWait '\"\$1\" /S'" >> $of
    446   echo "  BringToFront" >> $of
    447   echo " ${t}_done:" >> $of
    448   echo "SectionEnd" >> $of
    449479}
    450480
     
    456486 echo "; Components based on each target." > $relocation/rtems-sections.nsi
    457487 create_autotools_installer noarch auto autotools
     488 target_installer_exec auto auto_section_text 2000 \
     489                       rtems$version-tools-autotools-$tool_build.exe \
     490                       $relocation/rtems-sections.nsi
    458491 for t in $targets
    459492 do
    460   create_installer $p $t $t
     493  create_installer $p $t $t rtems$version-tools-$t-$tool_build.exe
     494 done
     495 for t in $(cat $source/targets)
     496 do
     497  target_installer_exec $t ${t}_section_text \
     498                        $(get_size_in_k $relocation/$t) \
     499                        rtems$version-tools-$t-$tool_build.exe \
     500                        $relocation/rtems-sections.nsi
    461501 done
    462502 # Must be done last
    463  create_installer $p $common_label $common_label
     503 create_installer $p $common_label $common_label $version-tools-$tool_build.exe
    464504done
  • contrib/mingw/msys-path.nsi

    r26ccaab0 r56f6b907  
    4848  Pop $R0
    4949  ifErrors 0 +3
    50    MessageBox MB_OK "MSYS Not Installed. Please install MSYS."
     50   MessageBox MB_OK "MSYS Not Installed. Please install MSYS from http://www.mingw.org/"
    5151   Abort
    5252  DetailPrint "Checking Registry for MSYS DTK Installed Path"
     
    5454  Pop $R1
    5555  ifErrors 0 +3
    56    MessageBox MB_OK "MSYS DTK Not Installed. Please install MSYS DTK."
     56   MessageBox MB_OK "MSYS DTK Not Installed. Please install MSYS DTK from http://www.mingw.org/"
    5757   Abort
    5858  StrCmp $R0 $R1 +3 0
     
    6363  Pop $R0
    6464  StrCmp $R0 "ok" Found
    65    MessageBox MB_OK "MSYS Executable '$R0' not found. Please install."
     65   MessageBox MB_OK "MSYS Executable '$R0' not found. Please install from http://www.mingw.org/"
    6666   Abort
    6767 Found:
  • contrib/mingw/rtems-autotools.nsi

    r26ccaab0 r56f6b907  
    7171Section "RTEMS ${RTEMS_TARGET} Tools" SecTools
    7272 SetDetailsView show
     73 AddSize ${RTEMS_TOOLS_SIZE}
    7374
    7475 /*
     
    7778 Call MSYSDetect
    7879 Pop $9
    79 
     80 StrCmp $9 "not-found" 0 +3
     81  MessageBox MB_OK "Could not find a valid MSYS. Please install from http://www.mingw.org/"
     82  Abort
    8083 SetOutPath "$INSTDIR\Uninstall"
    8184 SetOutPath "$INSTDIR\Packages\Build"
     
    352355
    353356Section -Post
    354  WriteUninstaller "$INSTDIR\rtems${PRODUCT_VERSION}-${RTEMS_BUILD_VERSION}-tools-${RTEMS_TARGET}-uninst.exe"
     357 StrCpy $R0 "$INSTDIR\rtems${PRODUCT_VERSION}-${RTEMS_BUILD_VERSION}-tools-${RTEMS_TARGET}-uninst.exe"
     358 WriteUninstaller "$R0"
    355359 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
    356360                  "DisplayName" "$(^Name)"
    357361 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
    358                   "UninstallString" "$INSTDIR\uninst.exe"
    359  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
    360                   "DisplayVersion" "${PRODUCT_VERSION}"
     362                  "UninstallString" "$R0"
     363 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
     364                  "DisplayVersion" "${PRODUCT_VERSION} Build-${RTEMS_BUILD_VERSION}"
    361365 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
    362366                  "URLInfoAbout" "${PRODUCT_WEB_SITE}"
  • contrib/mingw/rtems-tools.nsi

    r26ccaab0 r56f6b907  
    7474
    7575Section -SecFiles
     76 AddSize ${RTEMS_TOOLS_SIZE}
    7677 !insertmacro RTEMS_INSTALL_FILES
    7778SectionEnd
     
    270271Section -Post
    271272!ifdef COMMON_FILES
    272  WriteUninstaller "$INSTDIR\rtems${PRODUCT_VERSION}-${RTEMS_BUILD_VERSION}-tools-uninst.exe"
     273 StrCpy $R0 "$INSTDIR\rtems${PRODUCT_VERSION}-${RTEMS_BUILD_VERSION}-tools-uninst.exe"
    273274!else
    274  WriteUninstaller "$INSTDIR\rtems${PRODUCT_VERSION}-${RTEMS_BUILD_VERSION}-tools-${RTEMS_TARGET}-uninst.exe"
    275 !endif
     275 StrCpy $R0 "$INSTDIR\rtems${PRODUCT_VERSION}-${RTEMS_BUILD_VERSION}-tools-${RTEMS_TARGET}-uninst.exe"
     276!endif
     277 WriteUninstaller "$R0"
    276278 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
    277279                  "DisplayName" "$(^Name)"
    278280 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
    279                   "UninstallString" "$INSTDIR\uninst.exe"
    280  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
    281                   "DisplayVersion" "${PRODUCT_VERSION}"
     281                  "UninstallString" "$R0"
     282 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
     283                  "DisplayVersion" "${PRODUCT_VERSION} Build-${RTEMS_BUILD_VERSION}"
    282284 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
    283285                  "URLInfoAbout" "${PRODUCT_WEB_SITE}"
  • contrib/mingw/rtems.ini

    r26ccaab0 r56f6b907  
    11;
     2
    23; $Id$
     4
    35; Ini file generated by the HM NIS Edit IO designer.
     6
    47;
     8
    59[Settings]
    6 NumFields=6
     10NumFields=8
    711
    812[Field 1]
    913Type=Label
    10 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 link below.
     14Text=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.
    1115Left=0
    1216Right=292
     
    1721Type=Label
    1822Text=RTEMS Tools for Windows
    19 Left=75
     23Left=74
    2024Right=297
    2125Top=0
     
    2428[Field 3]
    2529Type=Link
    26 Text=Source Code with patches
    27 State=http://www.rtems.org/ftp/pub/rtems/SOURCES
    28 Left=150
    29 Right=275
    30 Top=91
    31 Bottom=99
     30Text=http://www.rtems.org/wiki/index.php/MinGW_Tools_for_Windows
     31State=http://www.rtems.org/wiki/index.php/MinGW_Tools_for_Windows
     32Left=71
     33Right=292
     34Top=100
     35Bottom=108
    3236
    3337[Field 4]
    3438Type=Link
    35 Text=RTEMS MinGW Wiki Page
    36 State=http://www.rtems.org/wiki/index.php/MinGW_Tools_for_Windows
    37 Left=6
    38 Right=92
     39Text=http://www.rtems.org/
     40State=http://www.rtems.org/
     41Left=71
     42Right=187
     43Top=89
     44Bottom=99
     45
     46[Field 5]
     47Type=Link
     48Text=http://www.mingw.org/
     49State=http://www.mingw.org/
     50Left=71
     51Right=196
     52Top=112
     53Bottom=120
     54
     55[Field 6]
     56Type=Label
     57Text=RTEMS Website
     58Left=2
     59Right=65
     60Top=89
     61Bottom=97
     62
     63[Field 7]
     64Type=Label
     65Text=Tools Wiki
     66Left=2
     67Right=46
    3968Top=101
    4069Bottom=109
    4170
    42 [Field 5]
    43 Type=Link
    44 Text=RTEMS Home Page
    45 State=http://www.rtems.org/
    46 Left=6
    47 Right=122
    48 Top=89
    49 Bottom=99
     71[Field 8]
     72Type=Label
     73Text=MinGW Website
     74Left=2
     75Right=57
     76Top=112
     77Bottom=120
    5078
    51 [Field 6]
    52 Type=Link
    53 Text=MinGW Project Home Page
    54 State=http://www.mingw.org/
    55 Left=150
    56 Right=275
    57 Top=102
    58 Bottom=110
    59 
  • contrib/mingw/upload.sh

    r26ccaab0 r56f6b907  
    7979check "creating: ${ftpbase}/${version}/build-${tool_build}/source"
    8080
    81 exes=$(find $exebase -name \*.exe)
     81exes=$(find $exebase -name \*-${tool_build}.exe)
    8282for e in $exes
    8383do
  • contrib/mingw/version

    r26ccaab0 r56f6b907  
    11version=4.8
    2 tool_build=14
     2tool_build=15
Note: See TracChangeset for help on using the changeset viewer.