Skip to content

Commit

Permalink
Merge pull request #12531 from wenduwan/opal_util_json
Browse files Browse the repository at this point in the history
Introduce new JSON parser utility
  • Loading branch information
wenduwan authored Jul 10, 2024
2 parents ca33c7f + 364d7d0 commit 76458b0
Show file tree
Hide file tree
Showing 12 changed files with 2,118 additions and 23 deletions.
4 changes: 3 additions & 1 deletion config/opal_config_files.m4
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
# Copyright (c) 2020 The University of Tennessee and The University
# of Tennessee Research Foundation. All rights
# reserved.
# Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
# Copyright (c) 2022-2024 Amazon.com, Inc. or its affiliates.
# All Rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
Expand All @@ -21,6 +22,7 @@ AC_DEFUN([OPAL_CONFIG_FILES],[
opal/include/Makefile
opal/datatype/Makefile
opal/util/Makefile
opal/util/json/Makefile
opal/util/keyval/Makefile
opal/mca/base/Makefile
opal/tools/wrappers/Makefile
Expand Down
12 changes: 9 additions & 3 deletions opal/util/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Copyright (c) 2016 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# Copyright (c) 2016-2017 IBM Corporation. All rights reserved.
# Copyright (c) 2020 Amazon.com, Inc. or its affiliates.
# Copyright (c) 2020-2024 Amazon.com, Inc. or its affiliates.
# All Rights reserved.
# Copyright (c) 2021 Google, LLC. All rights reserved.
# $COPYRIGHT$
Expand All @@ -27,9 +27,13 @@
# $HEADER$
#

SUBDIRS = keyval
SUBDIRS = \
json \
keyval

dist_opaldata_DATA = help-opal-util.txt
dist_opaldata_DATA = \
help-opal-util.txt \
json/help-json.txt

AM_LFLAGS = -Popal_show_help_yy
LEX_OUTPUT_ROOT = lex.opal_show_help_yy
Expand Down Expand Up @@ -127,8 +131,10 @@ libopalutil_core_la_SOURCES += timings.c
endif

libopalutil_core_la_LIBADD = \
json/libopalutil_json.la \
keyval/libopalutilkeyval.la
libopalutil_core_la_DEPENDENCIES = \
json/libopalutil_json.la \
keyval/libopalutilkeyval.la

# Conditionally install the header files
Expand Down
Loading

0 comments on commit 76458b0

Please sign in to comment.