delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Set a default value for `getHydraPath'.

Browse source
This commit is contained in:
Ludovic Courtès 2011-03-02 15:17:03 +00:00
parent b59ca01e40
commit bf927b3180
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -55,6 +55,7 @@ AC_CONFIG_FILES([
src/sql/Makefile
src/xsl/Makefile
src/lib/Makefile
src/lib/Hydra/Helper/Nix.pm
src/root/Makefile
src/script/Makefile

4
src/lib/Hydra/Helper/Nix.pm → src/lib/Hydra/Helper/Nix.pm.in
View file

@ -24,9 +24,7 @@ sub isValidPath {
sub getHydraPath {
my $dir = $ENV{"HYDRA_DATA"};
die "The HYDRA_DATA environment variable is not set!\n" unless defined $dir;
die "The HYDRA_DATA directory does not exist!\n" unless -d $dir;
my $dir = $ENV{"HYDRA_DATA"} || "@localstatedir@/lib/hydra";
return $dir;
}

21
src/lib/Makefile.am
View file

@ -1,12 +1,15 @@
PERL_MODULES = \
$(wildcard *.pm) \
$(wildcard Hydra/*.pm) \
$(wildcard Hydra/Helper/*.pm) \
$(wildcard Hydra/Model/*.pm) \
$(wildcard Hydra/View/*.pm) \
$(wildcard Hydra/Schema/*.pm) \
$(wildcard Hydra/Controller/*.pm) \
$(wildcard Hydra/Base/*.pm) \
PERL_MODULES = \
$(wildcard *.pm) \
$(wildcard Hydra/*.pm) \
Hydra/Helper/AddBuilds.pm \
Hydra/Helper/CatalystUtils.pm \
Hydra/Helper/Nix.pm.in \
$(wildcard Hydra/Helper/*.pm) \
$(wildcard Hydra/Model/*.pm) \
$(wildcard Hydra/View/*.pm) \
$(wildcard Hydra/Schema/*.pm) \
$(wildcard Hydra/Controller/*.pm) \
$(wildcard Hydra/Base/*.pm) \
$(wildcard Hydra/Base/Controller/*.pm)
EXTRA_DIST = $(PERL_MODULES)