From: Keith M. <kei...@us...> - 2010-12-30 23:23:51
|
Update of /cvsroot/mingw/mingw-get In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv4681 Modified Files: ChangeLog Makefile.in Log Message: Add preliminary CLI support for "list" and "show" actions. Index: Makefile.in =================================================================== RCS file: /cvsroot/mingw/mingw-get/Makefile.in,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Makefile.in 10 Sep 2010 03:04:06 -0000 1.20 --- Makefile.in 30 Dec 2010 23:23:43 -0000 1.21 *************** *** 55,59 **** LIBS = -Wl,-Bstatic -lz -lbz2 -llzma -Wl,-Bdynamic -lwininet ! CORE_DLL_OBJECTS = climain.$(OBJEXT) \ pkgbind.$(OBJEXT) pkginet.$(OBJEXT) pkgstrm.$(OBJEXT) pkgname.$(OBJEXT) \ pkgexec.$(OBJEXT) pkgfind.$(OBJEXT) pkginfo.$(OBJEXT) pkgspec.$(OBJEXT) \ --- 55,59 ---- LIBS = -Wl,-Bstatic -lz -lbz2 -llzma -Wl,-Bdynamic -lwininet ! CORE_DLL_OBJECTS = climain.$(OBJEXT) pkgshow.$(OBJEXT) \ pkgbind.$(OBJEXT) pkginet.$(OBJEXT) pkgstrm.$(OBJEXT) pkgname.$(OBJEXT) \ pkgexec.$(OBJEXT) pkgfind.$(OBJEXT) pkginfo.$(OBJEXT) pkgspec.$(OBJEXT) \ Index: ChangeLog =================================================================== RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** ChangeLog 1 Nov 2010 21:09:01 -0000 1.69 --- ChangeLog 30 Dec 2010 23:23:43 -0000 1.70 *************** *** 1,2 **** --- 1,43 ---- + 2010-12-30 Keith Marshall <kei...@us...> + + Add preliminary CLI support for "list" and "show" actions. + + * src/pkgtask.h (ACTION_PRIMARY): New manifest constant; define it. + (ACTION_LIST, ACTION_SHOW): Likewise; cast to enumerated values for... + (action_list, action_show): ...these; define them. + + * src/pkgexec.cpp (action_name): Add defining text for... + (action_list, action_show): ...these. + + * src/climain.cpp: Partially revert 2010-11-01 change... + (climain) [! ACTION_UPDATE]: Reinstate original "if" block, moving + the "switch" block within it, but without the ACTION_UPDATE case. + [ACTION_LIST, ACTION_SHOW]: New "switch" cases; they invoke... + (pkgXmlDocument::DisplayPackageInfo): ...this new method. + + * src/pkgbase.h (pkgXmlDocument::DisplayPackageInfo): Declare it. + (pkgActionItem::ConfirmInstallationStatus): New method; declare it. + (pkgXmlNode::GetSysRoot): Make declaration style consistent with + others in the class; do not name arguments in the declaration. + (pkgXmlNode::FindFirstAssociate): Likewise. + (pkgXmlNode::FindNextAssociate): Likewise. + + * src/pkgshow.cpp: New file. + (pkgXmlDocument::DisplayPackageInfo): Implement it. + + * src/pkgdeps.cpp (pkgMsgUnknownPackage): New extern "C" function; + implement it temporarily, pending a future i18n reimplementation. + (assert_installed): Drop "inline" attribute; leave it as "static". + Set "tarname" correctly, to match the installed package version; (it + previously incorrectly returned the latest available version). + (pkgActionItem::ConfirmInstallationStatus): Implement it. + (pkgXmlDocument::Schedule) [ACTION_PRIMARY]: Set as appropriate. + (pkgXmlDocument::Schedule) [ACTION_REMOVE || ACTION_UPGRADE]: Complain + if requested package is not recorded as having been installed. + (pkgXmlDocument::ResolveDependencies) [! ACTION_INSTALL]: Do not + invoke it recursively. + + * Makefile.in (pkgshow.$OBJEXT): Add reference. + 2010-11-01 Keith Marshall <kei...@us...> |