From 9a655a6218f3d385319933ff2bc68641cacf647c Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Fri, 11 Jan 2013 11:06:30 +0000 Subject: [PATCH] build: Some tidying up of the build system mainly this is just cleaning up the output from the build commands but also added debian/changelog to ignore file to stop it being accidentally committed back. --- .gitignore | 1 + Makefile | 4 +-- debian/changelog | 4 +-- support/changelog | 1 + support/configure.inc | 72 +++++++++++++++++++++---------------------- 5 files changed, 42 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index 7b634ed0..846be4e0 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ src/version.c *.pyc .*.sw[op] +debian/changelog debian/files debian/tvheadend debian/tvheadend-dbg diff --git a/Makefile b/Makefile index b337e7dc..cd011db2 100644 --- a/Makefile +++ b/Makefile @@ -52,9 +52,9 @@ MKBUNDLE = $(PYTHON) $(CURDIR)/support/mkbundle # ifndef V -ECHO = printf "$(1)\t\t%s\n" $(2) +ECHO = printf "%-16s%s\n" $(1) $(2) BRIEF = CC MKBUNDLE CXX -MSG = $@ +MSG = $(subst $(CURDIR)/,,$@) $(foreach VAR,$(BRIEF), \ $(eval $(VAR) = @$$(call ECHO,$(VAR),$$(MSG)); $($(VAR)))) endif diff --git a/debian/changelog b/debian/changelog index 8e3365bc..78fa0626 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -tvheadend (3.3.324~gac22d71~precise) precise; urgency=low +tvheadend (3.3) unstable; urgency=low * The full changelog can be found at http://www.lonelycoder.com/tvheadend/download - -- Adam Sutton Thu, 10 Jan 2013 10:29:13 +0000 + -- Andreas Öman Tue, 18 Sep 2012 12:45:49 +0100 diff --git a/support/changelog b/support/changelog index dcfc8788..3bd008c4 100755 --- a/support/changelog +++ b/support/changelog @@ -9,6 +9,7 @@ DIST=$2 VER=$3 # Defaults +[ -z "$CHANGELOG" ] && CHANGELOG=$(dirname $0)/../debian/changelog [ -z "$DEBEMAIL" ] && DEBEMAIL="andreas@lonelycoder.com" [ -z "$DEBFULLNAME" ] && DEBFULLNAME="Andreas Öman" [ -z "$VER" ] && VER=$($(dirname $0)/version) diff --git a/support/configure.inc b/support/configure.inc index 0460937a..6d852482 100644 --- a/support/configure.inc +++ b/support/configure.inc @@ -43,8 +43,7 @@ # ########################################################################### # Output -TAB=" \\033[50G" -TAB2=" \\033[50G" +TAB=" %-50s" # Text conversion function toupper @@ -148,36 +147,37 @@ function disabled_or_auto # Show help function show_help { - local opt= val= + local opt= val= fmt="%-30s" echo "Usage: $0 [options]" echo "" echo "Miscellaneous" - echo -e " --help${TAB}Print this message" + printf " $fmt Print this message\n" "--help" echo "" echo "Installation Paths" - echo -e " --prefix=DIR${TAB}Installation root [$prefix]" - echo -e " --bindir=DIR${TAB}Install binaries in DIR [$bindir]" - echo -e " --libdir=DIR${TAB}Install libraries in DIR [$libdir]" - echo -e " --mandir=DIR${TAB}Install man pages in DIR [$mandir]" - echo -e " --datadir=DIR${TAB}Install data files in DIR [$datadir]" + printf " $fmt Installation root [$prefix]\n" "--prefix=DIR$" + printf " $fmt Install binaries in DIR [$bindir]\n" "--bindir=DIR" + printf " $fmt Install libraries in DIR [$libdir]\n" "--libdir=DIR" + printf " $fmt Install man pages in DIR [$mandir]\n" "--mandir=DIR" + printf " $fmt Install data files in DIR [$datadir]\n" "--datadir=DIR" echo "" echo "Compiler/Arch" - echo -e " --cc=CC${TAB}Build using compile [$CC]" - echo -e " --cpu=CPU${TAB}Build and optimize for specific CPU" - echo -e " --arch=ARCH${TAB}Build for architecture [$ARCH]" - echo -e " --platform=PLATFORM${TAB}Build for platform [$PLATFORM]" - echo -e " --python=PYTHON${TAB}Use python binary [$PYTHON]" + printf " $fmt Build using compiler [$CC]\n" "--cc=CC" + printf " $fmt Build and optimize for specific CPU\n" "--cpu=CPU" + printf " $fmt Build for architecture [$ARCH]\n" "--arch=ARCH" + printf " $fmt Build for platform [$PLATFORM]\n" "--platform=PLATFORM" + printf " $fmt Use python binary [$PYTHON]\n" "--python=PYTHON" echo "" echo "Options" for opt in ${OPTIONS[*]}; do val=${opt#*:} opt=${opt%:*} if [ "$val" == "yes" ]; then - echo -e " --disable-${opt}${TAB}Enable $opt [$val]" + printf " $fmt Disable ${opt} [${val}]\n" "--disable-${opt}" elif [ "$val" == "no" ]; then - echo -e " --enable-${opt}${TAB}Enable $opt [$val]" + printf " $fmt Enable ${opt} [${val}]\n" "--enable-${opt}" else - echo -e " --(en|dis)able-${opt}${TAB}Enable $opt [$val]" + printf " $fmt Disable ${opt} [${val}]\n" "--disable-${opt}" + printf " $fmt Enable ${opt} [${val}]\n" "--enable-${opt}" fi done exit 0 @@ -229,7 +229,7 @@ function check_pkg | sed 's/<=/ --max-version /'\ | sed 's/==/ --exact-version /') - echo -ne "checking for pkg $pkg $ver ...${TAB2}" + printf "$TAB" "checking for pkg $pkg $ver ..." # Check for package if pkg-config $pkg $cver; then @@ -269,7 +269,7 @@ function check_cc_header local nam=$2 [ -z "$nam" ] && nam=$hdr - echo -ne "checking for cc $hdr.h ...${TAB2}" + printf "$TAB" "checking for cc $hdr.h ..." # Enable if supported if check_cc "#include <$1.h>"; then @@ -288,7 +288,7 @@ function check_cc_snippet local snp=$2 local opt=$3 - echo -ne "checking for cc $nam ...${TAB2}" + printf "$TAB" "checking for cc $nam ..." # Check if supported if check_cc "$snp" "$opt"; then @@ -307,7 +307,7 @@ function check_cc_option local nam=$2 [ -z "$nam" ] && nam=$opt - echo -ne "checking for cc -m$opt ...${TAB2}" + printf "$TAB" "checking for cc -m$opt ..." # Enable if supported if check_cc "" -m${opt}; then @@ -326,7 +326,7 @@ function check_cc_lib local nam=$2 [ -z "$nam" ] && nam=$opt - echo -ne "checking for cc -l$opt ...${TAB2}" + printf "$TAB" "checking for cc -l$opt ..." # Enable if supported if check_cc "" -l${opt}; then @@ -362,7 +362,7 @@ function check_py_import local nam=$2 [ -z "$nam" ] && nam=py_${hdr} - echo -ne "checking for py module $hdr ...${TAB2}" + printf "$TAB" "checking for py module $hdr ..." # Enable if supported if check_py "import $hdr"; then @@ -383,7 +383,7 @@ function check_bin local bin=$1 local nam=$2 [ -z "$nam" ] && nam=bin_${bin} - echo -ne "checking for $bin ...${TAB2}" + printf "$TAB" "checking for $bin ..." if which $bin &> /dev/null; then echo "ok" @@ -401,17 +401,17 @@ function check_bin # Print config function print_config { - local pkg= + local pkg= fmt=" %-40s %s\n" # Compiler settings echo "" echo "Compiler:" - echo -e " Using C compiler:${TAB}${CC}" - echo -e " Build for arch:${TAB}${ARCH}" + printf "$fmt" "Using C compiler:" "${CC}" + printf "$fmt" "Build for arch:" "${ARCH}" echo "" echo "Binaries:" - echo -e " Using PYTHON:${TAB}${PYTHON}" + printf "$fmt" "Using PYTHON:" "${PYTHON}" echo "" # Options @@ -420,9 +420,9 @@ function print_config k=${opt%:*} v=${opt#*:} if [ "$v" == "yes" ]; then - echo -e " $k:${TAB}yes" + printf "$fmt" "$k" "yes" else - echo -e " $k:${TAB}no" + printf "$fmt" "$k" "no" fi done echo "" @@ -430,17 +430,17 @@ function print_config # Packages echo "Packages:" for pkg in ${PACKAGES[*]}; do - echo -e " ${pkg}:${TAB}$(pkg-config --modversion $pkg)" + printf "$fmt" "${pkg}" "$(pkg-config --modversion $pkg)" done echo "" # Installation echo "Installation paths:" - echo -e " Prefix:${TAB}${prefix}" - echo -e " Binaries:${TAB}${bindir}" - echo -e " Libraries:${TAB}${libdir}" - echo -e " Data files:${TAB}${datadir}" - echo -e " Man pages:${TAB}${mandir}" + printf "$fmt" "Prefix:" "${prefix}" + printf "$fmt" "Binaries:" "${bindir}" + printf "$fmt" "Libraries:" "${libdir}" + printf "$fmt" "Data files:" "${datadir}" + printf "$fmt" "Man pages:" "${mandir}" echo "" }