mingw-cvs Mailing List for MinGW - Minimalist GNU for Windows

Update of /cvsroot/mingw/MinGW
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18530

Modified Files:
      Tag: MinGW-5_1_4
	ChangeLog MinGW_LICENSE.rtf mingw.nsi 
Log Message:
Support installation of MinGW Runtime from new distribution, with separate development and DLL components.


Index: MinGW_LICENSE.rtf
===================================================================
RCS file: /cvsroot/mingw/MinGW/Attic/MinGW_LICENSE.rtf,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -C2 -d -r1.7 -r1.7.4.1
*** MinGW_LICENSE.rtf	13 May 2008 00:32:56 -0000	1.7
--- MinGW_LICENSE.rtf	21 Aug 2009 21:06:35 -0000	1.7.4.1
***************
*** 2,6 ****
  {\colortbl ;\red0\green0\blue255;}
  \viewkind4\uc1\pard\nowidctlpar\qc\b\f0\fs28 Minimal GNU for Windows\par
! \i\fs24 Version 5.1.4\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.5\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/Attic/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.15.4.1
diff -C2 -d -r1.15 -r1.15.4.1
*** ChangeLog	14 May 2008 22:43:23 -0000	1.15
--- ChangeLog	21 Aug 2009 21:06:35 -0000	1.15.4.1
***************
*** 1,2 ****
--- 1,18 ----
+ 2009.08.21  Keith Marshall  <kei...@us...>
+ 
+ 	Support installation of MinGW Runtime from new distribution,
+ 	with separate development and DLL components.
+ 
+ 	* mingw.nsi (PRODUCT_VERSION): Increment to 5.1.5.
+ 	(runtimeDLL): New variable; declare it; assign to...
+ 	(SecRuntimeDLL): ...this new section; process it.
+ 	(INIfiles): Update all references; make them match...
+ 	(inifiles): ...this actual directory name.
+ 
+ 	* MinGW_LICENSE.rtf: Update for new PRODUCT_VERSION.
+ 
+ 	* mingw.ini (Filename): Update to match PRODUCT_VERSION.
+ 	(runtimeDLL): Assign it.
+ 
  2008.05.14  Chris Sutcliffe  <ir0...@us...>
  

Index: mingw.nsi
===================================================================
RCS file: /cvsroot/mingw/MinGW/Attic/mingw.nsi,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -C2 -d -r1.9 -r1.9.4.1
*** mingw.nsi	13 May 2008 00:32:56 -0000	1.9
--- mingw.nsi	21 Aug 2009 21:06:35 -0000	1.9.4.1
***************
*** 7,11 ****
  ; HM NIS Edit Wizard helper defines
  !define PRODUCT_NAME "MinGW"
! !define PRODUCT_VERSION "5.1.4"
  !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.5"
  !define PRODUCT_PUBLISHER "MinGW"
  !define PRODUCT_WEB_SITE "http://www.mingw.org"
***************
*** 111,114 ****
--- 111,115 ----
  
  var runtime
+ var runtimeDLL
  var W32API
  var binutils
***************
*** 129,132 ****
--- 130,136 ----
      SectionIn 1 2 3
    SectionEnd
+   Section runtime SecRuntimeDLL
+     SectionIn 1 2 3
+   SectionEnd
    Section w32api SecW32API
      SectionIn 1 2
***************
*** 169,172 ****
--- 173,180 ----
    Call DownloadIfNeeded
  
+   push ${SecRuntimeDLL}
+   push $runtimeDLL
+   Call DownloadIfNeeded
+ 
    push ${SecW32API}
    push $W32API
***************
*** 210,214 ****
    
    CreateDirectory $INSTDIR
!   File / INIfiles\installed.ini
  
    WriteINIStr $INSTDIR\installed.ini "settings"  "installtype" $Package
--- 218,222 ----
    
    CreateDirectory $INSTDIR
!   File / inifiles\installed.ini
  
    WriteINIStr $INSTDIR\installed.ini "settings"  "installtype" $Package
***************
*** 220,223 ****
--- 228,236 ----
    Call ExtractTarball
  
+   push ${SecRuntimeDLL}
+   push $runtimeDLL
+   push "runtimeDLL"
+   Call ExtractTarball
+ 
    push ${SecW32API}
    push $W32API
***************
*** 359,363 ****
  extractINI:
    ; extract built in ini file
!   File / INIfiles\mingw.ini
    ReadINIStr $R1 "$EXEDIR\mingw.ini" "mingw" "Build"
  
