Skip to content

Use classic names for bison generated files (except for ncgen3/) #2925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Use classic names for bison generated files (except for ncgen3/) #2925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7b901e8
Use classic names for bison generated files (in oc2/ only)
georgthegreat May 15, 2024
20999d2
Use classic names in oc2
georgthegreat Nov 17, 2024
dea9aa7
Use classic names in libdap2
georgthegreat Nov 17, 2024
17a2e7a
Use classic names in ncgen
georgthegreat Nov 17, 2024
b04e954
Regen with bison 3.8.2
georgthegreat Nov 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions libdap2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
# University Corporation for Atmospheric Research/Unidata.

# See netcdf-c/COPYRIGHT file for more info.
SET(dap2_SOURCES constraints.c dapcvt.c dapodom.c daputil.c ncdaperr.c cdf.c cache.c dapdump.c dapdebug.c dapattr.c ncd2dispatch.c getvara.c dceconstraints.c dcetab.c dceparse.c dcelex.c)
SET(dap2_SOURCES constraints.c dapcvt.c dapodom.c daputil.c ncdaperr.c cdf.c cache.c dapdump.c dapdebug.c dapattr.c ncd2dispatch.c getvara.c dceconstraints.c dce.tab.c dceparse.c dcelex.c)

##
##
# Turn off inclusion of particular files when using the cmake-native
# option to turn on Unity Builds.
# option to turn on Unity Builds.
#
# For more information, see:
# * https://github.com/Unidata/netcdf-c/pull/2839/
Expand Down
10 changes: 4 additions & 6 deletions libdap2/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ LDADD=

SRC= constraints.c dapcvt.c dapodom.c daputil.c \
ncdaperr.c cdf.c cache.c dapdump.c dapdebug.c dapattr.c \
ncd2dispatch.c getvara.c dceconstraints.c dcetab.c \
ncd2dispatch.c getvara.c dceconstraints.c dce.tab.c \
dceparse.c dcelex.c

HDRS= nccommon.h constraints.h ncd2dispatch.h dapincludes.h \
dapodom.h getvara.h dapnc.h daputil.h dapdebug.h dapdump.h \
dceconstraints.h dcetab.h dceparselex.h
dceconstraints.h dce.tab.h dceparselex.h

if NETCDF_ENABLE_DAP

Expand Down Expand Up @@ -54,7 +54,5 @@ endif # NETCDF_ENABLE_DAP
EXTRA_DIST += dce.y

makece::
bison -v -d -t -p dce dce.y
rm -f dcetab.c dcetab.h
sed -e 's/dce[.]tab[.]c/dcetab.c/g' -e 's/dce[.]tab[.]h/dcetab.h/g' <dce.tab.c >dcetab.c
sed -e 's/dce[.]tab[.]c/dcetab.c/g' -e 's/dce[.]tab[.]h/dcetab.h/g' <dce.tab.h >dcetab.h
rm -f dce.tab.c dce.tab.h
bison --debug --defines -p dce dce.y
Loading
Loading