sandweb-commit Mailing List for SandWeb (Page 19)

Brought to you by: formnull, njennings

sandweb-commit — CVS activity

You can subscribe to this list here.

2001	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct (28)	_Nov (58)	_Dec (85)
2002	_Jan (125)	_Feb (222)	_Mar (274)	_Apr (51)	_May (22)	_Jun (50)	_Jul (15)	_Aug (33)	_Sep (11)	_Oct (29)	_Nov (17)	_Dec (1)
2003	_Jan (100)	_Feb (21)	_Mar (7)	_Apr (45)	_May	_Jun (43)	_Jul (27)	_Aug (24)	_Sep	_Oct	_Nov	_Dec
2004	_Jan (1)	_Feb	_Mar (13)	_Apr	_May (1)	_Jun	_Jul	_Aug (7)	_Sep	_Oct	_Nov	_Dec (4)
2005	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec (1)

Flat | Threaded

<< < 1 .. 17 18 19 20 21 .. 53 > >> (Page 19 of 53)

[Sandweb-commit] CVS: sandweb/lib/SandWeb Repository.pm,1.39,1.40

From: Rob H. <for...@us...> - 2002-05-20 06:00:45

Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv1266/lib/SandWeb

Modified Files:
	Repository.pm 
Log Message:
cool, creating tags works now


Index: Repository.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository.pm,v
retrieving revision 1.39
retrieving revision 1.40
diff -U2 -r1.39 -r1.40
--- Repository.pm	23 Apr 2002 06:47:06 -0000	1.39
+++ Repository.pm	20 May 2002 06:00:42 -0000	1.40
@@ -594,5 +594,6 @@
 	my $branch = $args{'branch'};
 	my $check = $args{'check'};
-#XXX	my $force => $args{'force'};
+#XXX	my $force = $args{'force'};
+	my $name = $args{'name'};
 	my $file = $args{'file'};
 
@@ -621,4 +622,8 @@
                         push (@params, 'force');
                         push (@params, "$force");
+                }
+                if ($name) {
+                        push (@params, 'name');
+                        push (@params, "$name");
                 }
                 if ($file) {

[Sandweb-commit] CVS: sandweb/etc sandweb.cfg,1.23,1.24

From: Rob H. <for...@us...> - 2002-05-20 05:46:02

Update of /cvsroot/sandweb/sandweb/etc
In directory usw-pr-cvs1:/tmp/cvs-serv24166/etc

Modified Files:
	sandweb.cfg 
Log Message:
did not mean to check these in; reverting back to previous revs.

damn top-level commits :)


Index: sandweb.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/etc/sandweb.cfg,v
retrieving revision 1.23
retrieving revision 1.24
diff -U2 -r1.23 -r1.24
--- sandweb.cfg	20 May 2002 05:25:09 -0000	1.23
+++ sandweb.cfg	20 May 2002 05:45:59 -0000	1.24
@@ -1,6 +1,2 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE config SYSTEM "http://sandweb.sf.net/dtd/config.dtd">
-
 <!-- SandWeb XML Config File -->
 <config>

[Sandweb-commit] CVS: sandweb install.cfg,1.16,1.17

From: Rob H. <for...@us...> - 2002-05-20 05:46:02

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv24166

Modified Files:
	install.cfg 
Log Message:
did not mean to check these in; reverting back to previous revs.

damn top-level commits :)


Index: install.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/install.cfg,v
retrieving revision 1.16
retrieving revision 1.17
diff -U2 -r1.16 -r1.17
--- install.cfg	20 May 2002 05:25:08 -0000	1.16
+++ install.cfg	20 May 2002 05:45:59 -0000	1.17
@@ -1,14 +1,14 @@
-# Installation configuration variables.
+# Installation configureation variables.
 package config;
 
+$bindir = '/usr/local/bin';
 $cfgdir = '/usr/local/etc/sandweb';
-$cgidir = '/usr/lib/cgi-bin';
+$cgidir = '/var/www/cgi-bin';
 $tmpldir = '/usr/local/lib/sandweb/templates';
 $cachedir = '/usr/local/share/sandweb';
 $logdir = '/var/log';
-$httpuser = 'www-data';
+$httpuser = 'www';
 $expectbin = '/usr/bin/expect';
-$bindir = '/usr/local/bin';
-$ssh_bin = '/usr/local/bin/ssh';
+$ssh_bin = '/usr/bin/ssh';
 $cvs_bin = '/usr/bin/cvs';

[Sandweb-commit] CVS: sandweb install.cfg,1.15,1.16

From: Rob H. <for...@us...> - 2002-05-20 05:25:12

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv16591

Modified Files:
	install.cfg 
Log Message:
filenames get passed to tag_menu now, plus fixed silly bug with
the VCS command getting passed through to the generic "commit_vcs"
subroutine.



Index: install.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/install.cfg,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- install.cfg	23 Apr 2002 06:48:30 -0000	1.15
+++ install.cfg	20 May 2002 05:25:08 -0000	1.16
@@ -1,14 +1,14 @@
-# Installation configureation variables.
+# Installation configuration variables.
 package config;
 
-$bindir = '/usr/local/bin';
 $cfgdir = '/usr/local/etc/sandweb';
-$cgidir = '/var/www/cgi-bin';
+$cgidir = '/usr/lib/cgi-bin';
 $tmpldir = '/usr/local/lib/sandweb/templates';
 $cachedir = '/usr/local/share/sandweb';
 $logdir = '/var/log';
-$httpuser = 'www';
+$httpuser = 'www-data';
 $expectbin = '/usr/bin/expect';
-$ssh_bin = '/usr/bin/ssh';
+$bindir = '/usr/local/bin';
+$ssh_bin = '/usr/local/bin/ssh';
 $cvs_bin = '/usr/bin/cvs';

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.291,1.292

From: Rob H. <for...@us...> - 2002-05-20 05:25:12

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv16591/bin

Modified Files:
	sandweb.cgi 
Log Message:
filenames get passed to tag_menu now, plus fixed silly bug with
the VCS command getting passed through to the generic "commit_vcs"
subroutine.



Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.291
retrieving revision 1.292
diff -U2 -r1.291 -r1.292
--- sandweb.cgi	4 May 2002 05:48:53 -0000	1.291
+++ sandweb.cgi	20 May 2002 05:25:09 -0000	1.292
@@ -83,6 +83,7 @@
 my $user_cfg = 'user.cfg';
 
-my $system_username = '';
-my $system_password = '';
+my $unix_auth;
+my $system_username;
+my $system_password;
 
 ###############################################################################
@@ -255,4 +256,5 @@
 						);
 					}
+					exit;
 				}
 
@@ -655,4 +657,5 @@
 		'vcs_username' => $repo_username,
 		'vcs_password' => $repo_password,
+		'unix_auth' => $unix_auth,
 		'system_username' => $system_username,
 		'system_password' => $system_password,
@@ -1435,9 +1438,9 @@
 # tag menu
 #
-# allows user to select a file that they want to upload
+# allows user to perform tag operations on file or files
 #
 # args:
 #       ck_auth         - the sessions cookie
-#       location        - system path to the file(s) specified by filename
+#       filename	- filename(s) to tag (NOTE: this is an array)
 #       repo_name       - name of the current repository.
 #       module_name     - name of the current module.
