[med-svn] r11623 - trunk/packages/vista/trunk/debian

[Luis Ibanez]

Author: luisibanez-guest
Date: 2012-07-07 15:26:40 +0000 (Sat, 07 Jul 2012)
New Revision: 11623

Modified:
   trunk/packages/vista/trunk/debian/auto_install
   trunk/packages/vista/trunk/debian/changelog
Log:
ENH: Making explicit the location of VistA-FOIA directories


Modified: trunk/packages/vista/trunk/debian/auto_install
===================================================================
--- trunk/packages/vista/trunk/debian/auto_install	2012-07-07 15:09:43 UTC (rev 11622)
+++ trunk/packages/vista/trunk/debian/auto_install	2012-07-07 15:26:40 UTC (rev 11623)
@@ -1,26 +1,26 @@
 #!/bin/sh
 export GTM_INSTALL_DIR=/usr/lib/fis-gtm/V5.5-000_x86_64
-export VISTAINSTANCEDIR=debian/var/lib/vista
-export CMAKE_VISTA_BINARY_DIR=./obj-x86_64-linux-gnu
-export CMAKE_VISTA_FOIA_DIR=./Vista-FOIA
-mkdir -p $VISTAINSTANCEDIR
-mkdir -p $VISTAINSTANCEDIR/r
-mkdir -p $VISTAINSTANCEDIR/o
-mkdir -p $VISTAINSTANCEDIR/g
-mkdir -p $VISTAINSTANCEDIR/inet
-mkdir -p $VISTAINSTANCEDIR/inet/Logs
+export VISTA_INSTANCE_DIR=debian/var/lib/vista
+export CMAKE_VISTA_FOIA_DIR=`pwd`/Vista-FOIA
+export CMAKE_OSEHRA_BINARY_DIR=`pwd`/obj-x86_64-linux-gnu
+mkdir -p $VISTA_INSTANCE_DIR
+mkdir -p $VISTA_INSTANCE_DIR/r
+mkdir -p $VISTA_INSTANCE_DIR/o
+mkdir -p $VISTA_INSTANCE_DIR/g
+mkdir -p $VISTA_INSTANCE_DIR/inet
+mkdir -p $VISTA_INSTANCE_DIR/inet/Logs
 export gtm_dist=$GTM_INSTALL_DIR
 export gtmprofilefile=$gtm_dist/gtmprofile
 source $gtmprofilefile
-export gtmgbldir=$VISTAINSTANCEDIR/g/database
-export gtmroutines="$VISTAINSTANCEDIR/o($VISTAINSTANCEDIR/r) $GTM_INSTALL_DIR/libgtmutil.so"
+export gtmgbldir=$VISTA_INSTANCE_DIR/g/database
+export gtmroutines="$VISTA_INSTANCE_DIR/o($VISTA_INSTANCE_DIR/r) $GTM_INSTALL_DIR/libgtmutil.so"
 export gtm_tmp=/tmp
 
 #
 #  Create the database
 #
 echo "I: Creating the database..."
-echo "change -s DEFAULT -f=$VISTAINSTANCEDIR/g/database" | $GTM_INSTALL_DIR/mumps -r GDE
+echo "change -s DEFAULT -f=$VISTA_INSTANCE_DIR/g/database" | $GTM_INSTALL_DIR/mumps -r GDE
 $GTM_INSTALL_DIR/mupip create
 $GTM_INSTALL_DIR/dse change -f -key_max=1023 -rec=4096
 
@@ -28,8 +28,8 @@
 #  Prepare routines and globals for importing
 #
 echo "I: Preparing routines and globals for importing..."
-echo "I: We are in the directory: "
-pwd
+echo "I: VistA-FOIA sources are in the directory: CMAKE_VISTA_FOIA_DIR "
+echo $CMAKE_VISTA_FOIA_DIR
 find $CMAKE_VISTA_FOIA_DIR -name  "*.m"   | sort | python Scripts/PackRO.py > $CMAKE_VISTA_FOIA_DIR/routines.ro
 find $CMAKE_VISTA_FOIA_DIR -name  "*.zwr" | sort > $CMAKE_VISTA_FOIA_DIR/globals.lst
 
@@ -37,12 +37,12 @@
 #  Import routines and globlas into the database
 #
 echo "I: Importing Routines..."
-echo "I: We are in the directory: "
-pwd
-python "$CMAKE_VISTA_BINARY_DIR/RoutineImport.py"
+echo "I: CMAKE_OSEHRA_BINARY_DIR is set to: "
+echo $CMAKE_OSEHRA_BINARY_DIR
+python "$CMAKE_OSEHRA_BINARY_DIR/RoutineImport.py"
 echo "I: Importing Globals..."
 echo "I: We are in the directory: "
 pwd
-python "$CMAKE_VISTA_BINARY_DIR/GlobalImport.py"
+python "$CMAKE_OSEHRA_BINARY_DIR/GlobalImport.py"
 echo "I: Importing completed for VistA instance"
 

Modified: trunk/packages/vista/trunk/debian/changelog
===================================================================
--- trunk/packages/vista/trunk/debian/changelog	2012-07-07 15:09:43 UTC (rev 11622)
+++ trunk/packages/vista/trunk/debian/changelog	2012-07-07 15:26:40 UTC (rev 11623)
@@ -11,7 +11,9 @@
     Reorganized the dh_auto_install section.
     Enable CLEAN_DATABASE to trigger the importing of routines and globals.
     Specify that auto_install is in the debian directory.
+  * debian/auto_install:
     Added process for importing routines and globals into VistA instance.
+    Making explicit the location of VistA-FOIA directories.
   * debian/copyright:
     Addressing lintian warning: missing-license-paragraph-in-dep5-copyright,
     added a paragraph stating where to find the license file.