[build] - Remove usage of DEVEL/RUN_PACKAGE.

This patch will allow us to use a new package method
that does not require these cmake variables and
subsequently we can clean up the openmp CMakeLists.txt.
openmp-extras will now install into /opt/rocm/lib/llvm
instead of a separate openmp-extras directory.

Removed the install/local in flang, flang-runtime, and pgmath
as that was overwriting the install_manifest.txt with only
a subset of files.

build_aomp.sh will loop over each component's install_manifest.txt
and concatenate the files to installed_files.txt for packaging.

Change-Id: I3902ce481d6e459229495d09a01915e18a5f04c6

Author: estewart08

bin/build_aomp.sh

@@ -195,6 +195,33 @@ echo
 date
 echo " =================  END build_aomp.sh ==================="   
 echo
+if [ "$AOMP_STANDALONE_BUILD" -eq 0 ]; then
+  cd $BUILD_DIR/build
+  legacy_version=`ls flang-legacy`
+  legacy_install_manifest=$legacy_version/install_manifest.txt
+  if [ "$SANITIZER" == 1 ]; then
+    install_manifest_orig=asan/install_manifest.txt
+  else
+    install_manifest_orig=install_manifest.txt
+  fi
+
+  # Clean file log
+  rm -f $BUILD_DIR/build/installed_files.txt
+
+  for directory in ./*/; do
+    pushd $directory > /dev/null
+    if [[ "$directory" =~ "flang-legacy" ]]; then
+      install_manifest=$legacy_install_manifest
+    else
+      install_manifest=$install_manifest_orig
+    fi
+    if [ -f "$install_manifest" ]; then
+      cat $install_manifest  >> $BUILD_DIR/build/installed_files.txt
+      echo "" >> $BUILD_DIR/build/installed_files.txt
+    fi
+    popd > /dev/null
+  done
+fi
 
 echo "ls $INSTALL_PREFIX/openmp-extras:"
 ls $INSTALL_PREFIX/openmp-extras

bin/build_extras.sh

@@ -126,7 +126,7 @@ if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then
   -DCMAKE_INSTALL_PREFIX=$INSTALL_EXTRAS \
   -DCMAKE_PREFIX_PATH=$DEVICELIBS_BUILD_PATH;$OUT_DIR/build/devicelibs \
   -DAOMP_VERSION_STRING=$ROCM_VERSION \
-  -DENABLE_DEVEL_PACKAGE=ON"
+  "
   fi
 
   mkdir -p $BUILD_DIR/build/extras

bin/build_flang-legacy.sh

@@ -81,7 +81,7 @@ $AOMP_ORIGIN_RPATH"
 
 if [ "$AOMP_STANDALONE_BUILD" == 0 ]; then
   MYCMAKEOPTS="$MYCMAKEOPTS
-  -DENABLE_DEVEL_PACKAGE=ON -DENABLE_RUN_PACKAGE=ON"
+  "
 fi
 
 if [ "$1" == "-h" ] || [ "$1" == "help" ] || [ "$1" == "-help" ] ; then 

bin/build_flang.sh

@@ -62,7 +62,7 @@ MYCMAKEOPTS="-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
 
 if [ "$AOMP_STANDALONE_BUILD" == 0 ]; then
   MYCMAKEOPTS="$MYCMAKEOPTS $OPENMP_EXTRAS_ORIGIN_RPATH
-  -DENABLE_DEVEL_PACKAGE=ON -DENABLE_RUN_PACKAGE=ON"
+  "
 fi
 
 if [ "$AOMP_BUILD_SANITIZER" == 1 ]; then
@@ -197,11 +197,6 @@ if [ "$1" == "install" ] ; then
          echo "ERROR make install failed "
          exit 1
       fi
-      $SUDO make install/local
-      if [ $? != 0 ] ; then
-         echo "ERROR make install/local failed "
-         exit 1
-      fi
       echo "SUCCESSFUL INSTALL to $INSTALL_FLANG "
 	 fi
    echo
@@ -212,11 +207,6 @@ if [ "$1" == "install" ] ; then
          echo "ERROR make install failed "
          exit 1
       fi
-      $SUDO make install/local
-      if [ $? != 0 ] ; then
-         echo "ERROR make install/local failed "
-         exit 1
-      fi
    fi
    echo "SUCCESSFUL INSTALL to $INSTALL_FLANG/lib/asan "
    echo
@@ -231,6 +221,7 @@ if [ "$1" == "install" ] ; then
      echo "Copy flang, flang1, flang2 into $INSTALL_PREFIX/llvm/bin"
      cp $INSTALL_PREFIX/openmp-extras/bin/flang1 $INSTALL_PREFIX/llvm/bin
      cp $INSTALL_PREFIX/openmp-extras/bin/flang2 $INSTALL_PREFIX/llvm/bin
+     cp $INSTALL_PREFIX/openmp-extras/bin/flang-legacy $INSTALL_PREFIX/llvm/bin
    fi
 else
    echo

bin/build_flang_runtime.sh

@@ -76,7 +76,6 @@ MYCMAKEOPTS="-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
 
 if [ "$AOMP_STANDALONE_BUILD" == 0 ]; then
   MYCMAKEOPTS="$MYCMAKEOPTS $OPENMP_EXTRAS_ORIGIN_RPATH
-  -DENABLE_DEVEL_PACKAGE=ON -DENABLE_RUN_PACKAGE=ON
   -DOPENMP_EXTRAS_SHARED_LINKER_FLAGS=$OPENMP_EXTRAS_SHARED_LINKER_FLAGS"
 fi
 
@@ -220,11 +219,6 @@ if [ "$1" == "install" ] ; then
          echo "ERROR make install failed "
          exit 1
       fi
-      $SUDO make install/local
-      if [ $? != 0 ] ; then
-         echo "ERROR make install/local failed "
-         exit 1
-      fi
       echo "SUCCESSFUL INSTALL to $INSTALL_FLANG "
    fi
    echo
@@ -237,11 +231,6 @@ if [ "$1" == "install" ] ; then
          echo "ERROR make install failed "
          exit 1
       fi
-      $SUDO make install/local
-      if [ $? != 0 ] ; then
-         echo "ERROR make install/local failed "
-         exit 1
-      fi
       echo "SUCCESSFUL INSTALL to $INSTALL_FLANG/lib/asan "
    fi
    echo

bin/build_openmp.sh

@@ -101,7 +101,7 @@ COMMON_CMAKE_OPTS="-DDEVICELIBS_ROOT=$DEVICELIBS_ROOT
 -DOPENMP_TEST_CXX_COMPILER=$INSTALL_PREFIX/llvm/bin/clang++"
 
 if [ "$AOMP_STANDALONE_BUILD" == 0 ]; then
-  COMMON_CMAKE_OPTS="$COMMON_CMAKE_OPTS -DENABLE_DEVEL_PACKAGE=ON -DENABLE_RUN_PACKAGE=ON $OPENMP_EXTRAS_ORIGIN_RPATH"
+  COMMON_CMAKE_OPTS="$COMMON_CMAKE_OPTS  $OPENMP_EXTRAS_ORIGIN_RPATH"
 fi
 
 if [[ "$ROCM_DIR" =~ "/opt/rocm" ]]; then
@@ -419,21 +419,6 @@ if [ "$1" == "install" ] ; then
          fi
       fi
 
-      if [ "$AOMP_BUILD_SANITIZER" == 1 ]; then
-         cd $BUILD_DIR/build/openmp_debug/asan
-         echo
-         echo " ----- Installing to $INSTALL_OPENMP/lib-debug/asan ------ "
-         $SUDO make -j $NUM_THREADS install
-         if [ $? != 0 ]; then
-            echo "ERROR make install failed for openmp_debug/asan"
-            exit 1
-         fi
-      fi
-      if [[ "$DEVEL_PACKAGE" =~ "devel" ]]; then
-        AOMP_INSTALL_DIR="$AOMP_INSTALL_DIR/""$DEVEL_PACKAGE"
-        echo "Request for devel package found."
-      fi
-
       # Copy selected debugable runtime sources into the installation lib-debug/src directory
       # to satisfy the above -fdebug-prefix-map.
       $SUDO mkdir -p $AOMP_INSTALL_DIR/lib-debug/src/openmp/runtime/src

bin/build_pgmath.sh

@@ -59,7 +59,7 @@ fi
 
 if [ "$AOMP_STANDALONE_BUILD" == 0 ]; then
   MYCMAKEOPTS="$MYCMAKEOPTS
-  -DENABLE_DEVEL_PACKAGE=ON -DENABLE_RUN_PACKAGE=ON"
+  "
 fi
 
 if [ "$AOMP_BUILD_SANITIZER" == 1 ] ; then
@@ -199,11 +199,6 @@ if [ "$1" == "install" ] ; then
          echo "ERROR make install failed "
          exit 1
       fi
-      $SUDO make install/local
-      if [ $? != 0 ] ; then
-         echo "ERROR make install/local failed "
-         exit 1
-      fi
       echo "SUCCESSFUL INSTALL to $INSTALL_FLANG "
    fi
    echo
@@ -215,11 +210,6 @@ if [ "$1" == "install" ] ; then
          echo "ERROR make install failed "
          exit 1
       fi
-      $SUDO make install/local
-      if [ $? != 0 ]; then
-         echo "ERROR make install/local failed "
-         exit 1
-      fi
    fi
    echo "SUCCESSFUL INSTALL to $INSTALL_FLANG/lib/asan "
    echo