diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-27T15·28-0400 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-27T15·28-0400 |
commit | 8207359227740bfb2fe77cf843a81aa878fd39aa (patch) | |
tree | ebff4c9931719e9388dcae45102bc5f36e57b04d | |
parent | 8b8fe6139e05f990b9d2a35652fd9bdb79189f90 (diff) |
Whitespace
-rw-r--r-- | configure.ac | 14 | ||||
-rw-r--r-- | release.nix | 16 |
2 files changed, 15 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index bbee7b061250..17169c885f5b 100644 --- a/configure.ac +++ b/configure.ac @@ -25,12 +25,12 @@ AC_ARG_WITH(system, AC_HELP_STRING([--with-system=SYSTEM], case "$host_os" in linux-gnu*) - # For backward compatibility, strip the `-gnu' part. - system="$machine_name-linux";; + # For backward compatibility, strip the `-gnu' part. + system="$machine_name-linux";; *) # Strip the version number from names such as `gnu0.3', # `darwin10.2.0', etc. - system="$machine_name-`echo $host_os | "$SED" -e's/@<:@0-9.@:>@*$//g'`";; + system="$machine_name-`echo $host_os | "$SED" -e's/@<:@0-9.@:>@*$//g'`";; esac]) sys_name=$(uname -s | tr 'A-Z ' 'a-z_') @@ -40,7 +40,7 @@ case $sys_name in sys_name=cygwin ;; esac - + AC_MSG_RESULT($system) AC_SUBST(system) AC_DEFINE_UNQUOTED(SYSTEM, ["$system"], [platform identifier (`cpu-os')]) @@ -267,7 +267,7 @@ if test "$gc" = yes; then fi -# Check for the required Perl dependencies (DBI and DBD::SQLite). +# Check for the required Perl dependencies (DBI, DBD::SQLite and WWW::Curl). perlFlags="-I$perllibdir" AC_ARG_WITH(dbi, AC_HELP_STRING([--with-dbi=PATH], @@ -288,14 +288,14 @@ if ! $perl $perlFlags -e 'use DBI; use DBD::SQLite;' 2>&5; then AC_MSG_FAILURE([The Perl modules DBI and/or DBD::SQLite are missing.]) fi AC_MSG_RESULT(yes) - + AC_MSG_CHECKING([whether WWW::Curl works]) if ! $perl $perlFlags -e 'use WWW::Curl;' 2>&5; then AC_MSG_RESULT(no) AC_MSG_FAILURE([The Perl module WWW::Curl is missing.]) fi AC_MSG_RESULT(yes) - + AC_SUBST(perlFlags) diff --git a/release.nix b/release.nix index 0b382fff31b2..02e1e447eefe 100644 --- a/release.nix +++ b/release.nix @@ -44,7 +44,7 @@ let preDist = '' make -C doc/manual install prefix=$out - + make -C doc/manual manual.pdf prefix=$out cp doc/manual/manual.pdf $out/manual.pdf @@ -55,7 +55,7 @@ let # to Windows and Macs, so there should be no Linux binaries # in the closure). nuke-refs $out/manual.pdf - + echo "doc manual $out/share/doc/nix/manual" >> $out/nix-support/hydra-build-products echo "doc-pdf manual $out/manual.pdf" >> $out/nix-support/hydra-build-products echo "doc release-notes $out/share/doc/nix/release-notes" >> $out/nix-support/hydra-build-products @@ -142,7 +142,7 @@ let dontInstall = false; doInstallCheck = true; - + lcovFilter = [ "*/boost/*" "*-tab.*" ]; # We call `dot', and even though we just use it to @@ -151,16 +151,16 @@ let FONTCONFIG_FILE = texFunctions.fontsConf; }; - + rpm_fedora13i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora13i386) 50; rpm_fedora13x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora13x86_64) 50; rpm_fedora16i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora16i386) 50; rpm_fedora16x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora16x86_64) 50; - + deb_debian60i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.debian60i386) 50; deb_debian60x86_64 = makeDeb_x86_64 (diskImageFunsFun: diskImageFunsFun.debian60x86_64) 50; - + deb_ubuntu1004i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1004i386) 50; deb_ubuntu1004x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1004x86_64) 50; deb_ubuntu1010i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1010i386) 50; @@ -186,7 +186,7 @@ let makeRPM_i686 = makeRPM "i686-linux"; makeRPM_x86_64 = makeRPM "x86_64-linux"; - makeRPM = + makeRPM = system: diskImageFun: prio: with import nixpkgs { inherit system; }; @@ -204,7 +204,7 @@ let makeDeb_i686 = makeDeb "i686-linux"; makeDeb_x86_64 = makeDeb "x86_64-linux"; - + makeDeb = system: diskImageFun: prio: |