Rename hydra_*.pl to hydra-*
The underscores are ugly and the .pl extension is an implementation detail that shouldn't be visible to the outside. Also, get rid of the *.in files. It's not really necessary to generate them. And I was always modifying the wrong file.
This commit is contained in:
		
							
								
								
									
										10
									
								
								configure.ac
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								configure.ac
									
									
									
									
									
								
							| @@ -94,14 +94,4 @@ AC_CONFIG_FILES([ | |||||||
|   tests/jobs/config.nix |   tests/jobs/config.nix | ||||||
| ]) | ]) | ||||||
|  |  | ||||||
| AC_CONFIG_FILES([src/script/hydra_build.pl], [chmod +x src/script/hydra_build.pl]) |  | ||||||
| AC_CONFIG_FILES([src/script/hydra_create.pl], [chmod +x src/script/hydra_create.pl]) |  | ||||||
| AC_CONFIG_FILES([src/script/hydra_evaluator.pl], [chmod +x src/script/hydra_evaluator.pl]) |  | ||||||
| AC_CONFIG_FILES([src/script/hydra_queue_runner.pl], [chmod +x src/script/hydra_queue_runner.pl]) |  | ||||||
| AC_CONFIG_FILES([src/script/hydra_server.pl], [chmod +x src/script/hydra_server.pl]) |  | ||||||
| AC_CONFIG_FILES([src/script/hydra_update_gc_roots.pl], [chmod +x src/script/hydra_update_gc_roots.pl]) |  | ||||||
| AC_CONFIG_FILES([tests/query-all-tables.pl], [chmod +x tests/query-all-tables.pl]) |  | ||||||
| AC_CONFIG_FILES([tests/evaluation-tests.pl], [chmod +x tests/evaluation-tests.pl]) |  | ||||||
|  |  | ||||||
| AC_OUTPUT | AC_OUTPUT | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,19 +1,19 @@ | |||||||
| EXTRA_DIST = \ | EXTRA_DIST = \ | ||||||
|   hydra_control.sh \ |   hydra-control \ | ||||||
|   nix-prefetch-svn \ |  | ||||||
|   nix-prefetch-git \ |  | ||||||
|   nix-prefetch-bzr \ |  | ||||||
|   nix-prefetch-hg  |  | ||||||
|  |  | ||||||
| bin_SCRIPTS = \ |  | ||||||
|   hydra_build.pl \ |  | ||||||
|   hydra_evaluator.pl \ |  | ||||||
|   hydra_queue_runner.pl \ |  | ||||||
|   hydra_server.pl \ |  | ||||||
|   hydra_update_gc_roots.pl \ |  | ||||||
|   hydra_create.pl \ |  | ||||||
|   nix-prefetch-svn \ |   nix-prefetch-svn \ | ||||||
|   nix-prefetch-git \ |   nix-prefetch-git \ | ||||||
|   nix-prefetch-bzr \ |   nix-prefetch-bzr \ | ||||||
|   nix-prefetch-hg \ |   nix-prefetch-hg \ | ||||||
|   hydra_control.sh |   $(bin_SCRIPTS) | ||||||
|  |  | ||||||
|  | bin_SCRIPTS = \ | ||||||
|  |   hydra-build \ | ||||||
|  |   hydra-evaluator \ | ||||||
|  |   hydra-queue-runner \ | ||||||
|  |   hydra-server \ | ||||||
|  |   hydra-update-gc-roots \ | ||||||
|  |   hydra-create \ | ||||||
|  |   nix-prefetch-svn \ | ||||||
|  |   nix-prefetch-git \ | ||||||
|  |   nix-prefetch-bzr \ | ||||||
|  |   nix-prefetch-hg | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| #! @perl@ -w -I@nix@/libexec/nix | #! /var/run/current-system/sw/bin/perl -w | ||||||
| 
 | 
 | ||||||
| use strict; | use strict; | ||||||
| use File::Basename; | use File::Basename; | ||||||
| @@ -430,7 +430,7 @@ sub doBuild { | |||||||
| } | } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| my $buildId = $ARGV[0] or die; | my $buildId = $ARGV[0] or die "syntax: $0 BUILD-ID\n"; | ||||||
| print STDERR "performing build $buildId\n"; | print STDERR "performing build $buildId\n"; | ||||||
| 
 | 
 | ||||||
