From: Ian M. <ia...@us...> - 2002-03-27 00:34:44
|
Update of /cvsroot/nant/nant/src/Extras/SourceSafe In directory usw-pr-cvs1:/tmp/cvs-serv15299 Modified Files: BaseTask.cs CheckinTask.cs CheckoutTask.cs GetTask.cs LabelTask.cs Log Message: Chris Jenkins fixes to the sourcesafe tasks Index: BaseTask.cs =================================================================== RCS file: /cvsroot/nant/nant/src/Extras/SourceSafe/BaseTask.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BaseTask.cs 19 Dec 2001 01:43:32 -0000 1.1 --- BaseTask.cs 27 Mar 2002 00:34:41 -0000 1.2 *************** *** 37,57 **** IVSSItem _item = null; /// <summary> /// The absolute path to the folder that contains the srcsafe.ini. Required. /// </summary> ! [TaskAttribute("dbPath", Required=true)] ! string _dbPath = ""; ! /// <summary> /// The source safe project or file path, starting with "$/". Required. /// </summary> [TaskAttribute("path", Required=true)] ! string _path = ""; /// <summary> /// The password to use to login to the Source Safe database. /// </summary> ! [TaskAttribute("password")] ! string _password = ""; /// <summary> --- 37,72 ---- IVSSItem _item = null; + string _dbpath = ""; + string _path = ""; + string _password = ""; + string _user = ""; + string _version = ""; /// <summary> /// The absolute path to the folder that contains the srcsafe.ini. Required. /// </summary> ! [TaskAttribute("dbpath", Required=true)] ! public string dbPath { ! get { return _dbpath; } ! set { _dbpath = value; } ! } ! /// <summary> /// The source safe project or file path, starting with "$/". Required. /// </summary> [TaskAttribute("path", Required=true)] ! public string Path { ! get { return _path; } ! set { _path = value; } ! } /// <summary> /// The password to use to login to the Source Safe database. /// </summary> ! [TaskAttribute("password")] ! public string Password ! { ! get { return _password; } ! set { _password = value; } ! } /// <summary> *************** *** 59,63 **** /// </summary> [TaskAttribute("user", Required=true)] ! string _user = ""; /// <summary> --- 74,81 ---- /// </summary> [TaskAttribute("user", Required=true)] ! public string User { ! get { return _user; } ! set { _user = value; } ! } /// <summary> *************** *** 67,78 **** /// </summary> [TaskAttribute("version")] ! string _version = ""; ! ! protected VSSDatabase Database { get { return _database; } } ! protected IVSSItem Item { get { return _item; } } ! protected string User { get { return _user; } } ! protected string Path { get { return _path; } } ! protected string Version { get { return _version; } } /// <summary> /// Opens the Source Safe database and sets the reference to the specified --- 85,96 ---- /// </summary> [TaskAttribute("version")] ! public string Version { ! get { return _version; } ! set { _version = value; } ! } + public VSSDatabase Database { get { return _database; } } + public IVSSItem Item { get { return _item; } } + /// <summary> /// Opens the Source Safe database and sets the reference to the specified *************** *** 82,89 **** try { _database = new VSSDatabase(); ! _database.Open(_dbPath, _user, _password); } catch (Exception e) { ! throw new BuildException("Failed to open database", Location, e); } --- 100,107 ---- try { _database = new VSSDatabase(); ! _database.Open(_dbpath, _user, _password); } catch (Exception e) { ! throw new BuildException("Failed to open database", Location, e); } Index: CheckinTask.cs =================================================================== RCS file: /cvsroot/nant/nant/src/Extras/SourceSafe/CheckinTask.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CheckinTask.cs 19 Dec 2001 01:43:32 -0000 1.1 --- CheckinTask.cs 27 Mar 2002 00:34:41 -0000 1.2 *************** *** 29,43 **** public sealed class CheckinTask : BaseTask { /// <summary> /// The comment for the new version. /// </summary> [TaskAttribute("comment")] ! string _comment = ""; /// <summary> /// The absolute path to the local working directory. Required. /// </summary> ! [TaskAttribute("localPath", Required=true)] ! string _localPath = ""; /// <summary> --- 29,56 ---- public sealed class CheckinTask : BaseTask { + string _comment = ""; + string _localpath = ""; + string _recursive = Boolean.TrueString; + string _writable = Boolean.FalseString; + /// <summary> /// The comment for the new version. /// </summary> [TaskAttribute("comment")] ! public string Comment ! { ! get { return _comment; } ! set { _comment = value; } ! } /// <summary> /// The absolute path to the local working directory. Required. /// </summary> ! [TaskAttribute("localpath", Required=true)] ! public string LocalPath ! { ! get { return _localpath; } ! set { _localpath = value; } ! } /// <summary> *************** *** 47,51 **** [TaskAttribute("recursive")] [BooleanValidator()] ! string _recursive = Boolean.TrueString; /// <summary> --- 60,68 ---- [TaskAttribute("recursive")] [BooleanValidator()] ! public string Recursive ! { ! get { return _recursive; } ! set { _recursive = value; } ! } /// <summary> *************** *** 55,59 **** [TaskAttribute("writable")] [BooleanValidator()] ! string _writable = Boolean.FalseString; protected override void ExecuteTask() { --- 72,80 ---- [TaskAttribute("writable")] [BooleanValidator()] ! public string Writable ! { ! get { return _writable; } ! set { _writable = value; } ! } protected override void ExecuteTask() { *************** *** 68,72 **** try { ! Item.Checkin(_comment, _localPath, flags); } catch (Exception e) { --- 89,93 ---- try { ! Item.Checkin(_comment, _localpath, flags); } catch (Exception e) { Index: CheckoutTask.cs =================================================================== RCS file: /cvsroot/nant/nant/src/Extras/SourceSafe/CheckoutTask.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CheckoutTask.cs 19 Dec 2001 01:43:32 -0000 1.1 --- CheckoutTask.cs 27 Mar 2002 00:34:41 -0000 1.2 *************** *** 28,37 **** [TaskName("vsscheckout")] public sealed class CheckoutTask : BaseTask { /// <summary> /// The absolute path to the local working directory. Required. /// </summary> ! [TaskAttribute("localPath", Required=true)] ! string _localPath = ""; /// <summary> --- 28,45 ---- [TaskName("vsscheckout")] public sealed class CheckoutTask : BaseTask { + + string _localpath = ""; + string _recursive = Boolean.TrueString; + string _writable = Boolean.TrueString; /// <summary> /// The absolute path to the local working directory. Required. /// </summary> ! [TaskAttribute("localpath", Required=true)] ! public string LocalPath ! { ! get { return _localpath; } ! set { _localpath = value; } ! } /// <summary> *************** *** 41,45 **** [TaskAttribute("recursive")] [BooleanValidator] ! string _recursive = Boolean.TrueString; /// <summary> --- 49,57 ---- [TaskAttribute("recursive")] [BooleanValidator] ! public string Recursive ! { ! get { return _recursive; } ! set { _recursive = value; } ! } /// <summary> *************** *** 49,53 **** [TaskAttribute("writable")] [BooleanValidator] ! string _writable = Boolean.TrueString; protected override void ExecuteTask() { --- 61,69 ---- [TaskAttribute("writable")] [BooleanValidator] ! public string Writable ! { ! get { return _writable; } ! set { _writable = value; } ! } protected override void ExecuteTask() { *************** *** 62,66 **** try { ! Item.Checkout("", _localPath, flags); } catch (Exception e) { --- 78,82 ---- try { ! Item.Checkout("", _localpath, flags); } catch (Exception e) { Index: GetTask.cs =================================================================== RCS file: /cvsroot/nant/nant/src/Extras/SourceSafe/GetTask.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GetTask.cs 19 Dec 2001 01:43:32 -0000 1.1 --- GetTask.cs 27 Mar 2002 00:34:41 -0000 1.2 *************** *** 28,37 **** [TaskName("vssget")] public sealed class GetTask : BaseTask { /// <summary> /// The absolute path to the local working directory. Required. /// </summary> ! [TaskAttribute("localPath", Required=true)] ! string _localPath = null; /// <summary> --- 28,46 ---- [TaskName("vssget")] public sealed class GetTask : BaseTask { + + string _localpath = null; + string _recursive = Boolean.TrueString; + string _replace = Boolean.FalseString; + string _writable = Boolean.FalseString; /// <summary> /// The absolute path to the local working directory. Required. /// </summary> ! [TaskAttribute("localpath", Required=true)] ! public string LocalPath ! { ! get { return _localpath; } ! set { _localpath = value; } ! } /// <summary> *************** *** 41,45 **** [TaskAttribute("recursive")] [BooleanValidator()] ! string _recursive = Boolean.TrueString; /// <summary> --- 50,59 ---- [TaskAttribute("recursive")] [BooleanValidator()] ! public string Recursive ! { ! get { return _recursive; } ! set { _recursive = value; } ! } ! /// <summary> *************** *** 49,53 **** [TaskAttribute("replace")] [BooleanValidator()] ! string _replace = Boolean.FalseString; /// <summary> --- 63,72 ---- [TaskAttribute("replace")] [BooleanValidator()] ! public string Replace ! { ! get { return _replace; } ! set { _replace = value; } ! } ! /// <summary> *************** *** 57,61 **** [TaskAttribute("writable")] [BooleanValidator()] ! string _writable = Boolean.FalseString; protected override void ExecuteTask() { --- 76,85 ---- [TaskAttribute("writable")] [BooleanValidator()] ! public string Writable ! { ! get { return _writable; } ! set { _writable = value; } ! } ! protected override void ExecuteTask() { *************** *** 71,75 **** // Get the version to the local path try { ! Item.Get(ref _localPath, flags); } catch (Exception e) { --- 95,99 ---- // Get the version to the local path try { ! Item.Get(ref _localpath, flags); } catch (Exception e) { *************** *** 77,81 **** } ! Log.WriteLine(LogPrefix + "Put " + Path + " to " + _localPath); } --- 101,105 ---- } ! Log.WriteLine(LogPrefix + "Put " + Path + " to " + _localpath); } Index: LabelTask.cs =================================================================== RCS file: /cvsroot/nant/nant/src/Extras/SourceSafe/LabelTask.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LabelTask.cs 19 Dec 2001 01:43:32 -0000 1.1 --- LabelTask.cs 27 Mar 2002 00:34:41 -0000 1.2 *************** *** 29,37 **** public sealed class LabelTask : BaseTask { /// <summary> /// The label comment. /// </summary> [TaskAttribute("comment")] ! string _comment = ""; /// <summary> --- 29,44 ---- public sealed class LabelTask : BaseTask { + string _comment = ""; + string _label = ""; + /// <summary> /// The label comment. /// </summary> [TaskAttribute("comment")] ! public string Comment ! { ! get { return _comment; } ! set { _comment = value; } ! } /// <summary> *************** *** 39,43 **** /// </summary> [TaskAttribute("label", Required=true)] ! string _label = ""; protected override void ExecuteTask() { --- 46,54 ---- /// </summary> [TaskAttribute("label", Required=true)] ! public string Label ! { ! get { return _label; } ! set { _label = value; } ! } protected override void ExecuteTask() { |