|
4152bd4a
|
2003-07-09T22:09:28
|
|
* aclocal.in: Use Automake::FileUtils.
(parse_arguments, scan_configure, scan_m4_files): Never call
"die" to print an error message. Use print and exit.
* automake.in: Use Automake::FileUtils.
* lib/Automake/General.pm ($debug, $help, $tmp, $verbose,
$version, &debug, &getopt, &mktmpdir, &verbose): Remove.
(END): Do not massage Perl's exit code. Do not clean any temporary
directory.
(find_file, mtime, update_file, xsystem, contents): Move to ...
* lib/Automake/FileUtils.pm: ... this new file. Adjust to
report errors using Channels.
(handle_exec_errors, xqx): New functions, from Autoconf.
* lib/Automake/Makefile.am (dist_perllib_DATA): Add FileUtils.pm.
|
|
9f02b686
|
2003-06-02T23:35:00
|
|
* alocal.in: Use Automake::Configure_ac.
($configure_ac): Delete.
(scan_configure): Adjust use of find_configure_ac;
* automake.in: Use Automake::Configure_ac.
($configure_ac): Delete.
(scan_autoconf_files): Adjust use of find_configure_ac;
* lib/Automake/Configure_ac.pm: New file.
* lib/Automake/General.pm (find_configure_ac): Delete. Now
replaced by Automake::Configure_ac::search_configure_ac.
* lib/Automake/Makefile.am (dist_perllib_DATA): Add Configure_ac.pm.
* lib/Automake/Variable.pm: Use Automake::Configure_ac.
(require_variables): Adjust use of $configure_ac.
|
|
fde42f14
|
2003-05-25T20:05:50
|
|
* lib/Automake/Variable.pm, lib/Automake/VarDef.pm: New files.
* lib/Automake/Makefile.am (dist_perllib_DATA): Add Variable.pm
and VarDef.pm.
* automake.in: Use Automake::Variable and Automake::VarDef.
(MACRO_PATTERN): Delete. Now Automake::Variable::_MACRO_PATTERN.
(am_macro_for_var): Delete. Now Automake::Variable::_am_macro_for_var.
(ac_macro_for_var): Delete. Now Automake::Variable::_ac_macro_for_var.
(silent_variable_override): Delete. Now
Automake::Variable::_silent_variable_override.
(var_value, var_location, var_comment, var_type, var_owner,
var_pretty, content_seen): Delete. This functionality is now
offered by Automake::Variable and Automake::VarDef.
(VAR_AUTOMAKE, VAR_CONFIGURE, VAR_MAKEFILE, VAR_ASIS, VAR_PRETTY):
Delete. Now defined in Automake::VarDef.
(var_order): Delete. Now Automake::Variable::_var_order.
(appendvar): Delete. Now Automake::Variable::_appendvar.
(var_SUFFIX_trigger): Register using Automake::Variable::hook.
(initialize_per_input): Call Automake::Variable::reset.
(err_var, msg_cond_var, msg_var, reject_var): Delete. Now
defined in Automake::Variable.
(generate_makefile, process_option_list, handle_languages)
(traverse_variable_recursively_worker)
(transform_variable_recursively, handle_compile)
(handle_libraries, handle_ltlibraries)
(check_typos, handle_dist, handle_subdirs, scan_autoconf_files):
Adjust to use Automake::Variable functions.
(check_ambiguous_condition): Delete. Now
Automake::Variable::_check_ambiguous_condition.
(condition_ambiguous_p): Delete. Now
Automake::Variable::condition_ambiguous_p.
(variable_not_always_defined_in_cond): Delete. Now
Automake::Variable::not_always_defined_in_cond.
(macro_define): Delete. Now Automake::Variable::define.
(macro_delete): Delete. Now Automake::Variable::variable_delete.
(macro_dump): Delete. Now Automake::Variable::variable_dump.
(macros_dump): Delete. Now Automake::Variable::variables_dump.
(variable_defined): Delete. Now
Automake::Variable::variable_defined, with the target check
temporarily disabled.
(variable_assert): Delete. Now Automake::Variable::variable_assert.
(examine_variable): Delete. Now
Automake::Variable::examine_variable.
(variable_conditions): Delete. Now Automake::Variable::conditions.
(scan_variable_expansions): Delete. Now
Automake::Variable::scan_variable_expansions.
(check_variable_expansions): Delete. Now
Automake::Variable::check_variable_expansions.
(check_variable_defined_unconditionally): Delete. Now
Automake::Variable::check_defined_unconditionally.
(variable_value): Delete. Now Automake::Variable::variable_value.
(variable_value_as_list): Delete. Now
Automake::Variable::variable_value_as_list.
(variable_value_as_list_recursive_worker): Adjust to use
Automake::Variable functions.
(variable_output): Delete. Now Automake::Variable::output.
(define_pretty_variable, define_configure_variable, read_am_file)
(define_standard_variables, read_main_am_file): Adjust to use
Automake::Variable functions.
(handle_variables): Delete. Now Automake::Variable::output_variables.
(file_contents_internal, am_primary_prefixes, am_install_var)
(require_file_with_macro, require_conf_file_with_macro)
(push_dist_common): : Adjust to use
Automake::Variable functions.
(require_variables): Delete. Now
Automake::Variable::require_variables.
(require_variables_for_macro): Delete. Now
Automake::Variable::require_variables_for_variable.
* tests/Makefile.am (XFAIL_TESTS): Add target.test.
|
|
926cb59f
|
2003-05-21T20:30:07
|
|
* lib/Automake/Wrap.pm, lib/Automake/tests/Wrap.pl: New files.
* lib/Automake/Makefile.am (dist_perllib_DATA): Add Wrap.pm.
* lib/Automake/tests/Makefile.am (TESTS): Add Wrap.pl.
* automake.in (handle_texinfo_helper, pretty_print_rule)
(variable_output): Adjust to use makefile_wrap instead of
pretty_print_internal.
(pretty_print_internal): Remove. Renamed as Automake::Wrap::wrap
and augmented to accept the $eol and $max_len arguments.
|
|
7db82ebd
|
2003-04-11T22:11:43
|
|
* lib/Automake/Version.pm: New file.
* lib/Automake/Makefile.am (dist_perllib_DATA): Add Version.pm.
* lib/Automake/tests/Version.pl: New file.
* lib/Automake/tests/Makefile.am (TESTS): Add Version.pl.
* tests/Makefile.am (TESTS): Remove version5.test.
* tests/version5.test: Delete. Move the tests to Version.pl.
* automake.in (version_split, version_compare, version_check): Move ...
* lib/Automake/Version.pm (split, compare, check): ... here.
|
|
29af0999
|
2003-01-19T23:01:03
|
|
Rename more files to accomodate 8+3 file systems, and adjust the
vocabulary at the same time: AM_CONDITIONAL defines "conditionals",
and we call "condition" a conjunction of "conditionals".
* lib/am/Conditional.pm: Rename to lib/am/Condition.pm.
* lib/am/tests/Conditional.pl: Rename to lib/am/tests/Condition.pl.
* lib/am/ConditionalSet.pm: Rename to lib/am/DisjConditions.pm.
* lib/am/tests/ConditionalSet.pl: Rename to
lib/am/tests/DisjConditions.pl
* lib/am/Conditional.pm (condition_negate): Rename to ...
* lib/am/Condition.pm (conditional_negate): ... this.
* automake.in: Adjust references to Condition and DisjConditions.
(check_ambiguous_conditional, conditional_ambiguous_p): Rename to ...
(check_ambiguous_condition, condition_ambiguous_p): ... these.
|
|
ae9e315b
|
2002-12-31T21:31:51
|
|
* lib/Automake/ChannelDefs.pm: New file.
* lib/Automake/Makefile.am (dist_perllib_DATA): Add ChannelDefs.pm.
* automake.in: Move all "register_channel" calls to ChannelDefs.pm.
(prog_error, error, fatal, verb, switch_warning, parse_WARNINGS,
parse_warnings): Move to ChannelDefs.pm.
(usage): Move the warning list to Automake::ChannelDefs::usage
and call it.
(set_strictness): Move channel setings to
Automake::ChannelDefs::set_strictness and call it.
|
|
180cd66e
|
2002-11-18T18:43:37
|
|
* lib/Automake/tests/Makefile.am, lib/Automake/tests/Conditional.pl,
lib/Automake/tests/ConditionalSet.pl: New files.
* lib/Automake/Makefile.am (SUBDIRS): New variable.
* configure.in: Output lib/Automake/tests/Makefile.
* lib/Automake/ConditionalSet.pm (by_conditions): Delete.
(conds): Don't use by_conditions, sort alphabetically, and
return sorted conds.
(string): Call ->string on each Conditional.
* tests/Makefile.am (TESTS): Remove cond12.test.
* tests/cond12.test: Remove, moved to
lib/Automake/tests/ConditionalSet.pl.
* tests/cond3.test: Adjust conditional ordering.
|
|
3dfbe38f
|
2002-11-14T16:12:00
|
|
* lib/Automake/Conditional.pm: Add reference to ConditionalSet.pm.
* lib/Automake/ConditionalSet.pm: New file.
* lib/Automake/Makefile.am (dist_perllib_DATA): Add ConditionalSet.pm.
* automake.in: Use ConditionalSet.
(by_condition, invert_conditions, variable_conditions_permutations):
Remove, now defined as Automake::ConditionalSet::by_condition,
Automake::ConditionalSet::invert, and
Automake::ConditionalSet::permutations.
(variable_sorted_conditions): Remove.
(msg_var, msg_target handle_source_transform, handle_lib_objects,
conditional_ambiguous_p, variable_not_always_defined_in_cond,
macro_define, macro_dump, variable_defined,
variable_conditions_recursive, variable_conditions,
target_conditions, variable_conditionally_defined,
variable_conditions_recursive_sub,
check_variable_defined_unconditionally, variable_value_as_list,
variable_value_as_list_recursive_worker, variable_output,
variable_pretty_output, rule_define, append_exeext,
am_install_var, require_variables_for_macro): Adjust to
use ConditionalSet.
|
|
46dc44f4
|
2002-10-07T09:23:33
|
|
* lib/Automake/Conditional.pm: New file.
* lib/Automake/Makefile.am (dist_perllib_DATA): Add Conditional.pm.
* automake.in: Use Automake::Conditional.
(TRUE, FALSE): New constants.
(%var_value, %var_location, %var_comment, %var_type, %var_owner,
%targets, %target_source, %target_name, %target_owner): Tie to
Tie::RefHash::Nestable.
(generate_makefile, process_option_list, handle_options,
handle_languages, handle_source_transform, handle_compile,
handle_libtool, handle_texinfo_helper, handle_dist, handle_subdirs,
scan_aclocal_m4, handle_emacs_lisp, handle_python,
scan_autoconf_files, variable_assert, define_variable,
define_pretty_variable, define_configure_variable, am_install_var,
push_dist_common): Use TRUE.
(define_objects_from_sources): Fix return value on
"recursively-defined" errors.
(conditional_string, conditional_true_when, conditional_is_redundant,
conditional_implies_any, make_conditions): Remove these functions,
obsoleted by Conditional.pm.
(cond_stack_if, cond_stack_else, cond_stack_endif): Return
an Automake::Conditional instance.
(by_condition, conditional_ambiguous_p,
variable_not_always_defined_in_cond, macro_define,
variable_conditions_recursive, variable_conditions_recursive_sub,
variable_conditions_reduce, invert_conditions,
variable_conditions_permutations,
check_variable_defined_unconditionally, variable_value_as_list,
variable_output, variable_pretty_output, rule_define,
read_am_file, file_contents_internal, require_variables): Adjust
to use Automake::Conditional objects.
(handle_footer): Get $(SUFFIXES) in 'all' conditions.
* tests/cond12.test: Adjust to use Automake::Conditional objects.
|
|
5d52af28
|
2002-09-28T12:41:06
|
|
For PR automake/360:
* lib/Automake/Location.pm: New file.
* lib/Automake/Channels.pm (_print_message): Display contexts
when given an Automake::Location.
(msg): Clone the location.
* lib/Automake/Makefile.am (dist_perllib_DATA): Add Location.pm.
* tests/comment5.test: Make sure we display `included from' stacks.
* automake.in: Use Automake::Location.
(INTERNAL): New constant.
(file_contents, file_contents_internal, define_variable,
define_pretty_variable, read_am_file): Take $WHERE as argument.
Adjust all callers.
(scan_autoconf_traces) <$where>: Define as a Location, and use
it instead of $here.
(macro_define, rule_define): Make sure $WHERE is a location.
Clone it before updating $var_location or $targets.
|
|
c037f202
|
2002-07-06T10:21:36
|
|
* lib/Automake/Channels.pm: New file.
* lib/Automake/Makefile.am (dist_perllib_DATA): Add Channels.pm.
* automake.in: Use Automake::Channels and register some channels
for errors and warnings.
($exit_status): Remove, replaced by Channels::$exit_code.
(%required_variables): Remove, Channels will filter-out duplicates
itself.
(initialize_per_input): Call reset_local_duplicates.
(prog_error): Adjust to all `msg'.
(setup_warnings): New functions.
(parse_arguments): Accept -W CATEGORY and --warnings=CATEGORY,
call setup_warnings.
(usage): Update usage text accordingly.
(macro_dump, macros_dump): Return the dump as a string instead
of printing it.
(am_install_var) <$warned_about_extra>: Remove, Channels will
filter-out duplicates itself.
(set_strictness): Turn on/off channels for each stricness.
(err, fatal, err_var, err_target, err_am, err_ac, msg_var,
msg_target, msg_am, msg_ac, reject_var, reject_target, verb):
New functions, to replace ...
(print_error, am_error, file_error, macro_error, target_error,
conf_error, file_warning): ... these functions. Remove them.
Update all the code to use the new functions. The rough
correspondance is
am_error -> err_am
file_error -> err
macro_error -> err_var
target_error -> err_target
conf_error -> err_ac
die -> fatal
macro_error if defined -> reject_var
target_error if defined -> reject_target
verbose -> verb
* automake.texi (Invoking Automake): Document -W and --warnings.
Remove the documentation for --Werror and --Wno-error.
* tests/defs: Use -Werror, no --Werror.
* tests/exeext2.test: Test that the error message
is enabled with -Wobsolete.
* tests/output5.test: Rewrite to test that Automake complains
when there is no Makefile specified. (The original test was
succeeding for the wrong reason.)
* tests/seenc.test: Don't use --Wno-error, there is no reason now
that -Werror doesn't stop after the first error.
* tests/subobj.test: Use --add-missing, and check that
`compile' is installed and that Automake says so.
* tests/subobj2.test: Don't create `compile'.
|
|
447ca35b
|
2002-01-15T23:54:14
|
|
* missing: Updated.
* lib/missing: Match against `automake*' to pick up versioned
automake.
* m4/init.m4 (AM_INIT_AUTOMAKE): Use versioned automake name.
* m4/amversion.in (AM_AUTOMAKE_VERSION): Set am__version
variable.
* lib/am/Makefile.am (amdir): Use pkgvdatadir.
* lib/Makefile.am (dist_pkgvdata_DATA): Renamed to use
pkgvdatadir.
(scriptdir): Use pkgvdatadir.
(installcheck-local): Likewise.
* lib/Automake/Makefile.am (perllibdir): Use pkgvdatadir.
* automake.in (perllibdir): Added VERSION.
(libdir): Likewise.
* aclocal.in (parse_arguments): Search versioned directory. Don't
push unversioned directory unless it exists.
(perllibdir): Added VERSION.
(default_acdir): New global.
* m4/Makefile.am (m4datadir): Added $(VERSION).
* Makefile.am (install-exec-hook): New target.
* configure.in (ACLOCAL): Search build directory.
(pkgvdatadir): New subst.
|
|
2a9e8883
|
2001-10-02T17:17:45
|
|
* lib/Automake/Struct.pm: Update from Autoconf.
* lib/Automake/General.pm, lib/Automake/XFile.pm: New, from CVS
Autoconf.
* automake.in: Use them.
(&uniq, $me): Remove, as they are provided by Automake::General.
|
|
0b4e59f5
|
2001-05-03T08:32:37
|
|
Add missing files.
|