Mercurial > ecos

changeset 2930:d3f9f7616d6b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* ecosadmin.tcl: Keep target records containing removed packages by default. Add "--remove_targets" switch to force removal. * io/usb/serial/slave/current/cdl/usbs_serial.cdl, net/autotest/current/cdl/net_autotest.cdl: Specify test executable names for compatibility with the eCos Configuration Tool.
author jld
date Fri, 13 Nov 2009 11:32:31 +0000
parents accd0f2fef35
children 7875999a1b55
files packages/ChangeLog packages/ecosadmin.tcl packages/io/usb/serial/slave/current/ChangeLog packages/io/usb/serial/slave/current/cdl/usbs_serial.cdl packages/net/autotest/current/ChangeLog packages/net/autotest/current/cdl/net_autotest.cdl
diffstat 6 files changed, 53 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/packages/ChangeLog
+++ b/packages/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-13  John Dallaway  <john@dallaway.org.uk>
+
+	* ecosadmin.tcl: Keep target records containing removed packages
+	by default. Add "--remove_targets" switch to force removal.
+
 2009-08-20  John Dallaway  <john@dallaway.org.uk>
 
 	* ecos.db: Add uSTL package.
--- a/packages/ecosadmin.tcl
+++ b/packages/ecosadmin.tcl
@@ -12,7 +12,7 @@
 ## ####ECOSGPLCOPYRIGHTBEGIN####                                            
 ## -------------------------------------------                              
 ## This file is part of eCos, the Embedded Configurable Operating System.   
-## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation, Inc.
 ##
 ## eCos is free software; you can redistribute it and/or modify it under    
 ## the terms of the GNU General Public License as published by the Free     
