(codethorn) resolved merge conflict

Merge branch 'master' of ssh:https://rosecompiler2.llnl.gov:10022/rose-compiler/rose

Conflicts:
	config/support-rose.m4

CODETHORN-70

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "src/frontend/CxxFrontend/EDG"]
  path = src/frontend/CxxFrontend/EDG
  url = ssh:https://[email protected]:10022/rose-compiler/edg.git
-[submodule "projects/vulnerabilitySeeding"]
- path = projects/vulnerabilitySeeding
- url = ssh:https://[email protected]:10022/rose-compiler/vulnerability-seeding.git

CMakeLists.txt

@@ -50,6 +50,31 @@ endif()
 
 project(ROSE CXX C)
 
+if (DEFINED BLT_SOURCE_DIR)
+ # Support having a shared BLT outside of the repository if given a BLT_SOURCE_DIR
+ if (NOT EXISTS ${BLT_SOURCE_DIR}/SetupBLT.cmake)
+ message(FATAL_ERROR "Given BLT_SOURCE_DIR does not contain SetupBLT.cmake")
+ endif()
+else()
+ # Use internal BLT if no BLT_SOURCE_DIR is given
+ set(BLT_SOURCE_DIR "${PROJECT_SOURCE_DIR}/cmake/blt" CACHE PATH "")
+ if (NOT EXISTS ${BLT_SOURCE_DIR}/SetupBLT.cmake)
+ message(FATAL_ERROR
+ "The BLT git submodule is not present. "
+ "Either run the following two commands in your git repository: \n"
+ " git submodule init\n"
+ " git submodule update\n"
+ "Or add -DBLT_SOURCE_DIR=/path/to/blt to your CMake command." )
+ endif()
+endif()
+
+# Default to C++11 if not set so GTest/GMock can build
+if (NOT BLT_CXX_STD)
+ set(BLT_CXX_STD "c++14" CACHE STRING "")
+endif()
+
+include(${BLT_SOURCE_DIR}/SetupBLT.cmake)
+
 # CMake 2.8.12 and newer has support for using @rpath in a target’s install name. This was enabled by setting the target
 # property MACOSX_RPATH. The @rpath in an install name is a more flexible and powerful mechanism than @executable_path
 # or @loader_path for locating shared libraries.

Makefile.am

@@ -33,16 +33,17 @@ if ROSE_BUILD_PROJECTS_DIRECTORY_SUPPORT
  SUBDIRS += projects
 endif
 
-# The MatrixTestingProject is not compiled as part of ROSE but serves as a simple example of an external project.
-# Matrix testing will need to access this project and compile it after installing ROSE and deleting the ROSE source
+# The Portability Test Project is not compiled as part of ROSE but serves as a simple example of an external project.
+# Portability testing will need to access this project and compile it after installing ROSE and deleting the ROSE source
 # and build trees. Therefore, this project's source code should be installed as part of the ROSE installation. These
-# rules are at this high level of the source code because this project must be installed even if the "projects'
-# subdirectory doesn't participate in the $(SUBDIRS).
+# rules are at this high level of the source code because otherwise they would interfere with the Makefile that's
+# distributed as part of the test project, and because it needs to be part of the binary release even if the rest
+# of the ROSE tools are excluded.
 testprojdir = ${datarootdir}/test-project
-testproj_DATA = \
- projects/MatrixTestingProject/Makefile  \
- projects/MatrixTestingProject/README \
- projects/MatrixTestingProject/test-rose.C
+testproj_DATA =  \
+ tools/PortabilityTesting/lib/matrix/test-project/Makefile \
+ tools/PortabilityTesting/lib/matrix/test-project/README \
+ tools/PortabilityTesting/lib/matrix/test-project/test-rose.C
 EXTRA_DIST += $(testproj_DATA)
 
 # DQ (2/6/2017): Added test to detect if the default mode of the C++ frontend compiler for rOSE is C++11 or not.
@@ -88,13 +89,7 @@ tools:
  $(MAKE) -C $(top_builddir)/tools
  $(MAKE) -C $(top_builddir)/exampleTranslators
  $(MAKE) -C $(top_builddir)/projects/compass
- $(MAKE) -C $(top_builddir)/projects/autoParallelization
  $(MAKE) -C $(top_builddir)/projects/arrayOptimization
