Remove duplicated XINDEX Exception file

Duplication causes issues on case-insensitve environments. Remove gtm_routines entries causing the GTM specific routines to be found as part of the uncategorized test. Change-Id: Iec35a9797a78865879bdc69d29482aa5b3e3e48f
WorldVistA · Jan 2, 2020 · e6970c7 · e6970c7
1 parent 6223d4d
commit e6970c7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 145 deletions.
diff --git a/Packages/Uncategorized/XINDEXException/GTM.GTMHELP b/Packages/Uncategorized/XINDEXException/GTM.GTMHELP
diff --git a/Packages/Uncategorized/XINDEXException/GTM.gtmhelp b/Packages/Uncategorized/XINDEXException/GTM.gtmhelp
diff --git a/Python/vista/ParseCSVforPackagePrefixes.py b/Python/vista/ParseCSVforPackagePrefixes.py
@@ -82,6 +82,8 @@ def FindPackagePrefixes(packagename,packages_csv_file):
           excluded.add(prefix)
     # Exclude all system (%) routines
     excluded.add("%")
+    excluded.add("GTM")
+    excluded.add("gtm")
     included = included - excluded
   else:
     inSpecifiedPackage=False

diff --git a/Scripts/Install/GTM/createVistaInstance.sh b/Scripts/Install/GTM/createVistaInstance.sh
@@ -192,13 +192,7 @@ echo "source $basedir/etc/env" >> $basedir/.bashrc
 
 # Setup base gtmroutines
 gtmroutines="\$basedir/r/\$gtmver(\$basedir/r)"
-
-# 64bit GT.M can use a shared library instead of $gtm_dist
-if [[ $gtm_arch == "x86_64" && -e $basedir/lib/gtm/libgtmutil.so ]]; then
-    echo "export gtmroutines=\"$gtmroutines $basedir/lib/gtm/libgtmutil.so $basedir/lib/gtm\"" >> $basedir/etc/env
-else
-    echo "export gtmroutines=\"$gtmroutines $basedir/lib/gtm\"" >> $basedir/etc/env
-fi
+echo "export gtmroutines=\"$gtmroutines $basedir/lib/gtm/libgtmutil.so\"" >> $basedir/etc/env
 
 # prog.sh - priviliged (programmer) user access
 # Allow access to ZSY