| if ($ENV{'HYDRA_MAIL_TEST'}) { | if ($ENV{'HYDRA_MAIL_TEST'}) { | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| #! @perl@ -w -I@nix@/libexec/nix | #! /var/run/current-system/sw/bin/perl -w | ||||||
| 
 | 
 | ||||||
| use strict; | use strict; | ||||||
| use feature 'switch'; | use feature 'switch'; | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| #! @perl@ -w -I@nix@/libexec/nix | #! /var/run/current-system/sw/bin/perl -w | ||||||
| 
 | 
 | ||||||
| use strict; | use strict; | ||||||
| use Cwd; | use Cwd; | ||||||
| @@ -138,7 +138,7 @@ sub checkBuilds { | |||||||
|                     open LOG, ">$logfile" or die "cannot create logfile $logfile"; |                     open LOG, ">$logfile" or die "cannot create logfile $logfile"; | ||||||
|                     POSIX::dup2(fileno(LOG), 1) or die; |                     POSIX::dup2(fileno(LOG), 1) or die; | ||||||
|                     POSIX::dup2(fileno(LOG), 2) or die; |                     POSIX::dup2(fileno(LOG), 2) or die; | ||||||
|                     exec("hydra_build.pl", $id); |                     exec("hydra-build", $id); | ||||||
|                 }; |                 }; | ||||||
|                 warn "cannot start build $id: $@"; |                 warn "cannot start build $id: $@"; | ||||||
|                 POSIX::_exit(1); |                 POSIX::_exit(1); | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| #! @perl@ -w -I@nix@/libexec/nix | #! /var/run/current-system/sw/bin/perl -w | ||||||
| 
 | 
 | ||||||
| BEGIN { | BEGIN { | ||||||
|     $ENV{CATALYST_SCRIPT_GEN} = 40; |     $ENV{CATALYST_SCRIPT_GEN} = 40; | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| #! @perl@ -w -I@nix@/libexec/nix | #! /var/run/current-system/sw/bin/perl -w | ||||||
| 
 | 
 | ||||||
| use strict; | use strict; | ||||||
| use File::Path; | use File::Path; | ||||||
| @@ -16,7 +16,10 @@ TESTS_ENVIRONMENT =					\ | |||||||
| EXTRA_DIST = \ | EXTRA_DIST = \ | ||||||
|   $(wildcard *.pm) \ |   $(wildcard *.pm) \ | ||||||
|   $(wildcard jobs/*.nix) \ |   $(wildcard jobs/*.nix) \ | ||||||
|   $(wildcard jobs/*.sh)  |   $(wildcard jobs/*.sh) \ | ||||||
|  |   $(TESTS) | ||||||
|  |  | ||||||
|  | TESTS_ENVIRONMENT = $(perl) -w | ||||||
|  |  | ||||||
| TESTS = \ | TESTS = \ | ||||||
|   query-all-tables.pl \ |   query-all-tables.pl \ | ||||||
| @@ -65,7 +68,7 @@ bzr-repo : | |||||||
| 	touch bzr-repo/bzr-file | 	touch bzr-repo/bzr-file | ||||||
| 	bzr add bzr-repo/bzr-file | 	bzr add bzr-repo/bzr-file | ||||||
| 	BZR_HOME=$(abs_builddir)/data bzr commit -m "add bzr-file" bzr-repo/bzr-file | 	BZR_HOME=$(abs_builddir)/data bzr commit -m "add bzr-file" bzr-repo/bzr-file | ||||||
| 	 |  | ||||||
| svn-checkout-repo : | svn-checkout-repo : | ||||||
| 	ln -s svn-repo svn-checkout-repo | 	ln -s svn-repo svn-checkout-repo | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,5 +1,3 @@ | |||||||
| #! @perl@ -w -I@nix@/libexec/nix |  | ||||||
| 
 |  | ||||||
| use strict; | use strict; | ||||||
| use Hydra::Schema; | use Hydra::Schema; | ||||||
| use Hydra::Helper::Nix; | use Hydra::Helper::Nix; | ||||||
| @@ -1,5 +1,3 @@ | |||||||
| #! @perl@ -w -I@nix@/libexec/nix |  | ||||||
| 
 |  | ||||||
| use strict; | use strict; | ||||||
| use Hydra::Schema; | use Hydra::Schema; | ||||||
| use Hydra::Helper::Nix; | use Hydra::Helper::Nix; | ||||||
		Reference in New Issue
	
	Block a user