- $(MAKE) -C $(top_builddir)/projects/autoTuning
- $(MAKE) -C $(top_builddir)/projects/extractMPISkeleton
- $(MAKE) -C $(top_builddir)/projects/pragmaParsing
- $(MAKE) -C $(top_builddir)/projects/UpcTranslation
- $(MAKE) -C $(top_builddir)/projects/ArithmeticMeasureTool
 if ROSE_BUILD_PROJECTS_DIRECTORY_SUPPORT
  $(MAKE) -C $(top_builddir)/tutorial
 endif
@@ -108,13 +103,7 @@ install-tools: install-core tools
  $(MAKE) install -C $(top_builddir)/tools
  $(MAKE) install -C $(top_builddir)/exampleTranslators
  $(MAKE) install -C $(top_builddir)/projects/compass
- $(MAKE) install -C $(top_builddir)/projects/autoParallelization
  $(MAKE) install -C $(top_builddir)/projects/arrayOptimization
- $(MAKE) install -C $(top_builddir)/projects/autoTuning
- $(MAKE) install -C $(top_builddir)/projects/extractMPISkeleton
- $(MAKE) install -C $(top_builddir)/projects/pragmaParsing
- $(MAKE) install -C $(top_builddir)/projects/UpcTranslation
- $(MAKE) install -C $(top_builddir)/projects/ArithmeticMeasureTool
  $(MAKE) install -C $(top_builddir)/tests/nonsmoke/functional/roseTests/astInliningTests
  $(MAKE) install -C $(top_builddir)/tests/nonsmoke/functional/roseTests/astOutliningTests
 if ROSE_BUILD_PROJECTS_DIRECTORY_SUPPORT
@@ -163,13 +152,7 @@ check-tools: tools
  $(MAKE) check -C $(top_builddir)/tools
  $(MAKE) check -C $(top_builddir)/exampleTranslators
  $(MAKE) check -C $(top_builddir)/projects/compass
- $(MAKE) check -C $(top_builddir)/projects/autoParallelization
  $(MAKE) check -C $(top_builddir)/projects/arrayOptimization
- $(MAKE) check -C $(top_builddir)/projects/autoTuning
- $(MAKE) check -C $(top_builddir)/projects/extractMPISkeleton
- $(MAKE) check -C $(top_builddir)/projects/pragmaParsing
- $(MAKE) check -C $(top_builddir)/projects/UpcTranslation
- $(MAKE) check -C $(top_builddir)/projects/ArithmeticMeasureTool
 if ROSE_BUILD_PROJECTS_DIRECTORY_SUPPORT
  $(MAKE) check -C $(top_builddir)/tutorial
 endif
@@ -212,7 +195,7 @@ rose-installer-rmc2: install-rose-library
  --contact="http:https://rosecompiler.org" \
  --prjnam=ROSE \
  --prjver=$(PACKAGE_VERSION) \
- --postinstall-bin=$(top_srcdir)/projects/MatrixTesting/lib/matrix/container-scripts/post-install-script \
+ --postinstall-bin=$(top_srcdir)/tools/PortabilityTesting/lib/matrix/container-scripts/post-install-script \
  $(prefix)/* \
  $(addsuffix /*, $(filter-out / /usr /usr/local, \
  $(BOOST_ROOT) \
@@ -480,8 +463,6 @@ docs: FORCE_DOCS_TO_BE_MADE
  $(MAKE) -Ctests/nonsmoke/functional/roseTests/astInterfaceTests check && \
  $(MAKE) -Ctests/nonsmoke/functional/roseTests/ompLoweringTests check && \
  $(MAKE) -Ctests/nonsmoke/functional/CompileTests/UPC_tests check && \
- $(MAKE) -Cprojects/UpcTranslation/tests check && \
- $(MAKE) -Cprojects/autoParallelization/tests check && \
  $(MAKE) -Cdocs docs && \
  $(MAKE) -C$(compass_build_tooldir)/compass docs; \
  else \

ROSE_VERSION

@@ -1 +1 @@
-0.11.98.3
+0.11.101.14

Tuprules.tup

@@ -819,6 +819,7 @@ CxxGrammarMetaProgram_GENSRC = \
  $(ROSE)/src/ROSETTA/src/Cxx_GrammarMemoryPoolSupport.C \
  $(ROSE)/src/ROSETTA/src/Cxx_GrammarNewAndDeleteOperators.C \
  $(ROSE)/src/ROSETTA/src/Cxx_GrammarNewConstructors.C \
+ $(ROSE)/src/ROSETTA/src/Cxx_GrammarNodeIdSupport.C \
  $(ROSE)/src/ROSETTA/src/Cxx_GrammarProcessDataMemberReferenceToPointers.C \
  $(ROSE)/src/ROSETTA/src/Cxx_GrammarRTI.C \
  $(ROSE)/src/ROSETTA/src/Cxx_GrammarReturnClassHierarchySubTree.C \

cmake/blt/.mailmap

@@ -0,0 +1,24 @@
+Alfredo Metere <[email protected]> Alfredo Metere <[email protected]>
+Alfredo Metere <[email protected]> metere1llnl <[email protected]>
+Benjamin Curtice Corbett <[email protected]> Ben Corbett <[email protected]>
+Burl M. Hall <[email protected]> BurlMHall <[email protected]>
+Daniel Taller <[email protected]> Danny Taller <[email protected]>
+Geoffrey Oxberry <[email protected]> Geoffrey M Oxberry <[email protected]>
+Geoffrey Oxberry <[email protected]> Geoffrey M. Oxberry <[email protected]>
+George Zagaris <[email protected]> George Zagaris <[email protected]>
+Jason Burmark <[email protected]> Jason Burmark <[email protected]>
+Josh Essman <[email protected]> Josh Essman <[email protected]>
+Keith Healy <[email protected]> keithhealy <[email protected]>
+Kenneth Weiss <[email protected]> Kenny Weiss <[email protected]>
+Kenneth Weiss <[email protected]> Kenny Weiss <[email protected]>
+Kenneth Weiss <[email protected]> Kenneth Weiss <[email protected]>
+Kristi Belcher <[email protected]> Kristi Belcher <[email protected]>
+Kristi Belcher <[email protected]> Kristi Belcher <[email protected]>
+Kristi Belcher <[email protected]> Kristi <[email protected]>
+Marty McFadden <[email protected]> Marty McFadden <[email protected]>
+Peter B. Robinson <[email protected]> robinson96 <[email protected]>
+Peter B. Robinson <[email protected]> robinspb <[email protected]>
+Randolph R. Settgast <[email protected]> Randolph Settgast <[email protected]>
+Randolph R. Settgast <[email protected]> Randolph R. Settgast <[email protected]>
+Randolph R. Settgast <[email protected]> Randolph Settgast <[email protected]>
+Johann Dahm <[email protected]> Johann Dahm <[email protected]>

cmake/blt/.readthedocs.yml

@@ -0,0 +1,11 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+ install:
+ - requirements: docs/requirements.txt

cmake/blt/CODE-OF-CONDUCT.md

@@ -0,0 +1,77 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [email protected]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
+

cmake/blt/CONTRIBUTING.md

@@ -0,0 +1,20 @@
+# Contributing to BLT
+
+We welcome contributions to BLT. To do so please submit a pull request through our
+BLT github page at https://github.com/LLNL/blt.
+
+Before submitting a pull request, update `RELEASE-NOTES.md` accordingly.
+
+All contributions to BLT must be made under the BSD License.
+
+Any questions can be sent to [email protected].
+
+# Attribution
+
+The BLT project uses git's commit history to track contributions from individual developers. 
+
+Since we want everyone to feel they are getting the proper attribution for their contributions, please add your name to the list below as part of your commit.
+
+# Contributors
+
+Thanks to all of BLT's [contributors](https://github.com/LLNL/blt/graphs/contributors).

cmake/blt/LICENSE

@@ -0,0 +1,27 @@
+Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake/blt/NOTICE

@@ -0,0 +1,20 @@
+Additional BSD Notice
+
+1. This notice is required to be provided under our contract with the U.S.
+Department of Energy (DOE). This work was produced at Lawrence Livermore
+National Laboratory under Contract No. DE-AC52-07NA27344 with the DOE.
+
+2. Neither the United States Government nor Lawrence Livermore National
+Security, LLC nor any of their employees, makes any warranty, express or
+implied, or assumes any liability or responsibility for the accuracy,
+completeness, or usefulness of any information, apparatus, product, or process
+disclosed, or represents that its use would not infringe privately-owned rights.
+
+3. Also, reference herein to any specific commercial products, process, or
+services by trade name, trademark, manufacturer or otherwise does not
+necessarily constitute or imply its endorsement, recommendation, or favoring by
+the United States Government or Lawrence Livermore National Security, LLC. The
+views and opinions of authors expressed herein do not necessarily state or
+reflect those of the United States Government or Lawrence Livermore National
+Security, LLC, and shall not be used for advertising or product endorsement
+purposes.