qyriad/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Whitespace

Browse source
This commit is contained in:
Eelco Dolstra 2012-08-27 11:28:48 -04:00
parent 8b8fe6139e
commit 8207359227
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
configure.ac
View file

@ -25,12 +25,12 @@ AC_ARG_WITH(system, AC_HELP_STRING([--with-system=SYSTEM],
case "$host_os" in case "$host_os" in
linux-gnu*) linux-gnu*)
# For backward compatibility, strip the `-gnu' part. # For backward compatibility, strip the `-gnu' part.
system="$machine_name-linux";; system="$machine_name-linux";;
*) *)
# Strip the version number from names such as `gnu0.3', # Strip the version number from names such as `gnu0.3',
# `darwin10.2.0', etc. # `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]) esac])
sys_name=$(uname -s | tr 'A-Z ' 'a-z_') sys_name=$(uname -s | tr 'A-Z ' 'a-z_')
@ -40,7 +40,7 @@ case $sys_name in
sys_name=cygwin sys_name=cygwin
;; ;;
esac esac
AC_MSG_RESULT($system) AC_MSG_RESULT($system)
AC_SUBST(system) AC_SUBST(system)
AC_DEFINE_UNQUOTED(SYSTEM, ["$system"], [platform identifier (`cpu-os')]) AC_DEFINE_UNQUOTED(SYSTEM, ["$system"], [platform identifier (`cpu-os')])
@ -267,7 +267,7 @@ if test "$gc" = yes; then
fi 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" perlFlags="-I$perllibdir"
AC_ARG_WITH(dbi, AC_HELP_STRING([--with-dbi=PATH], 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.]) AC_MSG_FAILURE([The Perl modules DBI and/or DBD::SQLite are missing.])
fi fi
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_MSG_CHECKING([whether WWW::Curl works]) AC_MSG_CHECKING([whether WWW::Curl works])
if ! $perl $perlFlags -e 'use WWW::Curl;' 2>&5; then if ! $perl $perlFlags -e 'use WWW::Curl;' 2>&5; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_MSG_FAILURE([The Perl module WWW::Curl is missing.]) AC_MSG_FAILURE([The Perl module WWW::Curl is missing.])
fi fi
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_SUBST(perlFlags) AC_SUBST(perlFlags)

16
release.nix
View file

@ -44,7 +44,7 @@ let
preDist = '' preDist = ''
make -C doc/manual install prefix=$out make -C doc/manual install prefix=$out
make -C doc/manual manual.pdf prefix=$out make -C doc/manual manual.pdf prefix=$out
cp doc/manual/manual.pdf $out/manual.pdf cp doc/manual/manual.pdf $out/manual.pdf
@ -55,7 +55,7 @@ let
# to Windows and Macs, so there should be no Linux binaries # to Windows and Macs, so there should be no Linux binaries
# in the closure). # in the closure).
nuke-refs $out/manual.pdf nuke-refs $out/manual.pdf
echo "doc manual $out/share/doc/nix/manual" >> $out/nix-support/hydra-build-products 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-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 echo "doc release-notes $out/share/doc/nix/release-notes" >> $out/nix-support/hydra-build-products
@ -142,7 +142,7 @@ let
dontInstall = false; dontInstall = false;
doInstallCheck = true; doInstallCheck = true;
lcovFilter = [ "*/boost/*" "*-tab.*" ]; lcovFilter = [ "*/boost/*" "*-tab.*" ];
# We call `dot', and even though we just use it to # We call `dot', and even though we just use it to
@ -151,16 +151,16 @@ let
FONTCONFIG_FILE = texFunctions.fontsConf; FONTCONFIG_FILE = texFunctions.fontsConf;
}; };
rpm_fedora13i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora13i386) 50; rpm_fedora13i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora13i386) 50;
rpm_fedora13x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora13x86_64) 50; rpm_fedora13x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora13x86_64) 50;
rpm_fedora16i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora16i386) 50; rpm_fedora16i386 = makeRPM_i686 (diskImageFuns: diskImageFuns.fedora16i386) 50;
rpm_fedora16x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora16x86_64) 50; rpm_fedora16x86_64 = makeRPM_x86_64 (diskImageFunsFun: diskImageFunsFun.fedora16x86_64) 50;
deb_debian60i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.debian60i386) 50; deb_debian60i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.debian60i386) 50;
deb_debian60x86_64 = makeDeb_x86_64 (diskImageFunsFun: diskImageFunsFun.debian60x86_64) 50; deb_debian60x86_64 = makeDeb_x86_64 (diskImageFunsFun: diskImageFunsFun.debian60x86_64) 50;
deb_ubuntu1004i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1004i386) 50; deb_ubuntu1004i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1004i386) 50;
deb_ubuntu1004x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1004x86_64) 50; deb_ubuntu1004x86_64 = makeDeb_x86_64 (diskImageFuns: diskImageFuns.ubuntu1004x86_64) 50;
deb_ubuntu1010i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1010i386) 50; deb_ubuntu1010i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.ubuntu1010i386) 50;
@ -186,7 +186,7 @@ let
makeRPM_i686 = makeRPM "i686-linux"; makeRPM_i686 = makeRPM "i686-linux";
makeRPM_x86_64 = makeRPM "x86_64-linux"; makeRPM_x86_64 = makeRPM "x86_64-linux";
makeRPM = makeRPM =
system: diskImageFun: prio: system: diskImageFun: prio:
with import nixpkgs { inherit system; }; with import nixpkgs { inherit system; };
@ -204,7 +204,7 @@ let
makeDeb_i686 = makeDeb "i686-linux"; makeDeb_i686 = makeDeb "i686-linux";
makeDeb_x86_64 = makeDeb "x86_64-linux"; makeDeb_x86_64 = makeDeb "x86_64-linux";
makeDeb = makeDeb =
system: diskImageFun: prio: system: diskImageFun: prio: