Changeset 611

Timestamp:

Aug 12, 2011 3:17:11 PM (12 years ago)

Author:

jemian

Message:

revised for initial -licensed- EPD deployment

Location:

epd_deployment

Files:

• README.txt (modified) (2 diffs)
• deployment.sh (modified) (2 diffs)
• install-rhel5-32.sh (modified) (1 diff)
• install-rhel5-64.sh (modified) (1 diff)
• install-solaris-x86.sh (modified) (1 diff)

epd_deployment/README.txt

@@ -1 +1 @@
 $Id$
 
-This directory (/APSshare/epd) will contain the various installations 
+This directory (/APSshare/epd) contains the various installations 
 of Enthought Python Distribution (EPD) deployed for the APS.
 
-EPD will be licensed (in mid-year 2011) under an ANL site-wide license 
-for all ANL employees, ANL computers, and users of 
-ANL facilities who themselves are not ANL employees.
+EPD is licensed (starting 2011-08-11) under an ANL site-wide license:
+   "The site, for this Site-License, is defined as all users
+   located at Argonne National Laboratory at 9700 S. Cass Avenue,
+   Lemont, IL 60439, including laboratory owned devices taken
+   off-site or laboratory employees working off-site."
 
 It is planned that a separate directory rooted at this point will
@@ -12 +14 @@
 
 The initial planned deployment is:
-* Solaris (sparc and x86)
+* Solaris (x86, sparc is not supplied as part of EPD)
 * Red Hat Enterprise Linux 5 (x86 and x86_64)
-* Red Hat Enterprise Linux 6 (x86_64)
+* Red Hat Enterprise Linux 6 (x86_64), uses same code as RHEL5
 
 Refer all questions and comments to Pete Jemian, jemian@anl.gov

epd_deployment/deployment.sh

@@ -29 +29 @@
     echo "for example:"
     echo "  $0\\"
-    echo "     ./images/epd-7.0-2-rh5-x86_64.sh \\"
+    echo "     /APSshare/epd/downloads/epd-7.1-2-rh5-x86_64.sh \\"
     echo "     /APSshare/epics/base-3.14.11/lib/linux-x86_64-el5/libca.so.3.14 \\"
     echo "     /APSshare/epd \\"
     echo "     64"
-    echo "This will deploy EPD 7.0.2 for a 64-bit RHEL6 system with EPICS 3.14.11"
+    echo "This will deploy EPD 7.1-2 for a 64-bit RHEL6 system with EPICS 3.14.11"
     echo ""
     exit 1
@@ -52 +52 @@
 START_DIR=`/bin/pwd`
 
-TESTNAME=$(basename ${EPD_OS_SPECIFIC_DISTRIBUTION})
-EPD_DEPLOYMENT_SUBDIR=${TESTNAME%.*}
+
+# Starting with an installer script such as: /APSshare/epd/downloads/epd-7.1-2-rh5-x86_64.sh
+INSTALLER_SCRIPT=$(basename ${EPD_OS_SPECIFIC_DISTRIBUTION})
+#   INSTALLER_SCRIPT=epd-7.1-2-rh5-x86_64.sh
+# cut off first 10 characters
+#  TODO: could do better but this works for now
+INSTALLER_SCRIPT__OS_PART=`echo ${INSTALLER_SCRIPT} | colrm 1 10`
+#   INSTALLER_SCRIPT__OS_PART=rh5-x86_64.sh
+EPD_DEPLOYMENT_SUBDIR=${INSTALLER_SCRIPT__OS_PART%.*}
+#   EPD_DEPLOYMENT_SUBDIR=rh5-x86_64
 EPD_DEPLOYMENT_DIR=${EPD_ROOT_DIR}/${EPD_DEPLOYMENT_SUBDIR}
+
+echo "INSTALLER_SCRIPT = ${INSTALLER_SCRIPT}"
+echo "INSTALLER_SCRIPT__OS_PART = ${INSTALLER_SCRIPT__OS_PART}"
+echo "EPD_DEPLOYMENT_SUBDIR = ${EPD_DEPLOYMENT_SUBDIR}"
+exit
 
 #OS_KERNEL_NAME=`uname -s`                # Linux

epd_deployment/install-rhel5-32.sh

@@ -11 +11 @@
 # EPD installment/deployment procedure for /APSshare
 
-SRC=./images/epd-7.1-1-rh5-x86.sh
+SRC=/APSshare/epd/downloads/epd-7.1-2-rh5-x86.sh
 LIBCA=/APSshare/epics/base-3.14.11/lib/linux-x86-el5/libca.so.3.14
 EPD_ROOT=/local/epd

epd_deployment/install-rhel5-64.sh

@@ -11 +11 @@
 # EPD installment/deployment procedure for /APSshare
 
-SRC=./images/epd-7.1-1-rh5-x86_64.sh
+SRC=/APSshare/epd/downloads/epd-7.1-2-rh5-x86_64.sh
 LIBCA=/APSshare/epics/base-3.14.11/lib/linux-x86_64-el5/libca.so.3.14
 EPD_ROOT=/local/epd

epd_deployment/install-solaris-x86.sh

@@ -11 +11 @@
 # EPD installment/deployment procedure for /APSshare
 
-SRC=./images/epd-7.0-2-SunOS_5.10-x86_64.sh
+SRC=/APSshare/epd/downloads/epd-7.1-2-SunOS_5.10-x86_64.sh
 LIBCA=/APSshare/epics/base-3.14.11/lib/solaris-x86-v10-gnu/libca.so.3.14
 EPD_ROOT=/home/oxygen/JEMIAN/Documents/epd_deployment/sandbox/epd