@@ -1449,11 +1452,18 @@
 
 	my $ck_auth = $args{'ck_auth'};
-	my $location = $args{'location'};
 	my $module_name = $args{'module_name'};
 	my $repo_name = $args{'repo_name'};
 
+	my @filename = ();
+	my $count = 0;
+	while ( $args{'filename'}->[$count] ) {
+		push (@filename, $args{'filename'}->[$count]);
+		$count++;
+	}
+	my $filename = "@filename";
+
 	my $content = $ui->get_menu( 
 		MENU => 'tag',
-		LOCATION => $location,
+		FILENAME => $filename,
 		PROGNAME => $progname,
 		MODULE_NAME => $module_name,
@@ -1950,4 +1960,5 @@
                 'vcs_username' => $repo_username,
                 'vcs_password' => $repo_password,
+		'unix_auth' => $unix_auth,
                 'system_username' => $system_username,
                 'system_password' => $system_password,
@@ -2182,4 +2193,5 @@
                 	'vcs_username' => $repo_username,
                 	'vcs_password' => $repo_password,
+			'unix_auth' => $unix_auth,
                 	'system_username' => $system_username,
                 	'system_password' => $system_password,
@@ -2481,4 +2493,5 @@
                 'vcs_username' => $repo_username,
                 'vcs_password' => $repo_password,
+		'unix_auth' => $unix_auth,
                 'system_username' => $system_username,
                 'system_password' => $system_password,

[Sandweb-commit] CVS: sandweb/etc sandweb.cfg,1.22,1.23

From: Rob H. <for...@us...> - 2002-05-20 05:25:12

Update of /cvsroot/sandweb/sandweb/etc
In directory usw-pr-cvs1:/tmp/cvs-serv16591/etc

Modified Files:
	sandweb.cfg 
Log Message:
filenames get passed to tag_menu now, plus fixed silly bug with
the VCS command getting passed through to the generic "commit_vcs"
subroutine.



Index: sandweb.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/etc/sandweb.cfg,v
retrieving revision 1.22
retrieving revision 1.23
diff -U2 -r1.22 -r1.23
--- sandweb.cfg	23 Apr 2002 06:46:44 -0000	1.22
+++ sandweb.cfg	20 May 2002 05:25:09 -0000	1.23
@@ -1,2 +1,6 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE config SYSTEM "http://sandweb.sf.net/dtd/config.dtd">
+
 <!-- SandWeb XML Config File -->
 <config>

[Sandweb-commit] CVS: sandweb/lib/SandWeb Shell.pm,1.7,1.8

From: Rob H. <for...@us...> - 2002-05-17 22:40:47

Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv9071/lib/SandWeb

Modified Files:
	Shell.pm 
Log Message:
ah, finally catching the STDERR from CVS, just like cvs.pm used to


Index: Shell.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Shell.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- Shell.pm	23 Apr 2002 06:47:06 -0000	1.7
+++ Shell.pm	17 May 2002 22:40:41 -0000	1.8
@@ -80,5 +80,5 @@
                 $output = join('', @lined_output);
 	} else {
-		$output = `$command`;
+		$output = `$command 2>&1`;
 	}

[Sandweb-commit] CVS: sandweb/t repository.t,1.6,1.7

From: Rob H. <for...@us...> - 2002-05-08 02:39:59

Update of /cvsroot/sandweb/sandweb/t
In directory usw-pr-cvs1:/tmp/cvs-serv10911/t

Modified Files:
	repository.t 
Log Message:
assume cvs is on the path

Index: repository.t
===================================================================
RCS file: /cvsroot/sandweb/sandweb/t/repository.t,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- repository.t	8 May 2002 02:33:23 -0000	1.6
+++ repository.t	8 May 2002 02:39:56 -0000	1.7
@@ -26,5 +26,5 @@
 	'repo_type' => 'CVS',
 	'sandbox' => "t/",
-	'cvs_bin' => "/usr/local/bin/cvs",
+	'cvs_bin' => "cvs",
 ));

[Sandweb-commit] CVS: sandweb/t repository.t,1.5,1.6

From: Rob H. <for...@us...> - 2002-05-08 02:33:27

Update of /cvsroot/sandweb/sandweb/t
In directory usw-pr-cvs1:/tmp/cvs-serv9451/t

Modified Files:
	repository.t 
Log Message:
the tests pass again now :)

The problem is, we need to figure out where CVS is, I just
put "/usr/local/bin/cvs" in for now to make sure it works, but I
guess we can just look on the path and report an error if we don't
find it? I'll do that next



Index: repository.t
===================================================================
RCS file: /cvsroot/sandweb/sandweb/t/repository.t,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- repository.t	24 Mar 2002 09:21:27 -0000	1.5
+++ repository.t	8 May 2002 02:33:23 -0000	1.6
@@ -1,5 +1,5 @@
 use Test;
 use Cwd;
-BEGIN { plan tests => 17, todo => [0] }
+BEGIN { plan tests => 19, todo => [0] }
 
 # test 1
@@ -26,4 +26,5 @@
 	'repo_type' => 'CVS',
 	'sandbox' => "t/",
+	'cvs_bin' => "/usr/local/bin/cvs",
 ));
 
@@ -60,11 +61,20 @@
 # test 10
 
+$file = "t/sandbox/testfile.c";
+if ( -f "$file") {
+	ok( unlink("$file") );
+} else {
+	ok(1);
+}
+
+
+# test 11
+
 %test = $repository->remove( 
 	file => 'sandbox/testfile.c',
-	force => 'yes',
 );
 ok( $test{'errorlevel'} );
 
-# test 11
+# test 12
 
 %test = $repository->commit( 
@@ -76,5 +86,5 @@
 # cleanup section
 
-# test 12
+# test 13
 
 my $file = "t/sandbox/CVS/Entries";
@@ -85,5 +95,5 @@
 }
 
-# test 13
+# test 14
 
 $file = "t/sandbox/CVS/Repository";
@@ -94,5 +104,5 @@
 }
 
-# test 14
+# test 15
 
 $file = "t/sandbox/CVS/Root";
@@ -103,5 +113,14 @@
 }
 
-# test 15
+# test 16
+
+$file = "t/sandbox/CVS/testfile.c,t";
+if ( -f "$file") {
+	ok( unlink("$file") );
+} else {
+	ok(1);
+}
+
+# test 17
 
 $file = "t/sandbox/CVS";
@@ -112,5 +131,5 @@
 }
 
-# test 16
+# test 18
 
 $file = "t/sandbox";
@@ -121,5 +140,5 @@
 }
 
-# test 17
+# test 19
 
 $file = "t/repository/CVSROOT/history";

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.290,1.291

From: Rob H. <for...@us...> - 2002-05-04 05:48:56

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv7290/bin

Modified Files:
	sandweb.cgi 
Log Message:
fixed filename listing

Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.290
retrieving revision 1.291
diff -U2 -r1.290 -r1.291
--- sandweb.cgi	3 May 2002 17:20:01 -0000	1.290
+++ sandweb.cgi	4 May 2002 05:48:53 -0000	1.291
@@ -2497,4 +2497,7 @@
 	$log->debug("Filename(s): @filename");
 
+print header;
+print "$tag_sync";
+exit;
 	if ($tag_sync) {
 		foreach my $file (@filename) {

[Sandweb-commit] CVS: sandweb/templates tag.html,1.10,1.11

From: Rob H. <for...@us...> - 2002-05-04 05:48:56

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv7290/templates

Modified Files:
	tag.html 
Log Message:
fixed filename listing

Index: tag.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/tag.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- tag.html	2 May 2002 19:24:20 -0000	1.10
+++ tag.html	4 May 2002 05:48:54 -0000	1.11
@@ -2,5 +2,5 @@
 <tr>
 <center>
-  File(s): <TMPL_VAR NAME=LOCATION>/<TMPL_VAR NAME=FILENAME>
+  File(s): <TMPL_VAR NAME=FILENAME>
   <form submit="<TMPL_VAR NAME=PROGNAME>">
 	<input type="hidden" name="action" value="vcs" />

[Sandweb-commit] CVS: sandweb INSTALL,1.8,1.9

From: Rob H. <for...@us...> - 2002-05-04 05:39:20

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv5927

Modified Files:
	INSTALL 
Log Message:
adding note on MD5


Index: INSTALL
===================================================================
RCS file: /cvsroot/sandweb/sandweb/INSTALL,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- INSTALL	11 Apr 2002 19:09:27 -0000	1.8
+++ INSTALL	4 May 2002 05:39:16 -0000	1.9
@@ -16,4 +16,5 @@
    * XML::Simple (v1.05+)
    * HTML::Template (v2.2+)
+   * Digest::MD5 (v2.13-2+)
 
    These modules are all available at CPAN ( http://www.cpan.org ).

[Sandweb-commit] CVS: sandweb/lib/SandWeb/Repository cvs.pm,1.13,1.14

From: Rob H. <for...@us...> - 2002-05-03 17:35:02

Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory usw-pr-cvs1:/tmp/cvs-serv6761/lib/SandWeb/Repository

Modified Files:
	cvs.pm 
Log Message:
ok, there was a bug in the "-r " setting



Index: cvs.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- cvs.pm	23 Apr 2002 06:47:06 -0000	1.13
+++ cvs.pm	3 May 2002 17:17:34 -0000	1.14
@@ -703,5 +703,5 @@
 	if ($clobber) { push @param, " -C" };
 	if ($directories) { push @param, " -d" };
-	if ($rev) { push @param, " -r" };
+	if ($rev) { push @param, " -r$rev" };
 	if ($date) { push @param, " -D" };
 	if ($merge) { push @param, " -j" };

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.289,1.290

From: Rob H. <for...@us...> - 2002-05-03 17:20:05

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv6877/bin

Modified Files:
	sandweb.cgi 
Log Message:
tag_commit sortof works, it doesn't seem to be getting the filename
properly, and switching to the trunk isn't working for some reason.


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.289
retrieving revision 1.290
diff -U2 -r1.289 -r1.290
--- sandweb.cgi	3 May 2002 17:02:25 -0000	1.289
+++ sandweb.cgi	3 May 2002 17:20:01 -0000	1.290
@@ -1897,5 +1897,4 @@
 	my $location = $args{'location'};
 	my $message = CGI::param('message');
-	my $name = CGI::param('name');
 	my $username = $auth->get_username();
 	my $users_dir = $config->{'paths'}->{'users_dir'};
@@ -2016,53 +2015,4 @@
 		exit 0;
 	} 
-	if ( $vcs_command eq 'tag' ) {
-		if ($name) {
-			foreach my $file (@filename) {
-				%return = $repository->tag( 
-					file => "$file",
-					name => "$name",
-				);
-				push (@vcs_output, "$return{'output'}\n");
-				push (@vcs_error, "$return{'error'}\n");
-			}
-
-			my $content = $ui->get_menu(
-				MENU => 'vcs_output',
-				LOCATION => $location,
-				FILENAME => @filename,
-				PROGNAME => $progname,
-				VCS_OUTPUT => join('', @vcs_output),
-				VCS_ERROR => join('', @vcs_error),
-			);
-
-			print CGI::header( -cookie => $ck_auth );
-			$ui->print_popup(
-				TITLE=> "SandWeb : VCS $vcs_command",
-				MENU_TITLE => 'SandWeb',
-				SUBMENU_TITLE => "VCS $vcs_command",
-				FOOTER => '',
-				CONTENT => $content,
-				MESSAGE => $message,
-			);
-		}
-		my $content = $ui->get_menu( 
-			MENU => 'tag',
-			LOCATION => $location,
-			MODULE_NAME => $module_name,
-			REPO_NAME => $repo_name,
-			PROGNAME => $progname,
-			FILENAME => "@filename",
-		);
-		print CGI::header( -cookie => $ck_auth );
-		$ui->print_popup(
-			TITLE=> 'SandWeb : tag file(s)',
-			MENU_TITLE => 'SandWeb',
-			SUBMENU_TITLE => 'tag file(s)',
-			FOOTER => '',
-			CONTENT => $content,
-			MESSAGE => $message, 
-		);
-		exit 0;
-	} 
 	#
 	# we only need to show a template for these vcs commands if
@@ -2493,5 +2443,4 @@
 	my $location = $args{'location'};
 	my $message = CGI::param('message');
-	my $name = CGI::param('name');
 	my $username = $auth->get_username();
 	my $users_dir = $config->{'paths'}->{'users_dir'};
@@ -2552,5 +2501,5 @@
 			%return = $repository->update( 
 				file => "$file",
-				rev => "$name",
+				rev => "$tag_sync",
 			);
 			push (@vcs_output, "$return{'output'}\n");
@@ -2562,5 +2511,5 @@
 			%return = $repository->tag( 
 				file => "$file",
-				rev => "$name",
+				rev => "$tag_switch",
 				clobber => 1,
 			);
@@ -2595,5 +2544,5 @@
 			%return = $repository->tag( 
 				file => "$file",
-				name => "$name",
+				name => "$create_tag",
 			);
 			push (@vcs_output, "$return{'output'}\n");
@@ -2605,5 +2554,5 @@
 			%return = $repository->tag( 
 				file => "$file",
-				name => "$name",
+				name => "$remove_tag",
 				delete => 1,
 			);

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.288,1.289

From: Rob H. <for...@us...> - 2002-05-03 17:02:30

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv711

Modified Files:
	sandweb.cgi 
Log Message:
added tag_commit subroutine, everything should be in place but I have
not tested it yet.


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.288
retrieving revision 1.289
diff -U2 -r1.288 -r1.289
--- sandweb.cgi	2 May 2002 19:26:09 -0000	1.288
+++ sandweb.cgi	3 May 2002 17:02:25 -0000	1.289
@@ -230,4 +230,6 @@
 					my $trunk_sync = CGI::param('trunk_sync') || '';
 					my $trunk_switch = CGI::param('trunk_switch') || '';
+					my $create_tag = CGI::param('create_tag') || '';
+					my $remove_tag = CGI::param('remove_tag') || '';
 					if ($submit) {
 						tag_commit(
@@ -237,4 +239,6 @@
 							trunk_sync => $trunk_sync,
 							trunk_switch => $trunk_switch,
+							create_tag => $create_tag,
+							remove_tag => $remove_tag,
 							module_name => $module_name,
 							repo_name => $repo_name,
@@ -2497,4 +2501,11 @@
 	my %return;
 
+	my $tag_sync = $args{'tag_sync'} || '';
+	my $tag_switch = $args{'tag_switch'} || '';
+	my $trunk_sync = $args{'trunk_sync'} || '';
+	my $trunk_switch = $args{'trunk_switch'} || '';
+	my $create_tag = $args{'create_tag'} || '';
+	my $remove_tag = $args{'remove_tag'} || '';
+
 	$log->debug("module_name: $module_name");
 	$log->debug("username: $username");
@@ -2537,9 +2548,63 @@
 	$log->debug("Filename(s): @filename");
 
-	if ($name) {
+	if ($tag_sync) {
+		foreach my $file (@filename) {
+			%return = $repository->update( 
+				file => "$file",
+				rev => "$name",
+			);
+			push (@vcs_output, "$return{'output'}\n");
+			push (@vcs_error, "$return{'error'}\n");
+		}
+	}
+	if ($tag_switch) {
+		foreach my $file (@filename) {
+			%return = $repository->tag( 
+				file => "$file",
+				rev => "$name",
+				clobber => 1,
+			);
+			push (@vcs_output, "$return{'output'}\n");
+			push (@vcs_error, "$return{'error'}\n");
+		}
+	}
+	if ($trunk_sync) {
+		foreach my $file (@filename) {
+			%return = $repository->update( 
+				file => "$file",
+				reset => 1,
+			);
+			push (@vcs_output, "$return{'output'}\n");
+			push (@vcs_error, "$return{'error'}\n");
+		}
+	}
+	if ($trunk_switch) {
+		foreach my $file (@filename) {
+			%return = $repository->tag( 
+				file => "$file",
+				clobber => 1,
+				reset => 1,
+			);
+			push (@vcs_output, "$return{'output'}\n");
+			push (@vcs_error, "$return{'error'}\n");
+		}
+	}
+
+	if ($create_tag) {
+		foreach my $file (@filename) {
+			%return = $repository->tag( 
+				file => "$file",
+				name => "$name",
+			);
+			push (@vcs_output, "$return{'output'}\n");
+			push (@vcs_error, "$return{'error'}\n");
+		}
+	}
+	if ($remove_tag) {
 		foreach my $file (@filename) {
 			%return = $repository->tag( 
 				file => "$file",
 				name => "$name",
+				delete => 1,
 			);
 			push (@vcs_output, "$return{'output'}\n");

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.287,1.288

From: Rob H. <for...@us...> - 2002-05-02 19:26:13

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv1454

Modified Files:
	sandweb.cgi 
Log Message:
added tag_commit subroutine, isn't functional yet though.


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.287
retrieving revision 1.288
diff -U2 -r1.287 -r1.288
--- sandweb.cgi	2 May 2002 19:11:02 -0000	1.287
+++ sandweb.cgi	2 May 2002 19:26:09 -0000	1.288
@@ -2453,4 +2453,120 @@
 }
 
+###############################################################################
+# tag commit
+#
+# processes calls from tag menu to sync with/switch to trunk or tagname
+#
+# A Repository object is created and used.
+#
+# args:
+# 	ck_auth		- the sessions cookie
+#	filename	- name of the file(s) that the vcs_command should
+#			  be used with. NOTE: this is an array
+#	location	- system path to the file(s) specified by filename
+# 	repo_name	- name of the current repository.
+# 	module_name	- name of the current module.
+# 	users_dir	- location of user sandbox directories.
+# 	message		- message to the VCS system.
+###############################################################################
+
+sub tag_commit {
+	my %args = @_;
+
+	my $ck_auth = $args{'ck_auth'};
+	if (! load_config()) {
+		# no existing user config, forward to prefs menu
+		preferences_menu( ck_auth => $ck_auth );
+	}
+	
+	my @filename = ();
+	my $count = 0;
+	while ( $args{'filename'}->[$count] ) {
+		push (@filename, $args{'filename'}->[$count]);
+		$count++;
+	}
+	my $module_name = $args{'module_name'};
+	my $location = $args{'location'};
+	my $message = CGI::param('message');
+	my $name = CGI::param('name');
+	my $username = $auth->get_username();
+	my $users_dir = $config->{'paths'}->{'users_dir'};
+	my $repo_name = $args{'repo_name'};
+	my $prev_url = "$ENV{'HTTP_REFERER'}";
+	$log->debug("prev_url $prev_url");
+	my %return;
+
+	$log->debug("module_name: $module_name");
+	$log->debug("username: $username");
+	$log->debug("location: $location");
+
+	my $repo_server = $user->get_repo_server(repo => $repo_name);
+	my $repo_username = $user->get_repo_username(repo => $repo_name);
+	my $repo_password = $user->get_repo_password(repo => $repo_name);
+	my $repo_type = $user->get_repo_type(repo => $repo_name);
+	my $repo_connection = $user->get_repo_connection(repo => $repo_name);
+	my $repo_root = $user->get_repo_root(repo => $repo_name);
+	my $ssh_bin = $config->{'system'}->{'ssh_bin'};
+	my $cvs_bin = $config->{'system'}->{'cvs_bin'};
+	my $bindir = $config->{'system'}->{'bindir'};
+
+	my $sandbox = $user->{'paths'}->{'users_dir'} || '';
+
+	my @vcs_output = ();
+	my @vcs_error = ();
+
+	my $repository = SandWeb::Repository->new(
+		root => $repo_root,
+		connection => $repo_connection,
+                'vcs_username' => $repo_username,
+                'vcs_password' => $repo_password,
+                'system_username' => $system_username,
+                'system_password' => $system_password,
+		server => $repo_server,
+		repo_type => $repo_type,
+		sandbox => "$users_dir/$username/$repo_name/$module_name/$location",
+		'ssh_bin' => $ssh_bin,
+		'cvs_bin' => $cvs_bin,
+		'bindir' => $bindir,
+	);
+
+	$log->debug("Repo name: $repo_name");
+	$log->debug("Repo root: $repo_root");
+	$log->debug("VCS sandbox: $users_dir/$username/$repo_name/$module_name/$location");
+	$log->debug("Repo type: $repo_type");
+	$log->debug("Filename(s): @filename");
+
+	if ($name) {
+		foreach my $file (@filename) {
+			%return = $repository->tag( 
+				file => "$file",
+				name => "$name",
+			);
+			push (@vcs_output, "$return{'output'}\n");
+			push (@vcs_error, "$return{'error'}\n");
+		}
+	}
+
+	my $content = $ui->get_menu(
+		MENU => 'vcs_output',
+		LOCATION => $location,
+		FILENAME => @filename,
+		PROGNAME => $progname,
+		VCS_OUTPUT => join('', @vcs_output),
+		VCS_ERROR => join('', @vcs_error),
+	);
+
+	print CGI::header( -cookie => $ck_auth );
+	$ui->print_popup(
+		TITLE=> "SandWeb : VCS tag",
+		MENU_TITLE => 'SandWeb',
+		SUBMENU_TITLE => "VCS tag",
+		FOOTER => '',
+		CONTENT => $content,
+		MESSAGE => $message,
+	);
+	exit 0;
+}
+

[Sandweb-commit] CVS: sandweb/templates tag.html,1.9,1.10

From: Rob H. <for...@us...> - 2002-05-02 19:24:24

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv683/templates

Modified Files:
	tag.html 
Log Message:
should be functionally complete, could be prettier though


Index: tag.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/tag.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- tag.html	2 May 2002 18:13:20 -0000	1.9
+++ tag.html	2 May 2002 19:24:20 -0000	1.10
@@ -10,4 +10,5 @@
 	<input type="hidden" name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" />
 	<input type="hidden" name="repo_name" value="<TMPL_VAR NAME=REPO_NAME>" />
+	<input name="Submit" value="1" type="hidden" />
 	<tr>
 	<td align="center">
@@ -16,5 +17,5 @@
 	<td align="left">
 		<input type="text" name="tag_sync" />
-		<input type="submit"  />
+		<input type="submit" />
 	</td>
 	</td>
@@ -37,6 +38,5 @@
 	</td>
 	<td align="left">
-		<input name="Submit" value="trunk_sync" type="hidden" />
-		<input type="submit"  />
+		<input type="submit" name="trunk_sync" value="Submit" />
 	</td>
 	</tr>
@@ -46,7 +46,28 @@
 	</td>
 	<td align="left">
-		<input name="Submit" value="trunk_switch" type="hidden" />
+		<input type="submit" name="trunk_switch" value="Submit" />
+	</td>
+	</tr>
+</table>
+<table width="100%" border="1" align="center" valign="top" cellspacing="0" cellpadding="0">
+
+	<hr />
+	<tr>
+	<td align="center">
+		Create tag :
+	</td>
+	<td align="left">
+		<input name="create_tag" type="text" />
 		<input type="submit"  />
 	</td>
+	</tr>
+	<td align="center">
+		Remove tag :
+	</td>
+	<td align="left">
+		<input name="remove_tag" type="text" />
+		<input type="submit" name="Submit" />
+	</td>
+	<tr>
 	</tr>
   </form>

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.286,1.287

From: Rob H. <for...@us...> - 2002-05-02 19:11:06

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv29550/bin

Modified Files:
	sandweb.cgi 
Log Message:
added tag_menu subroutine


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.286
retrieving revision 1.287
diff -U2 -r1.286 -r1.287
--- sandweb.cgi	2 May 2002 19:05:50 -0000	1.286
+++ sandweb.cgi	2 May 2002 19:11:02 -0000	1.287
@@ -614,5 +614,4 @@
 # 	repo_name	- name of the current repository.
 # 	module_name	- name of the current module.
-# 	template_dir	- location of templates.
 # 	users_dir	- location of user sandbox directories.
 ###############################################################################
@@ -631,5 +630,4 @@
 
 	my $username = $auth->get_username() || '';
-	my $template_dir = $config->{'paths'}->{'template_dir'} || '';
 	my $module_name = $args{'module_name'} || '';
 	my $users_dir = $config->{'paths'}->{'users_dir'} || '';
@@ -668,5 +666,4 @@
 		'module_name' => $module_name,
 		'repo_name' => $repo_name,
-		'template_dir' => $template_dir,
 		'vcs_commands' => \@vcs_commands,
 		'sort' => $sort,
@@ -1005,5 +1002,4 @@
 # 	repo_name	- name of the current repository.
 # 	module_name	- name of the current module.
-# 	template_dir	- location of templates.
 # 	users_dir	- location of user sandbox directories.
 ###############################################################################
@@ -1019,5 +1015,4 @@
 	my $location = $args{'location'};
 	my $username = $auth->get_username();
-	my $template_dir = $config->{'paths'}->{'template_dir'};
 	my $users_dir = $config->{'paths'}->{'users_dir'};
 	my $repo_name = $args{'repo_name'};
@@ -1065,5 +1060,4 @@
 		'module_name' => $module_name,
 		'repo_name' => $repo_name,
-		'template_dir' => $template_dir,
 		'vcs_commands' => \@vcs_commands,
 		'users_dir' => $users_dir,
@@ -1162,5 +1156,4 @@
 # 	repo_name	- name of the current repository.
 # 	module_name	- name of the current module.
-# 	template_dir	- location of templates.
 # 	users_dir	- location of user sandbox directories.
 ###############################################################################
@@ -1176,5 +1169,4 @@
 	my $location = $args{'location'};
 	my $username = $auth->get_username();
-	my $template_dir = $config->{'paths'}->{'template_dir'};
 	my $users_dir = $config->{'paths'}->{'users_dir'};
 	my $repo_name = $args{'repo_name'};
@@ -1242,5 +1234,4 @@
 # 	repo_name	- name of the current repository.
 # 	module_name	- name of the current module.
-# 	template_dir	- location of templates.
 # 	users_dir	- location of user sandbox directories.
 ###############################################################################
@@ -1256,5 +1247,4 @@
 	my $location = $args{'location'};
 	my $username = $auth->get_username();
-	my $template_dir = $config->{'paths'}->{'template_dir'};
 	my $users_dir = $config->{'paths'}->{'users_dir'};
 	my $repo_name = $args{'repo_name'};
@@ -1327,5 +1317,4 @@
 # 	repo_name	- name of the current repository.
 # 	module_name	- name of the current module.
-# 	template_dir	- location of templates.
 # 	users_dir	- location of user sandbox directories.
 ###############################################################################
@@ -1370,5 +1359,4 @@
 # 	repo_name	- name of the current repository.
 # 	module_name	- name of the current module.
-# 	template_dir	- location of templates.
 # 	users_dir	- location of user sandbox directories.
 ###############################################################################
@@ -1410,5 +1398,4 @@
 # 	repo_name	- name of the current repository.
 # 	module_name	- name of the current module.
-# 	template_dir	- location of templates.
 # 	users_dir	- location of user sandbox directories.
 ###############################################################################
@@ -1441,4 +1428,42 @@
 }
 
+###############################################################################
+# tag menu
+#
+# allows user to select a file that they want to upload
+#
+# args:
+#       ck_auth         - the sessions cookie
+#       location        - system path to the file(s) specified by filename
+#       repo_name       - name of the current repository.
+#       module_name     - name of the current module.
+#       users_dir       - location of user sandbox directories.
+###############################################################################
+
+sub tag_menu {
+	my %args = @_;
+
+	my $ck_auth = $args{'ck_auth'};
+	my $location = $args{'location'};
+	my $module_name = $args{'module_name'};
+	my $repo_name = $args{'repo_name'};
+
+	my $content = $ui->get_menu( 
+		MENU => 'tag',
+		LOCATION => $location,
+		PROGNAME => $progname,
+		MODULE_NAME => $module_name,
+		REPO_NAME => $repo_name,
+	);
+	print CGI::header( -cookie => $ck_auth );
+	$ui->print_popup(
+		TITLE=> 'SandWeb : tag menu',
+		MENU_TITLE => 'SandWeb',
+		SUBMENU_TITLE => 'tag menu',
+		FOOTER => '',
+		CONTENT => $content,
+		MESSAGE => $message, 
+	);
+}
 
 ###############################################################################
@@ -1459,5 +1484,4 @@
 # 	repo_name	- name of the current repository.
 # 	module_name	- name of the current module.
-# 	template_dir	- location of templates.
 # 	users_dir	- location of user sandbox directories.
 ###############################################################################
@@ -1474,5 +1498,4 @@
 	my $location = $args{'location'};
 	my $username = $auth->get_username();
-	my $template_dir = $config->{'paths'}->{'template_dir'};
 	my $users_dir = $config->{'paths'}->{'users_dir'};
 	my $repo_name = $args{'repo_name'};
@@ -1516,5 +1539,4 @@
 # 	repo_name	- name of the current repository.
 # 	module_name	- name of the current module.
-# 	template_dir	- location of templates.
 # 	users_dir	- location of user sandbox directories.
 ###############################################################################
@@ -1526,5 +1548,4 @@
 	my $location = $args{'location'};
 	my $username = $auth->get_username();
-	my $template_dir = $config->{'paths'}->{'template_dir'};
 	my $users_dir = $config->{'paths'}->{'users_dir'};
 	my $repo_name = $args{'repo_name'};
@@ -1631,5 +1652,4 @@
 # 	repo_name	- name of the current repository.
 # 	module_name	- name of the current module.
-# 	template_dir	- location of templates.
 # 	users_dir	- location of user sandbox directories.
 ###############################################################################
@@ -1640,5 +1660,4 @@
 	my $location = $args{'location'};
 	my $username = $auth->get_username();
-	my $template_dir = $config->{'paths'}->{'template_dir'};
 	my $users_dir = $config->{'paths'}->{'users_dir'};
 	my $repo_name = $args{'repo_name'};
@@ -1680,5 +1699,4 @@
 # 	repo_name	- name of the current repository.
 # 	module_name	- name of the current module.
-# 	template_dir	- location of templates.
 # 	users_dir	- location of user sandbox directories.
 ###############################################################################
@@ -1689,5 +1707,4 @@
 	my $location = $args{'location'};
 	my $username = $auth->get_username();
-	my $template_dir = $config->{'paths'}->{'template_dir'};
 	my $users_dir = $config->{'paths'}->{'users_dir'};
 	my $repo_name = $args{'repo_name'};
@@ -1723,5 +1740,4 @@
 # 	repo_name	- name of the current repository.
 # 	module_name	- name of the current module.
-# 	template_dir	- location of templates.
 # 	users_dir	- location of user sandbox directories.
 ###############################################################################
@@ -1732,5 +1748,4 @@
 	my $location = $args{'location'};
 	my $username = $auth->get_username();
-	my $template_dir = $config->{'paths'}->{'template_dir'};
 	my $users_dir = $config->{'paths'}->{'users_dir'};
 	my $repo_name = $args{'repo_name'};
@@ -1767,5 +1782,4 @@
 # 	repo_name	- name of the current repository.
 # 	module_name	- name of the current module.
-# 	template_dir	- location of templates.
 # 	users_dir	- location of user sandbox directories.
 ###############################################################################
@@ -1776,5 +1790,4 @@
 	my $location = $args{'location'};
 	my $username = $auth->get_username();
-	my $template_dir = $config->{'paths'}->{'template_dir'};
 	my $users_dir = $config->{'paths'}->{'users_dir'};
 	my $repo_name = $args{'repo_name'};
@@ -1817,5 +1830,4 @@
 # 	repo_name	- name of the current repository.
 # 	module_name	- name of the current module.
-# 	template_dir	- location of templates.
 # 	users_dir	- location of user sandbox directories.
 ###############################################################################
@@ -1826,5 +1838,4 @@
 	my $location = $args{'location'};
 	my $username = $auth->get_username();
-	my $template_dir = $config->{'paths'}->{'template_dir'};
 	my $users_dir = $config->{'paths'}->{'users_dir'};
 	my $repo_name = $args{'repo_name'};
@@ -1859,5 +1870,4 @@
 # 	repo_name	- name of the current repository.
 # 	module_name	- name of the current module.
-# 	template_dir	- location of templates.
 # 	users_dir	- location of user sandbox directories.
 # 	message		- message to the VCS system.
@@ -1885,5 +1895,4 @@
 	my $name = CGI::param('name');
 	my $username = $auth->get_username();
-	my $template_dir = $config->{'paths'}->{'template_dir'};
 	my $users_dir = $config->{'paths'}->{'users_dir'};
 	my $repo_name = $args{'repo_name'};
@@ -2204,5 +2213,4 @@
 
 	my $username = $auth->get_username();
-	my $template_dir = $config->{'paths'}->{'template_dir'};
 	my $users_dir = $config->{'paths'}->{'users_dir'};

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.285,1.286

From: Rob H. <for...@us...> - 2002-05-02 19:05:55

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv27985a

Modified Files:
	sandweb.cgi 
Log Message:
put in hooks for as-yet non-existant tag_menu and tag_commit subroutines.


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.285
retrieving revision 1.286
diff -U2 -r1.285 -r1.286
--- sandweb.cgi	23 Apr 2002 07:08:27 -0000	1.285
+++ sandweb.cgi	2 May 2002 19:05:50 -0000	1.286
@@ -218,14 +218,42 @@
 				# called VCS action
 				my @filename = ();
+
 				if ( CGI::param('filename') ) {
 					@filename = CGI::param('filename'),
-				} 
-				else {
+				} else {
 					@filename = ('.');
 				}
 
+				if ( $vcs_command eq "tag" ) {
+					my $tag_sync = CGI::param('tag_sync') || '';
+					my $tag_switch = CGI::param('tag_switch') || '';
+					my $trunk_sync = CGI::param('trunk_sync') || '';
+					my $trunk_switch = CGI::param('trunk_switch') || '';
+					if ($submit) {
+						tag_commit(
+							ck_auth => $ck_auth,
+							tag_sync => $tag_sync,
+							tag_switch => $tag_switch,
+							trunk_sync => $trunk_sync,
+							trunk_switch => $trunk_switch,
+							module_name => $module_name,
+							repo_name => $repo_name,
+							filename => \@filename,
+							location => $location,
+						);
+					} else {
+						tag_menu(
+							ck_auth => $ck_auth,
+							module_name => $module_name,
+							repo_name => $repo_name,
+							filename => \@filename,
+							location => $location,
+						);
+					}
+				}
+
 				vcs_commit(
 					ck_auth => $ck_auth,
-					vcs_command => CGI::param('vcs_command') || '',
+					vcs_command => $vcs_command,
 					module_name => $module_name,
 					repo_name => $repo_name,

[Sandweb-commit] CVS: sandweb/templates tag.html,1.8,1.9

From: Rob H. <for...@us...> - 2002-05-02 18:13:25

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv11130/templates

Modified Files:
	tag.html 
Log Message:
first version w/ new "sync/switch" options.


Index: tag.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/tag.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- tag.html	22 Mar 2002 04:14:51 -0000	1.8
+++ tag.html	2 May 2002 18:13:20 -0000	1.9
@@ -1,20 +1,55 @@
-<table width="100%" border="0" align="center" valign="top" cellspacing="0" cellpadding="0">
+<table width="100%" border="1" align="center" valign="top" cellspacing="0" cellpadding="0">
 <tr>
- <td width="100%">
 <center>
-  Please enter a tag name for <TMPL_VAR NAME=LOCATION>/<TMPL_VAR NAME=FILENAME> :
+  File(s): <TMPL_VAR NAME=LOCATION>/<TMPL_VAR NAME=FILENAME>
   <form submit="<TMPL_VAR NAME=PROGNAME>">
-    <input type="hidden" name="action" value="vcs" />
-    <input type="hidden" name="vcs_command" value="tag" />
-    <input type="hidden" name="filename" value="<TMPL_VAR NAME=FILENAME>" />
-    <input type="hidden" name="location" value="<TMPL_VAR NAME=LOCATION>" />
-    <input type="hidden" name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" />
-    <input type="hidden" name="repo_name" value="<TMPL_VAR NAME=REPO_NAME>" />
-    <input name="Submit" value="1" type="hidden" />
-    <input type="text" name="name" />
-    <input type="Submit" name="commit" value="Done" />
+	<input type="hidden" name="action" value="vcs" />
+	<input type="hidden" name="vcs_command" value="tag" />
+	<input type="hidden" name="filename" value="<TMPL_VAR NAME=FILENAME>" />
+	<input type="hidden" name="location" value="<TMPL_VAR NAME=LOCATION>" />
+	<input type="hidden" name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" />
+	<input type="hidden" name="repo_name" value="<TMPL_VAR NAME=REPO_NAME>" />
+	<tr>
+	<td align="center">
+		Sync with tag : 
+	</td>
+	<td align="left">
+		<input type="text" name="tag_sync" />
+		<input type="submit"  />
+	</td>
+	</td>
+	</tr>
+	<tr>
+        <td align="center">
+		Switch to tag : 
+	</td>
+	<td align="left">
+		<input type="text" name="tag_switch" />
+		<input type="submit"  />
+	</td>
+	</td>
+	</tr>
+        </td>
+	</tr>
+	<tr>
+	<td align="center">
+		Sync with trunk
+	</td>
+	<td align="left">
+		<input name="Submit" value="trunk_sync" type="hidden" />
+		<input type="submit"  />
+	</td>
+	</tr>
+	<tr>
+	<td align="center">
+		Switch to trunk
+	</td>
+	<td align="left">
+		<input name="Submit" value="trunk_switch" type="hidden" />
+		<input type="submit"  />
+	</td>
+	</tr>
   </form>
 </center>
- </td>
 </tr>
 </table>

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.284,1.285

From: Rob H. <for...@us...> - 2002-04-23 07:33:08

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv2966/bin

Modified Files:
	sandweb.cgi 
Log Message:
needed for SSH/CVS/Expect integration

Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.284
retrieving revision 1.285
diff -U2 -r1.284 -r1.285
--- sandweb.cgi	13 Apr 2002 18:43:49 -0000	1.284
+++ sandweb.cgi	23 Apr 2002 07:08:27 -0000	1.285
@@ -617,4 +617,5 @@
 	my $ssh_bin = $config->{'system'}->{'ssh_bin'};
 	my $cvs_bin = $config->{'system'}->{'cvs_bin'};
+	my $bindir = $config->{'system'}->{'bindir'};
 
 	$log->debug("creating Repository object");
@@ -630,4 +631,5 @@
 		'ssh_bin' => $ssh_bin,
 		'cvs_bin' => $cvs_bin,
+		'bindir' => $bindir,
 	);
 
@@ -1874,4 +1876,5 @@
 	my $ssh_bin = $config->{'system'}->{'ssh_bin'};
 	my $cvs_bin = $config->{'system'}->{'cvs_bin'};
+	my $bindir = $config->{'system'}->{'bindir'};
 
 	my $sandbox = $user->{'paths'}->{'users_dir'} || '';
@@ -1914,4 +1917,5 @@
 		'ssh_bin' => $ssh_bin,
 		'cvs_bin' => $cvs_bin,
+		'bindir' => $bindir,
 	);
 
@@ -2141,4 +2145,5 @@
 	my $ssh_bin = $config->{'system'}->{'ssh_bin'};
 	my $cvs_bin = $config->{'system'}->{'cvs_bin'};
+	my $bindir = $config->{'system'}->{'bindir'};
 	
 	# true if commit vcs checkout action (works for update too)
@@ -2194,4 +2199,5 @@
 			'ssh_bin' => $ssh_bin,
 			'cvs_bin' => $cvs_bin,
+			'bindir' => $bindir,
 		);
 
@@ -2353,5 +2359,5 @@
 					server => $repo_server,
 					username => $repo_username,
-					password = $repo_password,
+					password => $repo_password,
 					connection => $repo_connection,
 					type => $repo_type,

[Sandweb-commit] CVS: sandweb/tools install_script.pl,1.16,1.17

From: Rob H. <for...@us...> - 2002-04-23 07:33:01

Update of /cvsroot/sandweb/sandweb/tools
In directory usw-pr-cvs1:/tmp/cvs-serv5231/tools

Modified Files:
	install_script.pl 
Log Message:
bindir should be saved back to install.cfg

Index: install_script.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/install_script.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -U2 -r1.16 -r1.17
--- install_script.pl	23 Apr 2002 06:59:44 -0000	1.16
+++ install_script.pl	23 Apr 2002 07:17:40 -0000	1.17
@@ -170,4 +170,5 @@
 print CFG '$httpuser = ' . "'$httpuser';\n";	
 print CFG '$expectbin = ' . "'$expectbin';\n";
+print CFG '$bindir = ' . "'$bindir';\n";
 print CFG '$ssh_bin = ' . "'$ssh_bin';\n";
 print CFG '$cvs_bin = ' . "'$cvs_bin';\n";

[Sandweb-commit] CVS: sandweb/bin sandweb-expect,1.3,1.4

From: Rob H. <for...@us...> - 2002-04-23 07:33:00

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv3508/bin

Modified Files:
	sandweb-expect 
Log Message:
changed the #! line so it's easier to use change-entry on it


Index: sandweb-expect
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb-expect,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- sandweb-expect	2 Apr 2002 06:38:46 -0000	1.3
+++ sandweb-expect	23 Apr 2002 07:11:09 -0000	1.4
@@ -1,3 +1,3 @@
-#!/usr/bin/expect -f
+#!expect
 
 # Unix account, vcs password :

[Sandweb-commit] CVS: sandweb/tools install_script.pl,1.15,1.16

From: Rob H. <for...@us...> - 2002-04-23 06:59:47

Update of /cvsroot/sandweb/sandweb/tools
In directory usw-pr-cvs1:/tmp/cvs-serv791/tools

Modified Files:
	install_script.pl 
Log Message:
finally! that should do it. SSH binary, CVS binary and Expect binary are all asked for if not found in default locations upon 'make install'.

Index: install_script.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/install_script.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- install_script.pl	23 Apr 2002 06:50:58 -0000	1.15
+++ install_script.pl	23 Apr 2002 06:59:44 -0000	1.16
@@ -16,4 +16,6 @@
       "httpuser  = $config::httpuser\n";
       "expectbin = $config::expectbin\n";
+      "cvs_bin   = $config::cvs_bin\n";
+      "ssh_bin   = $config::ssh_bin\n";
 
 my $bindir    = $config::bindir    || '/usr/local/bin';
@@ -55,5 +57,5 @@
 	print("Locating CVS binary...\n\n");
 	print("Specify full path and filename of the CVS binary.\n");
-	print("[default: $ssh_bin] : ");
+	print("[default: $cvs_bin] : ");
 	my $tmp = '';
 	chomp($tmp = <STDIN>);
@@ -71,5 +73,5 @@
 	chomp($tmp = <STDIN>);
 	if ($tmp) {
-		$cvs_bin = $tmp;
+		$ssh_bin = $tmp;
 	}
 }
@@ -111,4 +113,6 @@
 system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'data_dir="../var/data"', "data_dir=\"$cachedir/data\"");
 system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'users_dir="../var/users"', "users_dir=\"$cachedir/users\"");
+system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'ssh_bin="/usr/bin/ssh"', "ssh_bin=\"$ssh_bin\"");
+system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'cvs_bin="/usr/bin/cvs"', "cvs_bin=\"$cvs_bin\"");
 
 # updating config path in executables
@@ -166,4 +170,6 @@
 print CFG '$httpuser = ' . "'$httpuser';\n";	
 print CFG '$expectbin = ' . "'$expectbin';\n";
+print CFG '$ssh_bin = ' . "'$ssh_bin';\n";
+print CFG '$cvs_bin = ' . "'$cvs_bin';\n";
 print CFG "\n1;\n";
 close CFG;

[Sandweb-commit] CVS: sandweb/tools install_script.pl,1.14,1.15

From: Rob H. <for...@us...> - 2002-04-23 06:51:01

Update of /cvsroot/sandweb/sandweb/tools
In directory usw-pr-cvs1:/tmp/cvs-serv31131a/tools

Modified Files:
	install_script.pl 
Log Message:
cvs_bin and ssh_bin should be configurable too

Index: install_script.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/install_script.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- install_script.pl	2 Apr 2002 06:38:46 -0000	1.14
+++ install_script.pl	23 Apr 2002 06:50:58 -0000	1.15
@@ -8,19 +8,23 @@
 require 'install.cfg'; # load config
 
-print "\nbindir   = $config::bindir\n".
-      "cfgdir   = $config::cfgdir\n".
-      "cgidir   = $config::cgidir\n".
-      "tmpldir  = $config::tmpldir\n".
-      "cachedir = $config::cachedir\n".
-      "logdir   = $config::logdir\n".
-      "httpuser = $config::httpuser\n";
-
-my $bindir   = $config::bindir   || '/usr/local/bin';
-my $cfgdir   = $config::cfgdir   || '/usr/local/etc';
-my $cgidir   = $config::cgidir   || '/var/www/cgi-bin';
-my $tmpldir  = $config::tmpldir  || "$PREFIX/lib/sandweb/templates";
-my $cachedir = $config::cachedir || '/var/cache/sandweb';
-my $logdir   = $config::logdir   || '/var/log';
-my $httpuser = $config::httpuser || 'www';
+print "\nbindir  = $config::bindir\n".
+      "cfgdir    = $config::cfgdir\n".
+      "cgidir    = $config::cgidir\n".
+      "tmpldir   = $config::tmpldir\n".
+      "cachedir  = $config::cachedir\n".
+      "logdir    = $config::logdir\n".
+      "httpuser  = $config::httpuser\n";
+      "expectbin = $config::expectbin\n";
+
+my $bindir    = $config::bindir    || '/usr/local/bin';
+my $cfgdir    = $config::cfgdir    || '/usr/local/etc';
+my $cgidir    = $config::cgidir    || '/var/www/cgi-bin';
+my $tmpldir   = $config::tmpldir   || "$PREFIX/lib/sandweb/templates";
+my $cachedir  = $config::cachedir  || '/var/cache/sandweb';
+my $logdir    = $config::logdir    || '/var/log';
+my $httpuser  = $config::httpuser  || 'www';
+my $expectbin = $config::expectbin || '/usr/bin/expect';
+my $ssh_bin   = $config::ssh_bin   || '/usr/bin/ssh';
+my $cvs_bin   = $config::cvs_bin   || '/usr/bin/cvs';
 
 # load functions
@@ -35,4 +39,40 @@
 exit(2) if (!$bindir);
 
+if (!-f $expectbin) {
+	print("-------------------------\n");
+	print("Installing sandweb-expect...\n\n");
+	print("Specify full path and filename of the expect binary.\n");
+	print("[default: $expectbin] : ");
+	my $tmp = '';
+	chomp($tmp = <STDIN>);
+	if ($tmp) {
+		$expectbin = $tmp;
+	}
+}
+
+if (!-f $cvs_bin) {
+	print("-------------------------\n");
+	print("Locating CVS binary...\n\n");
+	print("Specify full path and filename of the CVS binary.\n");
+	print("[default: $ssh_bin] : ");
+	my $tmp = '';
+	chomp($tmp = <STDIN>);
+	if ($tmp) {
+		$cvs_bin = $tmp;
+	}
+}
+
+if (!-f $ssh_bin) {
+	print("-------------------------\n");
+	print("Locating SSH binary...\n\n");
+	print("Specify full path and filename of the SSH binary.\n");
+	print("[default: $ssh_bin] : ");
+	my $tmp = '';
+	chomp($tmp = <STDIN>);
+	if ($tmp) {
+		$cvs_bin = $tmp;
+	}
+}
+
 # CGI
 $cgidir = instcgi($cgidir);