@@ -118,7 +118,7 @@ namespace eval ecosadmin {
 	variable extract_license_arg 0;     # --extract_license
 	variable add_package        "";     # add FILE
 	variable remove_package     "";     # remove PACKAGE
-	variable keep_targets_arg   "";     # --keep_targets
+	variable keep_targets_arg    1;     # --keep_targets, --remove_targets
 	variable merge_repository   "";     # merge REPOSITORY
 	variable version_arg        "";     # --version VER
 	
@@ -433,6 +433,12 @@ proc ecosadmin::parse_arguments { argv0 
 				continue
 			}
 
+			# check for --remove_targets
+			if { [regexp -- {^-?-remove_targets$} $args($i)] == 1 } {
+				set ecosadmin::keep_targets_arg 0
+				continue
+			}
+
 			# check for the add command
 			if { [regexp -- {^-?-?add=?(.*)$} $args($i) dummy match1] == 1 } {
 				if { $match1 != "" } {
@@ -509,10 +515,10 @@ proc ecosadmin::argument_help { } {
 
 	puts "Usage: ecosadmin \[ command \]"
 	puts "  commands are:"
-	puts "    list                                   : list packages"
-	puts "    check                                  : check database"
-	puts "    add FILE                               : add packages"
-	puts "    remove PACKAGE \[ --version VER \]       : remove a package"
+	puts "    list                                                   : list packages"
+	puts "    check                                                  : check database"
+	puts "    add FILE                                               : add packages"
+	puts "    remove PACKAGE \[ --version VER \] \[ --remove_targets \]  : remove a package"
 }
 
 # }}}
@@ -1188,10 +1194,10 @@ proc ecosadmin::filter_old_packages { ol
 		if { ( $command == "target" ) && ( ( [ target_requires_any_package $name $ecosadmin::removed_packages ] != 0 ) || ( [ target_requires_missing_package $name ] != 0 ) ) } {
 			# the target requires a package which has been removed
 			if { $ecosadmin::keep_targets_arg != 1 } {
-				# "--keep_targets" not specified so remove targets with missing packages
+				# "--remove_targets" specified so remove the target
 				ecosadmin::report "removing target $name"
 			} else {
-				# "--keep_targets" specified so remove missing packages from the target definition
+				# remove missing packages from the target definition
 				puts $ecosadmin::outfile "$command $name \{\n$ecosadmin::target_attributes \tpackages \{"
 				foreach pkg $ecosadmin::target_packages {
 					if { ([ lsearch $ecosadmin::removed_packages $pkg ] == -1) && ([ lsearch $ecosadmin::known_packages $pkg ] != -1) } {
--- a/packages/io/usb/serial/slave/current/ChangeLog
+++ b/packages/io/usb/serial/slave/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-13  John Dallaway  <john@dallaway.org.uk>
+
+	* cdl/usb_serial.cdl: Specify test executable names for compatibility
+	with the eCos Configuration Tool.
+
 2008-11-03  Gabor Toeroek <tgabor84@gmail.com>
 
 	* cdl/usbs_serial.cdl: Fix typo introduced by Andrew Lunn in the
@@ -33,7 +38,7 @@ 2008-07-12  Frank Pagliughi <fpagliughi@
 // ####GPLCOPYRIGHTBEGIN####                                                
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 2008 Free Software Foundation, Inc.                        
+// Copyright (C) 2008, 2009 Free Software Foundation, Inc.                        
 //
 // This program is free software; you can redistribute it and/or modify     
 // it under the terms of the GNU General Public License as published by     
--- a/packages/io/usb/serial/slave/current/cdl/usbs_serial.cdl
+++ b/packages/io/usb/serial/slave/current/cdl/usbs_serial.cdl
@@ -8,7 +8,7 @@
 ## ####ECOSGPLCOPYRIGHTBEGIN####                                            
 ## -------------------------------------------                              
 ## This file is part of eCos, the Embedded Configurable Operating System.   
-## Copyright (C) 2008 Free Software Foundation, Inc.                        
+## Copyright (C) 2008, 2009 Free Software Foundation, Inc.                        
 ##
 ## eCos is free software; you can redistribute it and/or modify it under    
 ## the terms of the GNU General Public License as published by the Free     
@@ -275,7 +275,7 @@ cdl_package CYGPKG_IO_USB_SLAVE_SERIAL {
                  display "USBS serial example/test programs"
                  no_define
                  flavor data
-                 calculated { "tests/usbserial_echo.c tests/usb2serial.c" }
+                 calculated { "tests/usbserial_echo tests/usb2serial" }
                  description "
                      usbserial_echo will echo charactors received
                      over the usb serial port back to the sender.
--- a/packages/net/autotest/current/ChangeLog
+++ b/packages/net/autotest/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-13  John Dallaway  <john@dallaway.org.uk>
+
+	* cdl/net_autotest.cdl: Specify test executable names for
+	compatibility with the eCos Configuration Tool.
+
 2002-02-01  Gary Thomas  <gthomas@redhat.com>
 
 	* tests/slowpingmux.c (ping_test): 
@@ -271,7 +276,7 @@ 2000-10-19  Hugo Tyson  <hmt@redhat.com>
 // ####GPLCOPYRIGHTBEGIN####                                                
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify     
 // it under the terms of the GNU General Public License as published by     
--- a/packages/net/autotest/current/cdl/net_autotest.cdl
+++ b/packages/net/autotest/current/cdl/net_autotest.cdl
@@ -8,7 +8,7 @@
 ## ####ECOSGPLCOPYRIGHTBEGIN####                                            
 ## -------------------------------------------                              
 ## This file is part of eCos, the Embedded Configurable Operating System.   
-## Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc.
 ##
 ## eCos is free software; you can redistribute it and/or modify it under    
 ## the terms of the GNU General Public License as published by the Free     
@@ -67,25 +67,25 @@ cdl_package CYGPKG_NET_AUTOTEST {
 	flavor  data
 	no_define
 	calculated { "\
-		tests/floodping.c \
-		tests/floodpingmux.c \
-		tests/route_3.c \
-		tests/route_3_4.c \
-		tests/route_4.c \
-		tests/route_none.c \
-		tests/slowping.c \
-		tests/slowpingmux.c \
-		tests/snmpwalk.c \
-		tests/snmpmulti.c \
-		tests/snmppings.c \
-		tests/tftp_serv_get.c \
-		tests/tftp_serv_put.c \
-		tests/tftp_serv_g0.c \
-		tests/tftp_serv_p0.c \
-		tests/tftp_serv_g512.c \
-		tests/tftp_serv_p512.c \
-		tests/tftp_serv_g1M.c \
-		tests/tftp_serv_p1M.c"
+		tests/floodping \
+		tests/floodpingmux \
+		tests/route_3 \
+		tests/route_3_4 \
+		tests/route_4 \
+		tests/route_none \
+		tests/slowping \
+		tests/slowpingmux \
+		tests/snmpwalk \
+		tests/snmpmulti \
+		tests/snmppings \
+		tests/tftp_serv_get \
+		tests/tftp_serv_put \
+		tests/tftp_serv_g0 \
+		tests/tftp_serv_p0 \
+		tests/tftp_serv_g512 \
+		tests/tftp_serv_p512 \
+		tests/tftp_serv_g1M \
+		tests/tftp_serv_p1M"
         }
 	description   "
 	This option specifies the set of tests