--- 372,376 ----
  extractINI:
    ; extract built in ini file
!   File / inifiles\mingw.ini
    ReadINIStr $R1 "$EXEDIR\mingw.ini" "mingw" "Build"
  
***************
*** 419,422 ****
--- 432,436 ----
  first_install:
    SectionSetText ${SecRuntime} ""
+   SectionSetText ${SecRuntimeDLL} ""
    SectionSetText ${SecW32API} ""
    SectionSetText ${SecBinutils} ""
***************
*** 650,653 ****
--- 664,675 ----
    SectionSetSize ${SecRuntime} $R1
  
+   ReadINIStr $R0 "$EXEDIR\mingw.ini" $Package "runtimeDLL"
+   ${If} $R0 == ""
+     ReadINIStr $R0 "$EXEDIR\mingw.ini" current "runtimeDLL"
+   ${EndIf}
+   ${StrTok} $runtimeDLL $R0 "|" 0 0
+   ${StrTok} $R1 $R0 "|" 1 0
+   SectionSetSize ${SecRuntimeDLL} $R1
+ 
    ReadINIStr $R0 "$EXEDIR\mingw.ini" $Package "w32api"
    ${If} $R0 == ""
***************
*** 718,721 ****
--- 740,749 ----
    call CheckVersion
    
+   ReadINIStr $R0 "$INSTDIR\installed.ini" "components" "runtimeDLL"
+   push $R0
+   push $runtimeDLL
+   push ${SecRuntimeDLL}
+   call CheckVersion
+   
    ReadINIStr $R0 "$INSTDIR\installed.ini" "components" "w32api"
    push $R0

Update of /cvsroot/mingw/MinGW/inifiles
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18530/inifiles

Modified Files:
      Tag: MinGW-5_1_4
	mingw.ini 
Log Message:
Support installation of MinGW Runtime from new distribution, with separate development and DLL components.


Index: mingw.ini
===================================================================
RCS file: /cvsroot/mingw/MinGW/inifiles/Attic/mingw.ini,v
retrieving revision 1.19
retrieving revision 1.19.4.1
diff -C2 -d -r1.19 -r1.19.4.1
*** mingw.ini	14 May 2008 22:43:23 -0000	1.19
--- mingw.ini	21 Aug 2009 21:06:35 -0000	1.19.4.1
***************
*** 2,12 ****
  Build=11
  URL=http://prdownloads.sourceforge.net/mingw
! Filename=MinGW-5.1.4.exe
  packages=previous|current|candidate
  
  [current]
! runtime=mingw-runtime-3.14.tar.gz|6500
! w32api=w32api-3.11.tar.gz|14500
! binutils=binutils-2.17.50-20060824-1.tar.gz|21940
  core=gcc-core-3.4.5-20060117-3.tar.gz|7712
  gpp=gcc-g++-3.4.5-20060117-3.tar.gz|15480
--- 2,13 ----
  Build=11
  URL=http://prdownloads.sourceforge.net/mingw
! Filename=MinGW-5.1.5.exe
  packages=previous|current|candidate
  
  [current]
! runtime=mingwrt-3.15.2-mingw32-dev.tar.gz|7616
! runtimeDLL=mingwrt-3.15.2-mingw32-dll.tar.gz|40
! w32api=w32api-3.13-mingw32-dev.tar.gz|14420
! binutils=binutils-2.19.1-mingw32-bin.tar.gz|21093
  core=gcc-core-3.4.5-20060117-3.tar.gz|7712
  gpp=gcc-g++-3.4.5-20060117-3.tar.gz|15480
***************
*** 18,24 ****
  
  [previous]
! runtime=mingw-runtime-3.13.tar.gz|5420
! w32api=w32api-3.10.tar.gz|14490
! binutils=binutils-2.16.91-20060119-1.tar.gz|15850
  core=gcc-core-3.4.2-20040916-1.tar.gz|8627
  gpp=gcc-g++-3.4.2-20040916-1.tar.gz|16542
--- 19,25 ----
  
  [previous]
! runtime=mingw-runtime-3.14.tar.gz|6500
! w32api=w32api-3.11.tar.gz|14500
! binutils=binutils-2.17.50-20060824-1.tar.gz|21940
  core=gcc-core-3.4.2-20040916-1.tar.gz|8627
  gpp=gcc-g++-3.4.2-20040916-1.tar.gz|16542