Menu
▾
▴
[MinGW-cvs] MinGW ChangeLog, 1.4, 1.5 MinGW_LICENSE.rtf, 1.3, 1.4 mingw.nsi, 1.5, 1.6
|
From: Earnie B. <ea...@us...> - 2006-11-30 14:03:28
|
Update of /cvsroot/mingw/MinGW In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17449 Modified Files: ChangeLog MinGW_LICENSE.rtf mingw.nsi Log Message: 2006.11.30 Earnie Boyd <ea...@us...> * MinGW_LICENSE.rtf: Update version. * mingw.nsi (PRODUCT_VERSION): Increment. (BUILD): Ditto. (LogicLib.nsh): Include to help improve flow logic. (packages): Set from mingw.ini file [mingw] section to aide in expandability of packages without rebuild. (runtime): Default to current section if selected section does not define it. (w32api): Ditto. (binutils): Ditto. (core): Ditto. * inifile/mingw.ini ([mingw]: Build): Increment. ([mingw]: Filename): Update to match version. ([mingw]: packages): New variable. ([candidate]): Remove runtime and w32api entries. * ChangeLog: Convert to UNIX line endings. Index: MinGW_LICENSE.rtf =================================================================== RCS file: /cvsroot/mingw/MinGW/MinGW_LICENSE.rtf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MinGW_LICENSE.rtf 12 Jun 2006 02:04:13 -0000 1.3 --- MinGW_LICENSE.rtf 30 Nov 2006 14:03:21 -0000 1.4 *************** *** 2,6 **** {\colortbl ;\red0\green0\blue255;} \viewkind4\uc1\pard\nowidctlpar\qc\b\f0\fs28 Minimal GNU for Windows\par ! \i\fs24 Version 5.0.3\par \cf1\ul\i0\f1\fs20 http://www.mingw.org/\cf0\ulnone\i\f0\fs24\par \pard\nowidctlpar\b0\i0\f1\fs20\par --- 2,6 ---- {\colortbl ;\red0\green0\blue255;} \viewkind4\uc1\pard\nowidctlpar\qc\b\f0\fs28 Minimal GNU for Windows\par ! \i\fs24 Version 5.1.1\par \cf1\ul\i0\f1\fs20 http://www.mingw.org/\cf0\ulnone\i\f0\fs24\par \pard\nowidctlpar\b0\i0\f1\fs20\par *************** *** 18,20 **** Ea...@us...\par } ! \ No newline at end of file --- 18,20 ---- Ea...@us...\par } ! Index: ChangeLog =================================================================== RCS file: /cvsroot/mingw/MinGW/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ChangeLog 30 Nov 2006 03:41:57 -0000 1.4 --- ChangeLog 30 Nov 2006 14:03:21 -0000 1.5 *************** *** 1,14 **** ! 2006.11.29 Earnie Boyd <ea...@us...> ! ! * inifiles/mingw.ini (Candidate): Re-add w32api and mingw-runtime ! entries. ! ! 2006.11.21 Earnie Boyd <ea...@us...> ! ! * mingw.nsi: Remove now sfhelper comment. ! Always show license page. ! Remove unused variables. ! Remove unused functions. ! Remove commented out code. ! Shorten extra long visual effect. ! * Dialogs/ShowMirror.ini: Remove Field 4. --- 1,33 ---- ! 2006.11.30 Earnie Boyd <ea...@us...> ! ! * MinGW_LICENSE.rtf: Update version. ! * mingw.nsi (PRODUCT_VERSION): Increment. ! (BUILD): Ditto. ! (LogicLib.nsh): Include to help improve flow logic. ! (packages): Set from mingw.ini file [mingw] section to aide in ! expandability of packages without rebuild. ! (runtime): Default to current section if selected section does not ! define it. ! (w32api): Ditto. ! (binutils): Ditto. ! (core): Ditto. ! * inifile/mingw.ini ([mingw]: Build): Increment. ! ([mingw]: Filename): Update to match version. ! ([mingw]: packages): New variable. ! ([candidate]): Remove runtime and w32api entries. ! * ChangeLog: Convert to UNIX line endings. ! ! 2006.11.29 Earnie Boyd <ea...@us...> ! ! * inifiles/mingw.ini (Candidate): Re-add w32api and mingw-runtime ! entries. ! ! 2006.11.21 Earnie Boyd <ea...@us...> ! ! * mingw.nsi: Remove now sfhelper comment. ! Always show license page. ! Remove unused variables. ! Remove unused functions. ! Remove commented out code. ! Shorten extra long visual effect. ! * Dialogs/ShowMirror.ini: Remove Field 4. Index: mingw.nsi =================================================================== RCS file: /cvsroot/mingw/MinGW/mingw.nsi,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mingw.nsi 21 Nov 2006 13:43:02 -0000 1.5 --- mingw.nsi 30 Nov 2006 14:03:21 -0000 1.6 *************** *** 7,11 **** ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "MinGW" ! !define PRODUCT_VERSION "5.1.0" !define PRODUCT_PUBLISHER "MinGW" !define PRODUCT_WEB_SITE "http://www.mingw.org" --- 7,11 ---- ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "MinGW" ! !define PRODUCT_VERSION "5.1.1" !define PRODUCT_PUBLISHER "MinGW" !define PRODUCT_WEB_SITE "http://www.mingw.org" *************** *** 13,17 **** !define PRODUCT_UNINST_ROOT_KEY "HKLM" !define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir" ! !define BUILD "7" SetCompressor lzma --- 13,17 ---- !define PRODUCT_UNINST_ROOT_KEY "HKLM" !define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir" ! !define BUILD "8" SetCompressor lzma *************** *** 21,24 **** --- 21,25 ---- !include "Sections.nsh" !include "StrFunc.nsh" + !include "LogicLib.nsh" ${StrTok} *************** *** 585,589 **** FunctionEnd - !define packages "previous|current|candidate" ;----------------------------------------------------------------------------- Function ChoosePackage --- 586,589 ---- *************** *** 591,594 **** --- 591,599 ---- IntCmp $Updating 1 updating +1 + ReadINIStr $R0 "$EXEDIR\mingw.ini" mingw "packages" + ${If} $packages == "" + !define packages "previous|current|candidate" + ${EndIf} + !insertmacro MUI_HEADER_TEXT "Choose Package" "Please select the MinGW package you wish to install." ; Display the page. *************** *** 610,613 **** --- 615,621 ---- updating: ReadINIStr $R0 "$EXEDIR\mingw.ini" $Package "runtime" + ${If} $runtime == "" + ReadINIStr $R0 "$EXEDIR\mingw.ini" current "runtime" + ${EndIf} ${StrTok} $runtime $R0 "|" 0 0 ${StrTok} $R1 $R0 "|" 1 0 *************** *** 615,618 **** --- 623,629 ---- ReadINIStr $R0 "$EXEDIR\mingw.ini" $Package "w32api" + ${If} $w32api == "" + ReadINIStr $R0 "$EXEDIR\mingw.ini" current "w32api" + ${EndIf} ${StrTok} $W32API $R0 "|" 0 0 ${StrTok} $R1 $R0 "|" 1 0 *************** *** 620,623 **** --- 631,637 ---- ReadINIStr $R0 "$EXEDIR\mingw.ini" $Package "binutils" + ${If} $binutils = "" + ReadINIStr $R0 "$EXEDIR\mingw.ini" current "binutils" + ${EndIf} ${StrTok} $binutils $R0 "|" 0 0 ${StrTok} $R1 $R0 "|" 1 0 *************** *** 625,628 **** --- 639,645 ---- ReadINIStr $R0 "$EXEDIR\mingw.ini" $Package "core" + ${If} $core == "" + ReadINIStr $R0 "$EXEDIR\mingw.ini" current "core" + ${EndIf} ${StrTok} $Core $R0 "|" 0 0 ${StrTok} $R1 $R0 "|" 1 0 |