Mercurial > flash_v2

diff host/tools/configtool/standalone/common/cdl_exec.cxx @ 82:6736c52df507 ecos-sw-2000-04-14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from eCos master repository on 2000-04-14-13:35:46-BST
author jlarmour
date Tue, 18 Apr 2000 21:51:55 +0000
parents 435cced73e2f
children 489eb5632bc3
line wrap: on
line diff
--- a/host/tools/configtool/standalone/common/cdl_exec.cxx
+++ b/host/tools/configtool/standalone/common/cdl_exec.cxx
@@ -65,7 +65,7 @@ cdl_exec::cdl_exec (const std::string re
 bool cdl_exec::cmd_new (const std::string cdl_hardware, const std::string cdl_template /* = "default" */, const std::string cdl_version /* = "" */) {
 	bool status = false;
 	try {
-		pkgdata = CdlPackagesDatabaseBody::make (repository);
+		pkgdata = CdlPackagesDatabaseBody::make (repository, &diagnostic_handler, &diagnostic_handler);
 		interp = CdlInterpreterBody::make ();
 		config = CdlConfigurationBody::make ("eCos", pkgdata, interp);
 		config->set_hardware (resolve_hardware_alias (cdl_hardware), &diagnostic_handler, &diagnostic_handler);
@@ -91,7 +91,7 @@ bool cdl_exec::cmd_new (const std::strin
 bool cdl_exec::cmd_target (const std::string cdl_target) {
 	bool status = false;
 	try {
-		pkgdata = CdlPackagesDatabaseBody::make (repository);
+		pkgdata = CdlPackagesDatabaseBody::make (repository, &diagnostic_handler, &diagnostic_handler);
 		interp = CdlInterpreterBody::make ();
 		config = CdlConfigurationBody::load (savefile, pkgdata, interp, &diagnostic_handler, &diagnostic_handler);
 		config->set_hardware (resolve_hardware_alias (cdl_target), &diagnostic_handler, &diagnostic_handler);
@@ -110,7 +110,7 @@ bool cdl_exec::cmd_target (const std::st
 bool cdl_exec::cmd_template (const std::string cdl_template, const std::string cdl_version /* = "" */) {
 	bool status = false;
 	try {
-		pkgdata = CdlPackagesDatabaseBody::make (repository);
+		pkgdata = CdlPackagesDatabaseBody::make (repository, &diagnostic_handler, &diagnostic_handler);
 		interp = CdlInterpreterBody::make ();
 		config = CdlConfigurationBody::load (savefile, pkgdata, interp, &diagnostic_handler, &diagnostic_handler);
 		if (pkgdata->is_known_template (cdl_template) && ! cdl_version.empty ()) {
@@ -135,7 +135,7 @@ bool cdl_exec::cmd_template (const std::
 bool cdl_exec::cmd_export (const std::string cdl_savefile) {
 	bool status = false;
 	try {
-		pkgdata = CdlPackagesDatabaseBody::make (repository);
+		pkgdata = CdlPackagesDatabaseBody::make (repository, &diagnostic_handler, &diagnostic_handler);
 		interp = CdlInterpreterBody::make ();
 		config = CdlConfigurationBody::load (savefile, pkgdata, interp, &diagnostic_handler, &diagnostic_handler);
 		config->save (cdl_savefile, /* minimal = */ true);
@@ -153,7 +153,7 @@ bool cdl_exec::cmd_export (const std::st
 bool cdl_exec::cmd_import (const std::string cdl_savefile) {
 	bool status = false;
 	try {
-		pkgdata = CdlPackagesDatabaseBody::make (repository);
+		pkgdata = CdlPackagesDatabaseBody::make (repository, &diagnostic_handler, &diagnostic_handler);
 		interp = CdlInterpreterBody::make ();
 		config = CdlConfigurationBody::load (savefile, pkgdata, interp, &diagnostic_handler, &diagnostic_handler);
 		config->add (cdl_savefile, &diagnostic_handler, &diagnostic_handler);
@@ -172,7 +172,7 @@ bool cdl_exec::cmd_import (const std::st
 bool cdl_exec::cmd_add (const std::vector<std::string> cdl_packages) {
 	bool status = false;
 	try {
-		pkgdata = CdlPackagesDatabaseBody::make (repository);
+		pkgdata = CdlPackagesDatabaseBody::make (repository, &diagnostic_handler, &diagnostic_handler);
 		interp = CdlInterpreterBody::make ();
 		config = CdlConfigurationBody::load (savefile, pkgdata, interp, &diagnostic_handler, &diagnostic_handler);
 		for (unsigned int n = 0; n < cdl_packages.size (); n++) {
@@ -194,7 +194,7 @@ bool cdl_exec::cmd_remove (const std::ve
 	unsigned int n;
 	bool status = false;
 	try {
-		pkgdata = CdlPackagesDatabaseBody::make (repository);
+		pkgdata = CdlPackagesDatabaseBody::make (repository, &diagnostic_handler, &diagnostic_handler);
 		interp = CdlInterpreterBody::make ();
 		config = CdlConfigurationBody::load (savefile, pkgdata, interp, &diagnostic_handler, &diagnostic_handler);
 		for (n = 0; n < cdl_packages.size (); n++) {
@@ -220,7 +220,7 @@ bool cdl_exec::cmd_remove (const std::ve
 bool cdl_exec::cmd_version (const std::string cdl_version, const std::vector<std::string> cdl_packages) {
 	bool status = false;
 	try {
-		pkgdata = CdlPackagesDatabaseBody::make (repository);
+		pkgdata = CdlPackagesDatabaseBody::make (repository, &diagnostic_handler, &diagnostic_handler);
 		interp = CdlInterpreterBody::make ();
 		config = CdlConfigurationBody::load (savefile, pkgdata, interp, &diagnostic_handler, &diagnostic_handler);
 		for (unsigned int n = 0; n < cdl_packages.size (); n++) {
@@ -241,7 +241,7 @@ bool cdl_exec::cmd_version (const std::s
 bool cdl_exec::cmd_tree () {
 	bool status = false;
 	try {
-		pkgdata = CdlPackagesDatabaseBody::make (repository);
+		pkgdata = CdlPackagesDatabaseBody::make (repository, &diagnostic_handler, &diagnostic_handler);
 		interp = CdlInterpreterBody::make ();
 		config = CdlConfigurationBody::load (savefile, pkgdata, interp, &diagnostic_handler, &diagnostic_handler);
 		char * cwd = getcwd (NULL, 0);
@@ -268,14 +268,13 @@ bool cdl_exec::cmd_tree () {
 bool cdl_exec::cmd_list () {
 	bool status = false;
 	try {
-		pkgdata = CdlPackagesDatabaseBody::make (repository);
+		pkgdata = CdlPackagesDatabaseBody::make (repository, &diagnostic_handler, &diagnostic_handler);
 
 		// list the installed packages
 		std::vector<std::string> packages = pkgdata->get_packages ();
 		std::sort (packages.begin (), packages.end ());
 		for (unsigned int package = 0; package < packages.size (); package++) {
 			const std::vector<std::string> & aliases = pkgdata->get_package_aliases (packages [package]);
-			printf ("Package %s (%s):\n aliases:", packages [package].c_str (), aliases [0].c_str ());
 			for (unsigned int alias = 1; alias < aliases.size (); alias++) {
 				printf (" %s", aliases [alias].c_str ());
 			}
@@ -328,7 +327,7 @@ bool cdl_exec::cmd_check () {
 
 	try {
 		CdlTransactionBody::disable_automatic_inference ();
-		pkgdata = CdlPackagesDatabaseBody::make (repository);
+		pkgdata = CdlPackagesDatabaseBody::make (repository, &diagnostic_handler, &diagnostic_handler);
 		interp = CdlInterpreterBody::make ();
 		config = CdlConfigurationBody::load (savefile, pkgdata, interp, &diagnostic_handler, &diagnostic_handler);
 		config->save (savefile); // tidy up any manual edits
@@ -415,7 +414,7 @@ bool cdl_exec::cmd_resolve () {
 	bool status = false;
 
 	try {
-		pkgdata = CdlPackagesDatabaseBody::make (repository);
+		pkgdata = CdlPackagesDatabaseBody::make (repository, &diagnostic_handler, &diagnostic_handler);
 		interp = CdlInterpreterBody::make ();
 		config = CdlConfigurationBody::load (savefile, pkgdata, interp, &diagnostic_handler, &diagnostic_handler);
 		config->resolve_all_conflicts ();