Here's a handful of tweaks to the autotools files to (hopefully) make things run a little more smoothly and to avoid having to keep track of files that we don't have to.
The most immediately useful is patch 7, which changes the test scripts so that they can be run from any working directory.
- Always run GTK_DOC_CHECK. If the macro isn't defined, something went wrong setting up the build tools - Fail if GObject introspection is disabled or not present --- widgets/configure.ac | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/widgets/configure.ac b/widgets/configure.ac index bca1ce4..e4223f3 100644 --- a/widgets/configure.ac +++ b/widgets/configure.ac @@ -39,12 +39,12 @@ AC_PROG_LN_S AM_GNU_GETTEXT([external])
GOBJECT_INTROSPECTION_CHECK([0.6.7]) + +# Fail if introspection was not enabled +AS_IF([test "x$found_introspection" = xyes], [:], + [AC_MSG_ERROR([*** GObject introspection must be enabled])])
-m4_ifdef([GTK_DOC_CHECK], [ -GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) -],[ -AM_CONDITIONAL([ENABLE_GTK_DOC], false) -]) +GTK_DOC_CHECK([1.14], [--flavour no-tmpl])
PKG_CHECK_MODULES([GLADEUI], [gladeui-2.0 >= 3.10]) PKG_CHECK_MODULES([GTK], [gtk+-x11-3.0 >= 3.0])
Remove the old gettext.h symlink if present. Add --foreign to the automake options in configure.ac so that things work better if someone tries to run autoreconf. --- widgets/autogen.sh | 3 +++ widgets/configure.ac | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/widgets/autogen.sh b/widgets/autogen.sh index 6633647..e18b17c 100755 --- a/widgets/autogen.sh +++ b/widgets/autogen.sh @@ -7,4 +7,7 @@ autoconf autoheader --force automake --foreign --add-missing --copy rm -rf autom4te.cache + +# Remove the old symlink if present +if [ -h src/gettext.h ] ; then rm src/gettext.h ; fi cp -f /usr/share/gettext/gettext.h src diff --git a/widgets/configure.ac b/widgets/configure.ac index e4223f3..b0d5f58 100644 --- a/widgets/configure.ac +++ b/widgets/configure.ac @@ -21,7 +21,7 @@
AC_PREREQ([2.63]) AC_INIT([AnacondaWidgets], [1.0], [clumens@redhat.com]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([foreign]) AM_SILENT_RULES([yes])
AM_PATH_PYTHON
Automake uses tar-v7 by default. This sets a maximum file length of 99 characters, which would be problematic if we wanted to include the api documentation in the dist tarball. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac index 3faca73..af3c653 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ m4_define(python_required_version, 2.5)
AC_PREREQ([2.63]) AC_INIT([anaconda], [20.10], [anaconda-devel-list@redhat.com]) -AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2]) +AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2 tar-ustar])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4])
Autoconf is able to do exactly what we want as far as generating anaconda.spec, which saves us some trouble with tracking the files for the clean and dist rules. --- Makefile.am | 12 ++---------- anaconda.spec.in | 2 +- configure.ac | 1 + 3 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/Makefile.am b/Makefile.am index d0949fd..e4b0e88 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,8 +27,7 @@ TESTS = tests/pylint/runpylint.sh \ tests/nosetests.sh \ tests/accelerators/run_check_accelerators.sh
-EXTRA_DIST = config.rpath COPYING \ - anaconda.spec.in +EXTRA_DIST = config.rpath COPYING
MAINTAINERCLEANFILES = Makefile.in config.guess config.h.in config.sub \ depcomp install-sh ltmain.sh missing ABOUT-NLS \ @@ -36,7 +35,7 @@ MAINTAINERCLEANFILES = Makefile.in config.guess config.h.in config.sub \ m4/* config.rpath po/Makefile.in.in po/Rules-quot \ test-driver
-CLEANFILES = *~ anaconda.spec +CLEANFILES = *~
MOSTLYCLEANDIRS = m4
@@ -46,16 +45,9 @@ dist_sbin_SCRIPTS = anaconda
ARCHIVE_TAG = $(PACKAGE_NAME)-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)
-sed_verbose = $(sed_verbose_$(V)) -sed_verbose_ = $(sed_verbose_$(AM_DEFAULT_VERBOSITY)) -sed_verbose_0 = @echo " SED "$@; - TX_PULL_ARGS = -a --disable-overwrite TX_PUSH_ARGS = -s
-$(PACKAGE_NAME).spec: $(PACKAGE_NAME).spec.in - $(sed_verbose)sed -e 's/#VERSION#/$(PACKAGE_VERSION)/' < $< > $@ - tag: @git tag -s -a -m "Tag as $(ARCHIVE_TAG)" $(ARCHIVE_TAG) @echo "Tagged as $(ARCHIVE_TAG)" diff --git a/anaconda.spec.in b/anaconda.spec.in index 443dac1..f1062c0 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -2,7 +2,7 @@
Summary: Graphical system installer Name: anaconda -Version: #VERSION# +Version: @PACKAGE_VERSION@ Release: 1%{?dist} License: GPLv2+ Group: Applications/System diff --git a/configure.ac b/configure.ac index af3c653..28ea1ef 100644 --- a/configure.ac +++ b/configure.ac @@ -214,6 +214,7 @@ AM_CONDITIONAL(IS_X86_64, AC_CONFIG_SUBDIRS([widgets])
AC_CONFIG_FILES([Makefile + anaconda.spec data/Makefile data/command-stubs/Makefile docs/Makefile
--- widgets/doc/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/widgets/doc/Makefile.am b/widgets/doc/Makefile.am index f4e0b55..b148f39 100644 --- a/widgets/doc/Makefile.am +++ b/widgets/doc/Makefile.am @@ -44,7 +44,7 @@ MKDB_OPTIONS=--sgml-mode # Only needed if you are using gtkdoc-scangobj to dynamically query widget # signals and properties (which we are). GTKDOC_CFLAGS=$(GLIB_CFLAGS) $(GTK_CFLAGS) -GTKDOC_LIBS=$(GLIB_LIBS) $(GTK_LIBS) -lAnacondaWidgets -L$(top_srcdir)/src +GTKDOC_LIBS=$(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/src/libAnacondaWidgets.la
include $(top_srcdir)/gtk-doc.make
- Removed files that are installed by autopoint - Added additional variables from Makevars.template to Makevars --- .gitignore | 6 ++++++ po/Makevars | 12 ++++++++++++ po/boldquot.sed | 10 ---------- po/en@boldquot.header | 25 ------------------------- po/en@quot.header | 22 ---------------------- po/insert-header.sin | 23 ----------------------- po/quot.sed | 6 ------ po/remove-potcdate.sin | 19 ------------------- 8 files changed, 18 insertions(+), 105 deletions(-) delete mode 100644 po/boldquot.sed delete mode 100644 po/en@boldquot.header delete mode 100644 po/en@quot.header delete mode 100644 po/insert-header.sin delete mode 100644 po/quot.sed delete mode 100644 po/remove-potcdate.sin
diff --git a/.gitignore b/.gitignore index 735ca09..a4cb776 100644 --- a/.gitignore +++ b/.gitignore @@ -54,11 +54,17 @@ po/Makefile.in.in po/Makevars.template po/POTFILES po/Rules-quot +po/boldquot.sed po/en@boldquot.insert-header +po/en@boldquot.header po/en@boldquot.po po/en@quot.insert-header +po/en@quot.header po/en@quot.po +po/insert-header.sin +po/quot.sed po/remove-potcdate.sed +po/remove-potcdate.sin po/stamp-po py-compile stamp-h1 diff --git a/po/Makevars b/po/Makevars index 454a61f..d0775e8 100644 --- a/po/Makevars +++ b/po/Makevars @@ -39,3 +39,15 @@ MSGID_BUGS_ADDRESS = anaconda-devel-list@redhat.com # This is the list of locale categories, beyond LC_MESSAGES, for which the # message catalogs shall be used. It is usually empty. EXTRA_LOCALE_CATEGORIES = + +# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' +# context. Possible values are "yes" and "no". Set this to yes if the +# package uses functions taking also a message context, like pgettext(), or +# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. +USE_MSGCTXT = no + +# These options get passed to msgmerge. +# Useful options are in particular: +# --previous to keep previous msgids of translated messages, +# --quiet to reduce the verbosity. +MSGMERGE_OPTIONS = diff --git a/po/boldquot.sed b/po/boldquot.sed deleted file mode 100644 index 4b937aa..0000000 --- a/po/boldquot.sed +++ /dev/null @@ -1,10 +0,0 @@ -s/"([^"]*)"/“\1”/g -s/`([^`']*)'/‘\1’/g -s/ '([^`']*)' / ‘\1’ /g -s/ '([^`']*)'$/ ‘\1’/g -s/^'([^`']*)' /‘\1’ /g -s/“”/""/g -s/“/“[1m/g -s/”/[0m”/g -s/‘/‘[1m/g -s/’/[0m’/g diff --git a/po/en@boldquot.header b/po/en@boldquot.header deleted file mode 100644 index fedb6a0..0000000 --- a/po/en@boldquot.header +++ /dev/null @@ -1,25 +0,0 @@ -# All this catalog "translates" are quotation characters. -# The msgids must be ASCII and therefore cannot contain real quotation -# characters, only substitutes like grave accent (0x60), apostrophe (0x27) -# and double quote (0x22). These substitutes look strange; see -# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html -# -# This catalog translates grave accent (0x60) and apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2019). -# It also translates pairs of apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2019) -# and pairs of quotation mark (0x22) to -# left double quotation mark (U+201C) and right double quotation mark (U+201D). -# -# When output to an UTF-8 terminal, the quotation characters appear perfectly. -# When output to an ISO-8859-1 terminal, the single quotation marks are -# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to -# grave/acute accent (by libiconv), and the double quotation marks are -# transliterated to 0x22. -# When output to an ASCII terminal, the single quotation marks are -# transliterated to apostrophes, and the double quotation marks are -# transliterated to 0x22. -# -# This catalog furthermore displays the text between the quotation marks in -# bold face, assuming the VT100/XTerm escape sequences. -# diff --git a/po/en@quot.header b/po/en@quot.header deleted file mode 100644 index a9647fc..0000000 --- a/po/en@quot.header +++ /dev/null @@ -1,22 +0,0 @@ -# All this catalog "translates" are quotation characters. -# The msgids must be ASCII and therefore cannot contain real quotation -# characters, only substitutes like grave accent (0x60), apostrophe (0x27) -# and double quote (0x22). These substitutes look strange; see -# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html -# -# This catalog translates grave accent (0x60) and apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2019). -# It also translates pairs of apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2019) -# and pairs of quotation mark (0x22) to -# left double quotation mark (U+201C) and right double quotation mark (U+201D). -# -# When output to an UTF-8 terminal, the quotation characters appear perfectly. -# When output to an ISO-8859-1 terminal, the single quotation marks are -# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to -# grave/acute accent (by libiconv), and the double quotation marks are -# transliterated to 0x22. -# When output to an ASCII terminal, the single quotation marks are -# transliterated to apostrophes, and the double quotation marks are -# transliterated to 0x22. -# diff --git a/po/insert-header.sin b/po/insert-header.sin deleted file mode 100644 index b26de01..0000000 --- a/po/insert-header.sin +++ /dev/null @@ -1,23 +0,0 @@ -# Sed script that inserts the file called HEADER before the header entry. -# -# At each occurrence of a line starting with "msgid ", we execute the following -# commands. At the first occurrence, insert the file. At the following -# occurrences, do nothing. The distinction between the first and the following -# occurrences is achieved by looking at the hold space. -/^msgid /{ -x -# Test if the hold space is empty. -s/m/m/ -ta -# Yes it was empty. First occurrence. Read the file. -r HEADER -# Output the file's contents by reading the next line. But don't lose the -# current line while doing this. -g -N -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/quot.sed b/po/quot.sed deleted file mode 100644 index 0122c46..0000000 --- a/po/quot.sed +++ /dev/null @@ -1,6 +0,0 @@ -s/"([^"]*)"/“\1”/g -s/`([^`']*)'/‘\1’/g -s/ '([^`']*)' / ‘\1’ /g -s/ '([^`']*)'$/ ‘\1’/g -s/^'([^`']*)' /‘\1’ /g -s/“”/""/g diff --git a/po/remove-potcdate.sin b/po/remove-potcdate.sin deleted file mode 100644 index 2436c49..0000000 --- a/po/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -}
Modified the tests so that they can be run from any directory and so that they fit better with automake's parallel test harness. --- .gitignore | 5 +++ Makefile.am | 8 +---- configure.ac | 1 + tests/Makefile.am | 47 ++++++++++++++++++++++++ tests/accelerators/run_check_accelerators.sh | 6 ++-- tests/nosetests.sh | 14 ++++++-- tests/pylint/runpylint.sh | 54 +++++++++++++++++++--------- 7 files changed, 106 insertions(+), 29 deletions(-) create mode 100644 tests/Makefile.am
diff --git a/.gitignore b/.gitignore index a4cb776..c076307 100644 --- a/.gitignore +++ b/.gitignore @@ -70,6 +70,11 @@ py-compile stamp-h1 tags test-driver +tests/*/*.log +tests/*/*.trs +tests/*.log +tests/*.trs +tests/test-suite.log updates.img utils/dd/dd_extract utils/dd/dd_list diff --git a/Makefile.am b/Makefile.am index e4b0e88..756131b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,13 +19,7 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = pyanaconda po data \ - utils scripts docs dracut widgets - -TESTS_ENVIRONMENT = PYTHONPATH=$(builddir)/pyanaconda/isys/.libs:$(builddir)/pyanaconda/isys:$(builddir)/pyanaconda ; export PYTHONPATH; -TESTS = tests/pylint/runpylint.sh \ - tests/nosetests.sh \ - tests/accelerators/run_check_accelerators.sh +SUBDIRS = data docs dracut po pyanaconda scripts tests widgets utils
EXTRA_DIST = config.rpath COPYING
diff --git a/configure.ac b/configure.ac index 28ea1ef..99952f0 100644 --- a/configure.ac +++ b/configure.ac @@ -260,6 +260,7 @@ AC_CONFIG_FILES([Makefile pyanaconda/ui/tui/tools/Makefile pyanaconda/ui/tui/Makefile data/post-scripts/Makefile + tests/Makefile utils/Makefile utils/dd/Makefile utils/log_picker/Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 0000000..0f63278 --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1,47 @@ +# Makefile.am for anaconda tests +# +# Copyright (C) 2013 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published +# by the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# +# Author: David Shea dshea@redhat.com + +# This Makefile is non-recursive so that all tests can easily be run with the +# same python environment. $top_srcdir and $top_builddir are added to the +# environment so that tests can get their bearings. Tests need to be aware that +# they may be run from within an arbitrary working directory. +# +# While automake claims that it doesn't support wildcards anywhere, they really +# mean it with the parallel test harness. Rather than reverting back to the +# serial harness, all of the nosetests-based checks will be run serially by +# nosetests.sh. This script can be run in parallel with the other test scripts, +# such as pylint. +# +# nosetests will be run for any python files found in a directory matching *_tests + +AM_TESTS_ENVIRONMENT = PYTHONPATH='$(abs_top_builddir)'/pyanaconda/isys/.libs:'$(abs_top_srcdir)'/pyanaconda/isys:'$(abs_top_srcdir)'/pyanaconda:'$(abs_top_srcdir)'; top_srcdir='$(abs_top_srcdir)'; top_builddir='$(abs_top_builddir)'; export PYTHONPATH; export top_srcdir; export top_builddir; +TEST_EXTENSIONS = .sh + +dist_check_DATA = pylint/pylint-false-positives + +# Test scripts need to be listed both here and in TESTS +dist_check_SCRIPTS = accelerators/check_accelerators.py \ + accelerators/run_check_accelerators.sh \ + nosetests.sh \ + pylint/runpylint.sh \ + $(srcdir)/*_tests/*.py + +TESTS = nosetests.sh \ + pylint/runpylint.sh \ + accelerators/run_check_accelerators.sh diff --git a/tests/accelerators/run_check_accelerators.sh b/tests/accelerators/run_check_accelerators.sh index 15ccab7..ac4969a 100755 --- a/tests/accelerators/run_check_accelerators.sh +++ b/tests/accelerators/run_check_accelerators.sh @@ -1,6 +1,6 @@ #!/bin/sh
-scriptdir="$(dirname "$0")" -gladedir="$scriptdir/../.." +: "${top_srcdir:=$(dirname "$0")/../..}" +: "${srcdir:=${top_srcdir}/tests/accelerators}"
-find "${gladedir}" -name '*.glade' -exec "${scriptdir}/check_accelerators.py" {} + +find "${top_srcdir}" -name '*.glade' -exec "${srcdir}/check_accelerators.py" {} + diff --git a/tests/nosetests.sh b/tests/nosetests.sh index c031201..ee4b07c 100755 --- a/tests/nosetests.sh +++ b/tests/nosetests.sh @@ -1,6 +1,14 @@ -#!/bin/bash +#!/bin/sh
echo $PYTHONPATH
-# The path we pass to nosetests is relative to the top-level of the anaconda source dir. -nosetests -v --exclude=logpicker -a !acceptance,!slow tests/*_tests +# Use the directory above the one containing the script as the default for +# $top_srcdir +: "${top_srcdir:=$(dirname "$0")/..}" + +# If no tests were selected, select all of them +if [ $# -eq 0 ]; then + set -- "${top_srcdir}"/tests/*_tests +fi + +exec nosetests -v --exclude=logpicker -a !acceptance,!slow "$@" diff --git a/tests/pylint/runpylint.sh b/tests/pylint/runpylint.sh index 60ecaaf..72283d9 100755 --- a/tests/pylint/runpylint.sh +++ b/tests/pylint/runpylint.sh @@ -8,7 +8,17 @@ # to stdout and this script will exit with a status of 1, if no (non filtered) # warnings are found it exits with a status of 0
-FALSE_POSITIVES=tests/pylint/pylint-false-positives +# If $top_srcdir is set, assume this is being run from automake and we don't +# need to keep a separate log +pylint_log=0 +if [ -z "$top_srcdir" ]; then + pylint_log=1 +fi + +: "${top_srcdir:=$(dirname "$0")/../..}" +: "${srcdir:=${top_srcdir}/tests/pylint}" + +FALSE_POSITIVES="${srcdir}"/pylint-false-positives
# W0212 - Access to a protected member %s of a client class NON_STRICT_OPTIONS="--disable=W0212" @@ -54,15 +64,19 @@ if [ "`tail -c 1 $FALSE_POSITIVES`" == "`echo`" ]; then exit 1 fi
+exit_status=0 +if [ "$pylint_log" -ne 0 ]; then + > pylint-log +fi + # run pylint one file / module at a time, otherwise it sometimes gets # confused -> pylint-log -for i in anaconda $(find pyanaconda -type f -name '*py' ! -executable); do - if [ "$i" == "pyanaconda/packaging/dnfpayload.py" ]; then +for i in "${top_srcdir}"/anaconda $(find "${top_srcdir}/pyanaconda" -type f -name '*py' ! -executable); do + if [ -n "$(echo "$i" | grep 'pyanaconda/packaging/dnfpayload.py$')" ]; then continue fi
- pylint \ + pylint_output="$(pylint \ --msg-template='{msg_id}:{line:3d},{column}: {obj}: {msg}' \ -r n --disable=C,R --rcfile=/dev/null \ --dummy-variables-rgx=_ \ @@ -71,19 +85,27 @@ for i in anaconda $(find pyanaconda -type f -name '*py' ! -executable); do $DISABLED_WARN_OPTIONS \ $DISABLED_ERR_OPTIONS \ $NON_STRICT_OPTIONS $i | \ - egrep -v "`cat $FALSE_POSITIVES | tr '\n' '|'`" > pylint-tmp-log - if grep -q -v '************* Module ' pylint-tmp-log; then - cat pylint-tmp-log >> pylint-log + egrep -v "$(tr '\n' '|' < "$FALSE_POSITIVES") \ + ")" + # I0011 is the informational "Locally disabling ...." message + if [ -n "$(echo "$pylint_output" | fgrep -v '************* Module ' |\ + grep -v '^I0011:')" ]; then + if [ "$pylint_log" -ne 0 ]; then + echo "$pylint_output" >> pylint-log + else + echo "$pylint_output" + fi + exit_status=1 fi done -rm pylint-tmp-log
-if [ -s pylint-log ]; then - echo "pylint reports the following issues:" - cat pylint-log - exit 1 +if [ "$pylint_log" -ne 0 ]; then + if [ -s pylint-log ]; then + echo "pylint reports the following issues:" + cat pylint-log + else + rm pylint-log + fi fi
-rm pylint-log - -exit 0 +exit "$exit_status"
Use the build cpu from autoconf instead of uname. Remove unused automake conditionals. Use the POSIX string equality syntax. --- configure.ac | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-)
diff --git a/configure.ac b/configure.ac index 99952f0..85ff0aa 100644 --- a/configure.ac +++ b/configure.ac @@ -186,30 +186,12 @@ LIBS= rel="`awk '/Release:/ { split($2, r, "%"); print r[[1]] }' anaconda.spec.in`" AC_SUBST(PACKAGE_RELEASE, [$rel])
-# Set $(ARCH) and arch-related tests -s_arch="`uname -m | sed -e s/i.86/i386/ -e s/ppc.*/ppc/`" -AC_SUBST(ARCH, [$s_arch]) +# Perform arch related tests +AC_CANONICAL_BUILD +s_arch="`echo $build_cpu | sed -e s/i.86/i386/ -e s/powerpc.*/ppc/`"
AM_CONDITIONAL(IS_LIVEINST_ARCH, - [test x$s_arch == xppc || test x$s_arch == xi386 || test x$s_arch == xx86_64]) - -AM_CONDITIONAL(IS_GPTSYNC_ARCH, - [test x$s_arch == xi386 || test x$s_arch == xx86_64]) - -AM_CONDITIONAL(IS_KEYMAPS_OVERRIDE_ARCH, - [test x$s_arch == xi386 || test x$s_arch == xppc || test x$s_arch == xx86_64]) - -AM_CONDITIONAL(IS_I386, - [test x$s_arch == xi386]) - -AM_CONDITIONAL(IS_PPC, - [test x$s_arch == xppc]) - -AM_CONDITIONAL(IS_S390, - [test x$s_arch == xs390 || test x$s_arch == xs390x]) - -AM_CONDITIONAL(IS_X86_64, - [test x$s_arch == xx86_64]) + [test x$s_arch = xppc || test x$s_arch = xi386 || test x$s_arch = xx86_64])
AC_CONFIG_SUBDIRS([widgets])
On Thu, Sep 05, 2013 at 10:42:37AM -0400, David Shea wrote:
Here's a handful of tweaks to the autotools files to (hopefully) make things run a little more smoothly and to avoid having to keep track of files that we don't have to.
The most immediately useful is patch 7, which changes the test scripts so that they can be run from any working directory.
I like where this is going, but when I apply it to master and run:
./autogen.sh && ./configure
I get this error:
configure.ac:198: error: required file 'tests/Makefile.in' not found
On Thu, Sep 05, 2013 at 04:01:05PM -0700, Brian C. Lane wrote:
On Thu, Sep 05, 2013 at 10:42:37AM -0400, David Shea wrote:
Here's a handful of tweaks to the autotools files to (hopefully) make things run a little more smoothly and to avoid having to keep track of files that we don't have to.
The most immediately useful is patch 7, which changes the test scripts so that they can be run from any working directory.
I like where this is going, but when I apply it to master and run:
./autogen.sh && ./configure
I get this error:
configure.ac:198: error: required file 'tests/Makefile.in' not found
This was PEBKC. I also hit a different error if I drop all the configure switches, but that isn't actually expected to work, just dropping introspection.
So, doing: ./autogen.sh && ./configure --disable-static --enable-gtk-doc make scratch-bumpver make && make scratch
works fine for me, so ACK. Thanks!
anaconda-patches@lists.fedorahosted.org
-
Brian C. Lane -
David Shea