@@ -79,4 +119,6 @@
 system('tools/change-entry.pl', "$bindir/sandweb-admin", "config_dir = '../etc'", "config_dir = '$cfgdir'");
 print "sandweb-admin\n";
+system('tools/change-entry.pl', "$bindir/sandweb-expect", "#!expect", "#!$expectbin");
+print "sandweb-expect\n";
 
 # set execute permissions for scripts 
@@ -92,5 +134,5 @@
 	chown($httpuser_uid, 0, "$bindir/sandweb-admin");
 	# setguid for sandweb-admin
-	system("chmod", "u=rwxs,g=rwx,o=", "$bindir/sandweb-admin");
+	system("chmod", "u=rwxs,g=rx,o=", "$bindir/sandweb-admin");
 } else {
 	print "unable to locate $bindir/sandweb-admin\n";
@@ -106,4 +148,5 @@
 	#print "Setting ownership of $PREFIX/bin/sandweb-expect to: $httpuser_uid:0\n";
 	chown($httpuser_uid, 0, "$bindir/sandweb-expect");
+	system("chmod", "u=rwx,g=rx,o=", "$bindir/sandweb-expect");
 } else {
 	print "unable to locate $bindir/sandweb-expect\n";
@@ -122,4 +165,5 @@
 print CFG '$logdir = ' . "'$logdir';\n";	
 print CFG '$httpuser = ' . "'$httpuser';\n";	
+print CFG '$expectbin = ' . "'$expectbin';\n";
 print CFG "\n1;\n";
 close CFG;

3 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 17 18 19 20 21 .. 53 > >> (Page 19 of 53)

2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (28)	Nov (58)	Dec (85)
2002	Jan (125)	Feb (222)	Mar (274)	Apr (51)	May (22)	Jun (50)	Jul (15)	Aug (33)	Sep (11)	Oct (29)	Nov (17)	Dec (1)
2003	Jan (100)	Feb (21)	Mar (7)	Apr (45)	May	Jun (43)	Jul (27)	Aug (24)	Sep	Oct	Nov	Dec
2004	Jan (1)	Feb	Mar (13)	Apr	May (1)	Jun	Jul	Aug (7)	Sep	Oct	Nov	Dec (4)
2005	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)