ecos: host/libcdl/database.cxx comparison

comparison host/libcdl/database.cxx @ 163:0d2b193a635f

Merge from eCos master repository on 2001-06-22-17:38:39-BST

author	jlarmour
date	Fri, 22 Jun 2001 18:18:44 +0000
parents	b939e9cada46
children	fbfd52cf7976

comparison

equal deleted inserted replaced

-:2395031e7a66
+:0d2b193a635f
 // ----------------------------------------------------------------------------
 // Some test cases may want to read in a file other than
 // "ecos.db", e.g. to facilitate testing the error conditions.
 char*
 CdlPackagesDatabaseBody::database_name = "ecos.db";
+// Should warnings be issued for minor database inconsistencies?
+bool CdlPackagesDatabaseBody::verbose_mode      = false;
 // The new_package etc. commands need to store the name of the
 // current package so that subsequent commands can do the right thing.
 // Using constant strings as the key avoids typo problems.
 const char*     dbparser_pkgname                = "::dbparser_pkgname";
 }
 if (0 == package.aliases.size()) {
 CdlParse::report_error(interp, diag_package + pkg_name, "At least one alias should be supplied.");
 }
-// Additional checks. Is the package directory actually present.
+// Additional checks. Is the package directory actually present?
+// Note that there are scenarios where a package may be listed
+// in the database but not installed, e.g. an anoncvs checkout
+// of selected modules.
 if ("" != package.directory) {
 std::string repo = interp->get_variable(dbparser_component_repository);
 CYG_ASSERTC("" != repo);
 std::string pkgdir = repo + "/" + package.directory;
 if (!interp->is_directory(pkgdir)) {
-CdlParse::report_warning(interp, diag_package + pkg_name,
+if (CdlPackagesDatabaseBody::verbose_mode) {
-std::string("This package is not present in the component repository.\nThere is no directory `")
+CdlParse::report_warning(interp, diag_package + pkg_name,
-+ pkgdir + "'.");
+std::string("This package is not present in the component repository.\n"
+"There is no directory `") + pkgdir + "'.");
+}
 package_ok = false;
 } else {
 // Now look for version subdirectories. There should be at least one.
 std::vector<std::string> subdirs;
 }
 }
 // Consistency checks. All target-specific packages should
 // have the hardware attribute. Also, all the packages should
-// exist. Problems only result in warnings, to allow for
+// exist. Problems only result in warnings and only when
-// somewhat inconsistent repositories e.g. an anoncvs tree.
+// operating in verbose mode, to allow for somewhat
-std::vector<std::string>::const_iterator name_i;
+// inconsistent repositories e.g. an anoncvs tree.
-std::vector<std::string>::const_iterator name_j;
+if (CdlPackagesDatabaseBody::verbose_mode) {
-for (name_i = target_names.begin(); name_i != target_names.end(); name_i++) {
+std::vector<std::string>::const_iterator name_i;
-for (name_j = targets[*name_i].packages.begin(); name_j != targets[*name_i].packages.end(); name_j++) {
+std::vector<std::string>::const_iterator name_j;
-if (std::find(package_names.begin(), package_names.end(), *name_j) == package_names.end()) {
+for (name_i = target_names.begin(); name_i != target_names.end(); name_i++) {
-CdlParse::report_warning(interp, diag_target + *name_i,
+for (name_j = targets[*name_i].packages.begin(); name_j != targets[*name_i].packages.end(); name_j++) {
-std::string("This target refers to an unknown package `") + *name_j + "'.");
+if (std::find(package_names.begin(), package_names.end(), *name_j) == package_names.end()) {
-}
+CdlParse::report_warning(interp, diag_target + *name_i,
-if (!packages[*name_j].hardware) {
+std::string("This target refers to an unknown package `") + *name_j + "'.");
-CdlParse::report_warning(interp, diag_target + *name_i,
+}
-std::string("This target refers to a package `") + *name_j +
+if (!packages[*name_j].hardware) {
-"' that is not hardware-specific.");
+CdlParse::report_warning(interp, diag_target + *name_i,
+std::string("This target refers to a package `") + *name_j +
+"' that is not hardware-specific.");
+}
 }
 }
 }
 // Now, were there any errors while reading in the database?
 // If so it is necessary to throw an exception here, to make sure
 // that things get cleaned up properly.
 int error_count = CdlParse::get_error_count(interp);
 if (0 != error_count) {
 CYG_REPORT_RETURN();
 return component_repository;
 }
+void
+CdlPackagesDatabaseBody::set_verbose(bool new_mode)
+{
+CYG_REPORT_FUNCNAME("CdlPackagesDatabase::set_verbose");
+CYG_REPORT_FUNCARG1XV(new_mode);
+verbose_mode = new_mode;
+CYG_REPORT_RETURN();
+}
 //}}}
 //{{{  CdlPackagesDatabase:: get package information
 // ----------------------------------------------------------------------------

Mercurial > ecos

comparison host/libcdl/database.cxx @ 163:0d2b193a635f