[prev in list] [next in list] [prev in thread] [next in thread]
List: mingw-cvs
Subject: MinGW-cvs Digest, Vol 26, Issue 1
From: mingw-cvs-request () lists ! sourceforge ! net
Date: 2010-03-02 21:07:47
Message-ID: mailman.51081.1267564067.5170.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. mingw-get ChangeLog,1.25,1.26 configure.ac,1.3,1.4
(Keith Marshall)
2. mingw-get/src pkgfind.cpp,1.2,1.3 (Keith Marshall)
3. mingw-get ChangeLog,1.26,1.27 (Keith Marshall)
4. mingw-get/src pkgkeys.c,1.4,1.5 pkgkeys.h,1.4,1.5 (Keith Marshall)
5. mingw-get ChangeLog,1.27,1.28 (Keith Marshall)
6. mingw-get/src sysroot.cpp,1.2,1.3 (Keith Marshall)
7. mingw-get ChangeLog,1.28,1.29 (Keith Marshall)
8. mingw-get/src tarproc.cpp,1.3,1.4 (Keith Marshall)
9. mingw-get ChangeLog,1.29,1.30 (Keith Marshall)
----------------------------------------------------------------------
Message: 1
Date: Tue, 16 Feb 2010 21:58:09 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] mingw-get ChangeLog,1.25,1.26
configure.ac,1.3,1.4
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1NhVQn-0006LQ-1I@sfp-cvsdas-1.v30.ch3.sourceforge.com>
Update of /cvsroot/mingw/mingw-get
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24221
Modified Files:
ChangeLog configure.ac
Log Message:
mingw-get-0.1-mingw32-alpha-1 released.
Index: configure.ac
===================================================================
RCS file: /cvsroot/mingw/mingw-get/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** configure.ac 6 Feb 2010 15:29:56 -0000 1.3
--- configure.ac 16 Feb 2010 21:58:06 -0000 1.4
***************
*** 23,27 ****
# arising from the use of this software.
#
! AC_INIT([mingw-get],[0.1-alpha-1],[http://mingw.org/reporting_bugs])
AC_SUBST([COPYRIGHT_HOLDER],["MinGW Project"])
--- 23,27 ----
# arising from the use of this software.
#
! AC_INIT([mingw-get],[0.1-alpha-2],[http://mingw.org/reporting_bugs])
AC_SUBST([COPYRIGHT_HOLDER],["MinGW Project"])
Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ChangeLog 16 Feb 2010 20:50:11 -0000 1.25
--- ChangeLog 16 Feb 2010 21:57:47 -0000 1.26
***************
*** 1,4 ****
--- 1,14 ----
2010-02-16 Keith Marshall <keithmarshall@users.sourceforge.net>
+ Bump version for next release cycle.
+
+ * configure.ac (AC_INIT): Bump version suffix to alpha-2.
+
+ 2010-02-16 Keith Marshall <keithmarshall@users.sourceforge.net>
+
+ mingw-get-0.1-mingw32-alpha-1 released.
+
+ 2010-02-16 Keith Marshall <keithmarshall@users.sourceforge.net>
+
Prepare initial package release.
------------------------------
Message: 2
Date: Mon, 01 Mar 2010 22:09:07 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] mingw-get/src pkgfind.cpp,1.2,1.3
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1NmDnX-00033u-TK@sfp-cvsdas-1.v30.ch3.sourceforge.com>
Update of /cvsroot/mingw/mingw-get/src
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11680/src
Modified Files:
pkgfind.cpp
Log Message:
Extend package name search to include component packages.
Index: pkgfind.cpp
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/pkgfind.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pkgfind.cpp 16 Jan 2010 20:49:57 -0000 1.2
--- pkgfind.cpp 1 Mar 2010 22:09:04 -0000 1.3
***************
*** 31,51 ****
#include "pkgkeys.h"
- static inline
- bool pkgHasMatchingName( pkgXmlNode *pkg, const char *wanted )
- {
- /* Helper to locate a package specification by package name;
- * returns "true" if the XML node under consideration defines
- * a "package", having the "wanted" name; else "false".
- */
- return pkg->IsElementOfType( package_key )
- /*
- * subject to the canonical name of the package matching
- * the "wanted" name, or any assigned package name alias...
- */
- &&( (strcmp( wanted, pkg->GetPropVal( name_key, "" )) == 0)
- || (has_keyword( pkg->GetPropVal( alias_key, NULL ), wanted ) != 0)
- );
- }
-
pkgXmlNode *
pkgXmlDocument::FindPackageByName( const char *name, const char *subsystem )
--- 31,34 ----
***************
*** 70,78 ****
while( pkg != NULL )
{
! /* ...returning immediately, if we find a "package"
! * element with the required "name" property...
*/
! if( pkgHasMatchingName( pkg, name ) )
! return pkg;
/* ...otherwise, continue searching among any further
--- 53,114 ----
while( pkg != NULL )
{
! /* ...and, for each "package" element we find...
*/
! if( pkg->IsElementOfType( package_key ) )
! {
! /* ...return immediately, if it has a "name" or an "alias"
! * property which matches the required package name...
! */
! if( (strcmp( name, pkg->GetPropVal( name_key, "" )) == 0)
! || (has_keyword( pkg->GetPropVal( alias_key, NULL ), name ) != 0) )
! return pkg;
!
! else
! {
! /* We did find a "package" element, but neither its "name"
! * nor its "alias" property provided a match; look within it,
! * for a possible match on a "component" package element...
! */
! pkgXmlNode *cpt = pkg->GetChildren();
! while( cpt != NULL )
! {
! /* For each element contained within the "package" definition,
! * check if it represents a "component" package definition...
! */
! if( cpt->IsElementOfType( component_key ) )
! {
! /* ...and return immediately, when it does, AND it also has a
! * "name" property which matches the required package name...
! */
! if( strcmp( name, cpt->GetPropVal( name_key, "" )) == 0 )
! return cpt;
!
! else
! { /* We did find a "component" package, but its "name"
! * property didn't match; construct an alternative name,
! * by combining the "class" property of the "component"
! * with the "name" property of the containing "package",
! * and evaluate that for a possible match...
! */
! const char *pkg_name = pkg->GetPropVal( name_key, "" );
! const char *cpt_class = cpt->GetPropVal( class_key, "" );
! char cpt_name[2 + strlen( pkg_name ) + strlen( cpt_class )];
! sprintf( cpt_name, "%s-%s", pkg_name, cpt_class );
!
! /* Again, return the "component", if this identifies
! * a successful match...
! */
! if( strcmp( name, cpt_name ) == 0 )
! return cpt;
! }
! }
!
! /* ...otherwise, continue checking any other "components"
! * which may be defined within the current "package.
! */
! cpt = cpt->GetNext();
! }
! }
! }
/* ...otherwise, continue searching among any further
------------------------------
Message: 3
Date: Mon, 01 Mar 2010 22:09:06 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] mingw-get ChangeLog,1.26,1.27
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1NmDnW-00033l-Du@sfp-cvsdas-1.v30.ch3.sourceforge.com>
Update of /cvsroot/mingw/mingw-get
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11680
Modified Files:
ChangeLog
Log Message:
Extend package name search to include component packages.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ChangeLog 16 Feb 2010 21:57:47 -0000 1.26
--- ChangeLog 1 Mar 2010 22:08:58 -0000 1.27
***************
*** 1,2 ****
--- 1,11 ----
+ 2010-03-01 Keith Marshall <keithmarshall@users.sourceforge.net>
+
+ Extend package name search to include component packages.
+
+ * src/pkgfind.cpp (pkgHasMatchingName): Remove; fold it into...
+ (pkgXmlNode::FindPackageByName): ...this; augment to extend search
+ within package definition elements, seeking a potential match on an
+ included component package name or component class-implied name.
+
2010-02-16 Keith Marshall <keithmarshall@users.sourceforge.net>
------------------------------
Message: 4
Date: Mon, 01 Mar 2010 22:34:21 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] mingw-get/src pkgkeys.c,1.4,1.5 pkgkeys.h,1.4,1.5
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1NmEBx-0004aO-Nb@sfp-cvsdas-1.v30.ch3.sourceforge.com>
Update of /cvsroot/mingw/mingw-get/src
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17513/src
Modified Files:
pkgkeys.c pkgkeys.h
Log Message:
Extend package name search to include component packages.
Index: pkgkeys.h
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/pkgkeys.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pkgkeys.h 10 Feb 2010 22:18:59 -0000 1.4
--- pkgkeys.h 1 Mar 2010 22:34:19 -0000 1.5
***************
*** 40,43 ****
--- 40,44 ----
EXTERN_C_DECL const char *application_key;
EXTERN_C_DECL const char *catalogue_key;
+ EXTERN_C_DECL const char *class_key;
EXTERN_C_DECL const char *component_key;
EXTERN_C_DECL const char *dirname_key;
Index: pkgkeys.c
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/pkgkeys.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pkgkeys.c 10 Feb 2010 22:18:59 -0000 1.4
--- pkgkeys.c 1 Mar 2010 22:34:19 -0000 1.5
***************
*** 29,32 ****
--- 29,33 ----
const char *application_key = "application";
const char *catalogue_key = "catalogue";
+ const char *class_key = "class";
const char *component_key = "component";
const char *dirname_key = "dir";
------------------------------
Message: 5
Date: Mon, 01 Mar 2010 22:34:21 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] mingw-get ChangeLog,1.27,1.28
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1NmEBx-0004aM-MM@sfp-cvsdas-1.v30.ch3.sourceforge.com>
Update of /cvsroot/mingw/mingw-get
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17513
Modified Files:
ChangeLog
Log Message:
Extend package name search to include component packages.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ChangeLog 1 Mar 2010 22:08:58 -0000 1.27
--- ChangeLog 1 Mar 2010 22:34:19 -0000 1.28
***************
*** 8,11 ****
--- 8,14 ----
included component package name or component class-implied name.
+ * src/pkgkeys.h (class_key): New global string constant; declare it.
+ * src/pkgkeys.c (class_key): Implement it.
+
2010-02-16 Keith Marshall <keithmarshall@users.sourceforge.net>
------------------------------
Message: 6
Date: Tue, 02 Mar 2010 19:11:13 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] mingw-get/src sysroot.cpp,1.2,1.3
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1NmXUv-00066N-6o@sfp-cvsdas-1.v30.ch3.sourceforge.com>
Update of /cvsroot/mingw/mingw-get/src
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23396/src
Modified Files:
sysroot.cpp
Log Message:
Rationalise path identification for XML file locations.
Index: sysroot.cpp
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/sysroot.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sysroot.cpp 2 Feb 2010 20:19:28 -0000 1.2
--- sysroot.cpp 2 Mar 2010 19:11:08 -0000 1.3
***************
*** 112,117 ****
}
- static const char *sigpath = "%R" "var/lib/mingw-get/data/%F.xml";
-
void pkgXmlDocument::LoadSystemMap()
{
--- 112,115 ----
***************
*** 157,160 ****
--- 155,162 ----
* this implies that no system map has yet been selected for loading,
* so check if the current one matches the selection criterion...
+ *
+ * FIXME: match_if_explicit( id, NULL ) must always return true;
+ * this is a place holder for a match on a system map selector,
+ * which will be specified by a future command line option.
*/
const char *id = sysmap->GetPropVal( id_key, "<default>" );
***************
*** 211,217 ****
* use this to create a new installation record file.
*/
! char *sig = hashed_name( retry++, sysroot_key, path );
! char sigfile[mkpath( NULL, sigpath, sig, NULL )];
! mkpath( sigfile, sigpath, sig, NULL );
/* Check for an existing sysroot file associated with the
--- 213,218 ----
* use this to create a new installation record file.
*/
! const char *sig = hashed_name( retry++, sysroot_key, path );
! const char *sigfile = xmlfile( sig, NULL );
/* Check for an existing sysroot file associated with the
***************
*** 275,281 ****
}
! /* Before abandoning our reference to the current hash
! * signature, free the memory allocated for it.
*/
free( (void *)(sig) );
}
--- 276,284 ----
}
! /* Before abandoning our references to the current hash
! * signature, and the path name for the associated XML file,
! * free the memory allocated for them.
*/
+ free( (void *)(sigfile) );
free( (void *)(sig) );
}
***************
*** 335,340 ****
* name for the file in which to save the record.
*/
! char mapfile[mkpath( NULL, sigpath, modified, NULL )];
! mkpath( mapfile, sigpath, modified, NULL );
/* Create a copy of the sysroot record, as the content of
--- 338,342 ----
* name for the file in which to save the record.
*/
! const char *mapfile = xmlfile( modified, NULL );
/* Create a copy of the sysroot record, as the content of
***************
*** 346,349 ****
--- 348,356 ----
map.SetRoot( entry->Clone() );
map.Save( mapfile );
+
+ /* The 'xmlfile()' look-up for the 'mapfile' path name used
+ * the heap to return the result; free the space allocated.
+ */
+ free( (void *)(mapfile) );
}
------------------------------
Message: 7
Date: Tue, 02 Mar 2010 19:11:10 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] mingw-get ChangeLog,1.28,1.29
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1NmXVQ-00066D-GJ@sfp-cvsdas-1.v30.ch3.sourceforge.com>
Update of /cvsroot/mingw/mingw-get
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23396
Modified Files:
ChangeLog
Log Message:
Rationalise path identification for XML file locations.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** ChangeLog 1 Mar 2010 22:34:19 -0000 1.28
--- ChangeLog 2 Mar 2010 19:11:01 -0000 1.29
***************
*** 1,2 ****
--- 1,10 ----
+ 2010-03-02 Keith Marshall <keithmarshall@users.sourceforge.net>
+
+ Rationalise path identification for XML file locations.
+
+ * src/sysroot.cpp (pkgXmlDocument::LoadSystemMap): Use `xmlfile()'
+ function to locate `sysroot' map file; free memory when done.
+ (pkgXmlDocument::UpdateSystemMap): Likewise.
+
2010-03-01 Keith Marshall <keithmarshall@users.sourceforge.net>
------------------------------
Message: 8
Date: Tue, 02 Mar 2010 21:07:05 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] mingw-get/src tarproc.cpp,1.3,1.4
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1NmZJ3-0000ka-1j@sfp-cvsdas-1.v30.ch3.sourceforge.com>
Update of /cvsroot/mingw/mingw-get/src
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2717/src
Modified Files:
tarproc.cpp
Log Message:
Don't write installation records for unavailable packages.
Index: tarproc.cpp
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/tarproc.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tarproc.cpp 10 Feb 2010 22:18:59 -0000 1.3
--- tarproc.cpp 2 Mar 2010 21:07:00 -0000 1.4
***************
*** 399,403 ****
* XML database, and mark that sysroot entry as 'modified'.
*/
! if( (tarname != NULL) && (sysroot != NULL) )
{
/* The installation record must identify, as a minimum,
--- 399,403 ----
* XML database, and mark that sysroot entry as 'modified'.
*/
! if( (tarname != NULL) && (sysroot != NULL) && stream->IsReady() )
{
/* The installation record must identify, as a minimum,
***************
*** 419,422 ****
--- 419,427 ----
/* Set the 'modified' flag for, and attach the installation
* record to, the relevant sysroot record.
+ *
+ * FIXME: We should defer this until AFTER the archive has
+ * been successfully processed, (in the destructor, perhaps?),
+ * cleaning up, and not updating the installation manifest,
+ * in the event of an archive processing failure.
*/
sysroot->SetAttribute( modified_key, yes_value );
------------------------------
Message: 9
Date: Tue, 02 Mar 2010 21:07:02 +0000
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Subject: [MinGW-cvs] mingw-get ChangeLog,1.29,1.30
To: mingw-cvs@lists.sourceforge.net
Message-ID: <E1NmZJa-0000kT-Sz@sfp-cvsdas-1.v30.ch3.sourceforge.com>
Update of /cvsroot/mingw/mingw-get
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2717
Modified Files:
ChangeLog
Log Message:
Don't write installation records for unavailable packages.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** ChangeLog 2 Mar 2010 19:11:01 -0000 1.29
--- ChangeLog 2 Mar 2010 21:06:54 -0000 1.30
***************
*** 1,4 ****
--- 1,12 ----
2010-03-02 Keith Marshall <keithmarshall@users.sourceforge.net>
+ Don't write installation records for unavailable packages.
+
+ * src/tarproc.cpp (pkgTarArchiveInstaller): In constructor, ensure
+ archive is ready for processing, before initialising an installation
+ manifest record.
+
+ 2010-03-02 Keith Marshall <keithmarshall@users.sourceforge.net>
+
Rationalise path identification for XML file locations.
***************
*** 6,9 ****
--- 14,18 ----
function to locate `sysroot' map file; free memory when done.
(pkgXmlDocument::UpdateSystemMap): Likewise.
+ (sigpath): Static global variable disused; delete it.
2010-03-01 Keith Marshall <keithmarshall@users.sourceforge.net>
------------------------------
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
------------------------------
_______________________________________________
MinGW-cvs mailing list
MinGW-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-cvs
End of MinGW-cvs Digest, Vol 26, Issue 1
****************************************
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic