[prev in list] [next in list] [prev in thread] [next in thread]
List: mingw-cvs
Subject: MinGW-cvs Digest, Vol 20, Issue 3
From: mingw-cvs-request () lists ! sourceforge ! net
Date: 2009-09-24 21:43:00
Message-ID: mailman.911915.1253828580.21038.mingw-cvs () lists ! sourceforge ! net
[Download RAW message or body]
Send MinGW-cvs mailing list submissions to
mingw-cvs@lists.sourceforge.net
To subscribe or unsubscribe via the World Wide Web, visit
https://lists.sourceforge.net/lists/listinfo/mingw-cvs
or, via email, send a message with subject or body 'help' to
mingw-cvs-request@lists.sourceforge.net
You can reach the person managing the list at
mingw-cvs-owner@lists.sourceforge.net
When replying, please edit your Subject line so it is more specific
than "Re: Contents of MinGW-cvs digest..."
This list will notify you of updates to the code stored in CVS. Typically only \
developers with access to update the CVS are interested in this list. However, this \
list can be beneficial to see what is happening with your changes. If you wish to \
unsubscribe please do so at https://lists.sourceforge.net/lists/listinfo/mingw-cvs.
Today's Topics:
1. lpr-enhanced ChangeLog,1.2,1.3 Makefile.in,1.1,1.2
(Keith Marshall)
2. lpr-enhanced ChangeLog,1.3,1.4 Makefile.in,1.2,1.3
(Keith Marshall)
3. lpr-enhanced ChangeLog,1.4,1.5 Makefile.in,1.3,1.4
(Keith Marshall)
4. lpr-enhanced ChangeLog,1.5,1.6 Makefile.in,1.4,1.5
(Keith Marshall)
5. lpr-enhanced ChangeLog,1.6,1.7 (Keith Marshall)
6. MinGW ChangeLog, 1.9.2.1, 1.9.2.2 MinGW_LICENSE.rtf, 1.6.2.1,
1.6.2.2 mingw.nsi, 1.8.2.1, 1.8.2.2 (Keith Marshall)
7. MinGW/inifiles mingw.ini,1.12.2.3,1.12.2.4 (Keith Marshall)
----------------------------------------------------------------------
Message: 1
Date: Mon, 14 Sep 2009 21:18:50 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] lpr-enhanced ChangeLog,1.2,1.3
Makefile.in,1.1,1.2
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1MnIwk-00053q-E6@23jxhf1.ch3.sourceforge.com>
Update of /cvsroot/mingw/lpr-enhanced
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19409
Modified Files:
ChangeLog Makefile.in
Log Message:
Explicitly set `localstatedir' and `sysconfdir' for bindist staged installation.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/lpr-enhanced/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.in 11 Sep 2009 20:34:52 -0000 1.1
--- Makefile.in 14 Sep 2009 21:18:48 -0000 1.2
***************
*** 151,157 ****
$(MAKE) -$(MAKEFLAGS) prefix="" bindist-recursive
bindist-recursive:
rm -rf $(STAGED)
! $(MAKE) -$(MAKEFLAGS) prefix=`pwd`/$(STAGED) install-lpr-enhanced
cd $(STAGED)${bindir}; rm -f lp lpr
(cd $(STAGED); $(MK_TAR) *) | $(ZIPCMD) > $(DISTNAME)-bin.$(ZIPEXT)
--- 151,165 ----
$(MAKE) -$(MAKEFLAGS) prefix="" bindist-recursive
+ # To create a binary distribution, we perform a regular installation into
+ # a local staging directory, overriding the configured `prefix'; note that
+ # we must also override `localstatedir' and `sysconfdir', since these are
+ # likely to have been configured independently of `prefix'.
+ #
bindist-recursive:
rm -rf $(STAGED)
! $(MAKE) $(MFLAGS) prefix=`pwd`/$(STAGED) \
! localstatedir=`pwd`/$(STAGED)${localstatedir} \
! sysconfdir=`pwd`/$(STAGED)${sysconfdir} \
! install-lpr-enhanced
cd $(STAGED)${bindir}; rm -f lp lpr
(cd $(STAGED); $(MK_TAR) *) | $(ZIPCMD) > $(DISTNAME)-bin.$(ZIPEXT)
Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/lpr-enhanced/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ChangeLog 11 Sep 2009 20:34:52 -0000 1.2
--- ChangeLog 14 Sep 2009 21:18:48 -0000 1.3
***************
*** 1,2 ****
--- 1,7 ----
+ 2009-09-14 Charles Wilson <mingw@cwilson.fastmail.fm>
+
+ * Makefile.in (bindist-recursive): Explicitly set `localstatedir' and
+ `sysconfdir' for staged installation.
+
2009-09-11 Keith Marshall <keithmarshall@users.sourceforge.net>
------------------------------
Message: 2
Date: Tue, 15 Sep 2009 20:08:39 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] lpr-enhanced ChangeLog,1.3,1.4
Makefile.in,1.2,1.3
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1MneKN-0006ui-3D@23jxhf1.ch3.sourceforge.com>
Update of /cvsroot/mingw/lpr-enhanced
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26570
Modified Files:
ChangeLog Makefile.in
Log Message:
Eliminate redundant recursive makes.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/lpr-enhanced/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.in 14 Sep 2009 21:18:48 -0000 1.2
--- Makefile.in 15 Sep 2009 20:08:36 -0000 1.3
***************
*** 138,141 ****
--- 138,145 ----
STAGED = ./tmp
+ # The source distribution is created by replicating the distributable
+ # files from our working source directory, into an appropriately named
+ # local directory, and packaging that.
+ #
srcdist:
rm -rf ${SRC_DISTDIR}
***************
*** 148,154 ****
rm -rf ${SRC_DISTDIR}
- bindist: all
- $(MAKE) -$(MAKEFLAGS) prefix="" bindist-recursive
-
# To create a binary distribution, we perform a regular installation into
# a local staging directory, overriding the configured `prefix'; note that
--- 152,155 ----
***************
*** 156,160 ****
# likely to have been configured independently of `prefix'.
#
! bindist-recursive:
rm -rf $(STAGED)
$(MAKE) $(MFLAGS) prefix=`pwd`/$(STAGED) \
--- 157,161 ----
# likely to have been configured independently of `prefix'.
#
! bindist: all
rm -rf $(STAGED)
$(MAKE) $(MFLAGS) prefix=`pwd`/$(STAGED) \
***************
*** 166,173 ****
rm -rf $(STAGED)
licdist:
- $(MAKE) -$(MAKEFLAGS) prefix="" licdist-recursive
-
- licdist-recursive:
rm -rf $(STAGED)
$(MKDIR_P) $(STAGED)${DOC_DISTDIR}
--- 167,175 ----
rm -rf $(STAGED)
+ # Conversely, the licence and other documentation file distributions are
+ # created, by simply replicating the source files in an appropriately named
+ # local staging directory, much as for the source distribution.
+ #
licdist:
rm -rf $(STAGED)
$(MKDIR_P) $(STAGED)${DOC_DISTDIR}
***************
*** 180,186 ****
docdist:
- $(MAKE) -$(MAKEFLAGS) prefix="" docdist-recursive
-
- docdist-recursive:
rm -rf $(STAGED)
$(MKDIR_P) $(STAGED)${DOC_DISTDIR}
--- 182,185 ----
Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/lpr-enhanced/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ChangeLog 14 Sep 2009 21:18:48 -0000 1.3
--- ChangeLog 15 Sep 2009 20:08:35 -0000 1.4
***************
*** 1,2 ****
--- 1,9 ----
+ 2009-09-15 Keith Marshall <keithmarshall@users.sourceforge.net>
+
+ * Makefile.in (bindist, docdist, licdist): Construct distribution
+ tarballs directly, so eliminating...
+ (bindist-recursive, docdist-recursive, licdist-recursive): ...these
+ redundantly recursive goals respectively; remove them.
+
2009-09-14 Charles Wilson <mingw@cwilson.fastmail.fm>
------------------------------
Message: 3
Date: Tue, 15 Sep 2009 20:17:04 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] lpr-enhanced ChangeLog,1.4,1.5
Makefile.in,1.3,1.4
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1MneSW-00075x-RF@23jxhf1.ch3.sourceforge.com>
Update of /cvsroot/mingw/lpr-enhanced
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27216
Modified Files:
ChangeLog Makefile.in
Log Message:
Reorganise file assignment to documentation / licence distributions.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/lpr-enhanced/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.in 15 Sep 2009 20:08:36 -0000 1.3
--- Makefile.in 15 Sep 2009 20:17:02 -0000 1.4
***************
*** 23,28 ****
BIN_DISTFILES = lpr-enhanced example
! DOC_DISTFILES = README
! LIC_DISTFILES = AUTHORS COPYING
srcdir = @srcdir@
--- 23,28 ----
BIN_DISTFILES = lpr-enhanced example
! DOC_DISTFILES = README AUTHORS
! LIC_DISTFILES = COPYING
srcdir = @srcdir@
Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/lpr-enhanced/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ChangeLog 15 Sep 2009 20:08:35 -0000 1.4
--- ChangeLog 15 Sep 2009 20:17:02 -0000 1.5
***************
*** 1,4 ****
--- 1,11 ----
2009-09-15 Keith Marshall <keithmarshall@users.sourceforge.net>
+ Reorganise file assignment to documentation / licence distributions.
+
+ * Makefile.in (DOC_DISTFILES): Add `AUTHORS', removing it from...
+ (LIC_DISTFILES): ...this.
+
+ 2009-09-15 Keith Marshall <keithmarshall@users.sourceforge.net>
+
* Makefile.in (bindist, docdist, licdist): Construct distribution
tarballs directly, so eliminating...
------------------------------
Message: 4
Date: Tue, 15 Sep 2009 20:59:19 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] lpr-enhanced ChangeLog,1.5,1.6
Makefile.in,1.4,1.5
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1Mnf7P-00082g-9r@23jxhf1.ch3.sourceforge.com>
Update of /cvsroot/mingw/lpr-enhanced
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30898
Modified Files:
ChangeLog Makefile.in
Log Message:
Make `install' / `uninstall' procedures more robust.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/lpr-enhanced/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.in 15 Sep 2009 20:17:02 -0000 1.4
--- Makefile.in 15 Sep 2009 20:59:17 -0000 1.5
***************
*** 92,98 ****
#
install-lpr-basic:
! if test -e ${bindir}/lpr.exe; then \
! rm -f ${bindir}/lpr-basic.exe; \
! mv ${bindir}/lpr.exe ${bindir}/lpr-basic.exe; \
fi
--- 92,112 ----
#
install-lpr-basic:
! if test -f ${bindir}/lpr.exe; then \
! if test -f ${bindir}/lpr-basic.exe; then \
! if cmp ${bindir}/lpr.exe ${bindir}/lpr-basic.exe > /dev/null 2>&1; \
! then \
! if test -h ${bindir}/lpr-basic.exe; then \
! rm -f ${bindir}/lpr-basic.exe; \
! mv ${bindir}/lpr.exe ${bindir}/lpr-basic.exe; \
! else \
! rm -f ${bindir}/lpr.exe; \
! fi; \
! else \
! rm -f ${bindir}/lpr-orig.exe; \
! mv ${bindir}/lpr.exe ${bindir}/lpr-orig.exe; \
! fi; \
! else \
! mv ${bindir}/lpr.exe ${bindir}/lpr-basic.exe; \
! fi; \
fi
***************
*** 103,107 ****
cd ${bindir}; $(LN_S) lpr-enhanced lpr; $(LN_S) lpr-enhanced lp
$(INSTALL_DATA) example ${localstatedir}/spool/lp/config
! $(INSTALL_DATA) example ${sysconfdir}/printcap
# 'uninstall' reverses the effect of an `install', removing those files
--- 117,122 ----
cd ${bindir}; $(LN_S) lpr-enhanced lpr; $(LN_S) lpr-enhanced lp
$(INSTALL_DATA) example ${localstatedir}/spool/lp/config
! test -f ${sysconfdir}/printcap || \
! $(INSTALL_DATA) example ${sysconfdir}/printcap
# 'uninstall' reverses the effect of an `install', removing those files
***************
*** 111,120 ****
#
uninstall:
rm -rf ${localstatedir}/spool/lp
! test rmdir ${localstatedir}/spool || true
rm -f ${bindir}/lpr-enhanced ${bindir}/lpr ${bindir}/lp
! if test -e ${bindir}/lpr-basic.exe; then \
! rm -f ${bindir}/lpr.exe; \
! mv ${bindir}/lpr-basic.exe ${bindir}/lpr.exe; \
fi
--- 126,144 ----
#
uninstall:
+ if test -f ${sysconfdir}/printcap \
+ && test -f ${localstatedir}/spool/lp/config/example \
+ && cmp ${localstatedir}/spool/lp/config/example \
+ ${sysconfdir}/printcap > /dev/null 2>&1; then \
+ rm -f ${sysconfdir}/printcap; \
+ fi
rm -rf ${localstatedir}/spool/lp
! rmdir ${localstatedir}/spool || true
rm -f ${bindir}/lpr-enhanced ${bindir}/lpr ${bindir}/lp
! if test ! -f ${bindir}/lpr.exe; then \
! if test -f ${bindir}/lpr-orig.exe; then \
! mv ${bindir}/lpr-orig.exe ${bindir}/lpr.exe; \
! elif test -f ${bindir}/lpr-basic.exe; then \
! cd ${bindir}; $(LN_S) lpr-basic.exe lpr.exe; \
! fi; \
fi
***************
*** 123,127 ****
# accommodate, within a full distribution bundle, a preconfigured binary
# installation image, together with supporting documentation and licence
! # packages, conforming to mingw.org packaging standards.
#
dist: srcdist bindist licdist docdist
--- 147,151 ----
# accommodate, within a full distribution bundle, a preconfigured binary
# installation image, together with supporting documentation and licence
! # packages, conforming to mingw.org packaging conventions.
#
dist: srcdist bindist licdist docdist
***************
*** 164,167 ****
--- 188,192 ----
install-lpr-enhanced
cd $(STAGED)${bindir}; rm -f lp lpr
+ rm -f $(STAGED)${sysconfdir}/printcap
(cd $(STAGED); $(MK_TAR) *) | $(ZIPCMD) > $(DISTNAME)-bin.$(ZIPEXT)
rm -rf $(STAGED)
Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/lpr-enhanced/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ChangeLog 15 Sep 2009 20:17:02 -0000 1.5
--- ChangeLog 15 Sep 2009 20:59:17 -0000 1.6
***************
*** 1,4 ****
--- 1,20 ----
2009-09-15 Keith Marshall <keithmarshall@users.sourceforge.net>
+ Make `install' / `uninstall' procedures more robust.
+
+ * Makefile.in (install-lpr-basic): Check for `lpr-basic.exe' as a
+ symbolic link; don't leave it dangling. Otherwise, don't overwrite it
+ if both it and `lpr.exe' exist; instead use `lpr-orig.exe' as backup
+ name for `lpr.exe', overwriting this alternative if required.
+ (install-lpr-enhanced): Don't clobber `${sysconfdir}/printcap' if it
+ is already present; don't ever include it in...
+ (bindist): ...this.
+ (uninstall): Correct syntactical misuse of `test rmdir ...'.
+ Don't remove `${sysconfdir}/printcap', if it differs from the copy
+ installed as `${localstatedir}/spool/lp/config.example'; reflect
+ backup name changes applied in `install-lpr-basic'.
+
+ 2009-09-15 Keith Marshall <keithmarshall@users.sourceforge.net>
+
Reorganise file assignment to documentation / licence distributions.
------------------------------
Message: 5
Date: Thu, 17 Sep 2009 18:37:05 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] lpr-enhanced ChangeLog,1.6,1.7
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1MoLqr-0005u5-OT@23jxhf1.ch3.sourceforge.com>
Update of /cvsroot/mingw/lpr-enhanced
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22673
Modified Files:
ChangeLog
Log Message:
lpr-enhanced-1.0.2 released
Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/lpr-enhanced/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ChangeLog 15 Sep 2009 20:59:17 -0000 1.6
--- ChangeLog 17 Sep 2009 18:37:00 -0000 1.7
***************
*** 1,2 ****
--- 1,6 ----
+ 2009-09-17 Keith Marshall <keithmarshall@users.sourceforge.net>
+
+ lpr-enhanced-1.0.2 released.
+
2009-09-15 Keith Marshall <keithmarshall@users.sourceforge.net>
------------------------------
Message: 6
Date: Thu, 24 Sep 2009 21:42:50 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] MinGW ChangeLog, 1.9.2.1, 1.9.2.2
MinGW_LICENSE.rtf, 1.6.2.1, 1.6.2.2 mingw.nsi, 1.8.2.1, 1.8.2.2
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1Mqw5U-0004r0-VU@23jxhf1.ch3.sourceforge.com>
Update of /cvsroot/mingw/MinGW
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18627
Modified Files:
Tag: MinGW-5_1
ChangeLog MinGW_LICENSE.rtf mingw.nsi
Log Message:
Move 2009-08-21 updates to MinGW-5.1 branch
Index: MinGW_LICENSE.rtf
===================================================================
RCS file: /cvsroot/mingw/MinGW/Attic/MinGW_LICENSE.rtf,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -d -r1.6.2.1 -r1.6.2.2
*** MinGW_LICENSE.rtf 15 Aug 2008 13:31:01 -0000 1.6.2.1
--- MinGW_LICENSE.rtf 24 Sep 2009 21:42:47 -0000 1.6.2.2
***************
*** 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 ****
Earnie@users.sf.net\par
}
!
\ No newline at end of file
--- 18,20 ----
Earnie@users.sf.net\par
}
!
Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/MinGW/Attic/ChangeLog,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -d -r1.9.2.1 -r1.9.2.2
*** ChangeLog 15 Aug 2008 13:31:00 -0000 1.9.2.1
--- ChangeLog 24 Sep 2009 21:42:46 -0000 1.9.2.2
***************
*** 1,2 ****
--- 1,18 ----
+ 2009.08.21 Keith Marshall <keithmarshall@users.sourceforge.net>
+
+ 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 <ir0nh34d@users.sf.net>
Index: mingw.nsi
===================================================================
RCS file: /cvsroot/mingw/MinGW/Attic/mingw.nsi,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -d -r1.8.2.1 -r1.8.2.2
*** mingw.nsi 15 Aug 2008 13:31:04 -0000 1.8.2.1
--- mingw.nsi 24 Sep 2009 21:42:47 -0000 1.8.2.2
***************
*** 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 /oname=$INSTDIR\installed.ini INIfiles\installed.ini
WriteINIStr $INSTDIR\installed.ini "settings" "installtype" $Package
--- 218,222 ----
CreateDirectory $INSTDIR
! File /oname=$INSTDIR\installed.ini 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 /oname=$EXEDIR\mingw.ini INIfiles\mingw.ini
ReadINIStr $R1 "$EXEDIR\mingw.ini" "mingw" "Build"
--- 372,376 ----
extractINI:
; extract built in ini file
! File /oname=$EXEDIR\mingw.ini 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
------------------------------
Message: 7
Date: Thu, 24 Sep 2009 21:42:50 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] MinGW/inifiles mingw.ini,1.12.2.3,1.12.2.4
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1Mqw5U-0004r2-V2@23jxhf1.ch3.sourceforge.com>
Update of /cvsroot/mingw/MinGW/inifiles
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18627/inifiles
Modified Files:
Tag: MinGW-5_1
mingw.ini
Log Message:
Move 2009-08-21 updates to MinGW-5.1 branch
Index: mingw.ini
===================================================================
RCS file: /cvsroot/mingw/MinGW/inifiles/Attic/mingw.ini,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -C2 -d -r1.12.2.3 -r1.12.2.4
*** mingw.ini 1 May 2009 20:30:50 -0000 1.12.2.3
--- mingw.ini 24 Sep 2009 21:42:48 -0000 1.12.2.4
***************
*** 2,10 ****
Build=11
URL=http://prdownloads.sourceforge.net/mingw
! Filename=MinGW-5.1.4.exe
packages=previous|current|candidate
[current]
! runtime=mingwrt-3.15.2-mingw32-dev.tar.gz|7200
w32api=w32api-3.13-mingw32-dev.tar.gz|14420
binutils=binutils-2.19.1-mingw32-bin.tar.gz|21093
--- 2,11 ----
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
------------------------------
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
------------------------------
_______________________________________________
MinGW-cvs mailing list
MinGW-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-cvs
End of MinGW-cvs Digest, Vol 20, Issue 3
****************************************
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic