mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-12 13:53:03 +00:00
Always put auxiliary code files in the same dir as other output files.
* src/files.c (compute_file_name_parts): When the user specifies --output but not --file-prefix, extract the directory prefix from the file prefix not from the grammar file name. This affects the location of files like location.hh generated by the C++ skeleton. The includes in the other output files require this fix. * tests/output.at (AT_CHECK_OUTPUT): Automatically create directories for expected output files. (Output files): Add a test for the above.
This commit is contained in:
@@ -23,9 +23,11 @@ AT_BANNER([[Output file names.]])
|
||||
# -----------------------------------------------------------------------------
|
||||
m4_define([AT_CHECK_OUTPUT],
|
||||
[AT_SETUP([[Output files: $2 $3 $5]])
|
||||
case "$1" in
|
||||
*/*) mkdir `echo "$1" | sed 's,/.*,,'`;;
|
||||
esac
|
||||
for file in $1 $4; do
|
||||
case "$file" in
|
||||
*/*) mkdir -p `echo "$file" | sed 's,/.*,,'`;;
|
||||
esac
|
||||
done
|
||||
AT_DATA([$1],
|
||||
[[$2
|
||||
%%
|
||||
@@ -116,6 +118,11 @@ AT_CHECK_OUTPUT([subdir/foo.yy], [%skeleton "lalr1.cc" %defines %verbose],
|
||||
[subdir/foo.cc subdir/foo.hh subdir/foo.output subdir/location.hh subdir/stack.hh subdir/position.hh],
|
||||
[], [AT_CHECK_NO_SUBDIR_PART([subdir/foo])])
|
||||
|
||||
AT_CHECK_OUTPUT([gram_dir/foo.yy],
|
||||
[%skeleton "lalr1.cc" %defines %verbose %file-prefix "output_dir/foo"],
|
||||
[],
|
||||
[output_dir/foo.tab.cc output_dir/foo.tab.hh output_dir/foo.output output_dir/location.hh output_dir/stack.hh output_dir/position.hh])
|
||||
|
||||
|
||||
# AT_CHECK_CONFLICTING_OUTPUT(INPUT-FILE, DIRECTIVES, FLAGS, STDERR,
|
||||
# [EXIT-STATUS])
|
||||
|
||||
Reference in New Issue
Block a user