1) I added ifyou to and deleted ubuntu1104_64 from the open visit bui…

…ld and install scripts. 2) I added fedora core 27 to and deleted ubuntu1104 64 from the list of executables to checksum. git-svn-id: svn+ssh://edison.nersc.gov/project/projectdirs/visit/svn/visit/branches/2.13RC@32873 18c085ea-50e0-402c-830e-de6fd14e8384
visit-dav · Jan 12, 2019 · 13982e5 · 13982e5
1 parent 56a9142
commit 13982e5
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 97 deletions.
diff --git a/src/svn_bin/visit-build-open b/src/svn_bin/visit-build-open
@@ -155,6 +155,9 @@
 #   Eric Brugger, Fri Sep 22 11:32:57 PDT 2017
 #   I replaced rzzeus with rzalastor.
 #
+#   Eric Brugger, Tue Apr  3 08:50:33 PDT 2018
+#   I deleted ubuntu1104_64 and added ifyou (Fedora Core 27).
+#
 #-----------------------------------------------------------------------
 
 test=no
@@ -196,8 +199,8 @@ esac
 # Parse the execute line, providing default values for error checking.
 #
 kickit=true
-ubuntu1104_64=false
 ubuntu1404_64=false
+ifyou=false
 cab=true
 quartz=true
 rztrona=true
@@ -219,8 +222,8 @@ do
    case $1 in
       -none)
          kickit=false
-         ubuntu1104_64=false
          ubuntu1404_64=false
+         ifyou=false
          cab=false
          quartz=false
          rztrona=false
@@ -239,14 +242,6 @@ do
          kickit=true
          shift
          ;;
-      -ubuntu1104_64)
-         ubuntu1104_64=false
-         shift
-         ;;
-      +ubuntu1104_64)
-         ubuntu1104_64=true
-         shift
-         ;;
       -ubuntu1404_64)
          ubuntu1404_64=false
          shift
@@ -255,6 +250,14 @@ do
          ubuntu1404_64=true
          shift
          ;;
+      -ifyou)
+         ifyou=false
+         shift
+         ;;
+      +ifyou)
+         ifyou=true
+         shift
+         ;;
       -cab)
          cab=false
          shift
@@ -334,8 +337,8 @@ then
    echo "Usage: [-none] [-<machine name>] -d <distribution>"
    echo "Valid machine names:"
    echo "    kickit (B-Div, Linux, x86_64),"
-   echo "    ubuntu1104_64(B-Div, Linux, x86_64),"
    echo "    ubuntu1404_64(B-Div, Linux, x86_64),"
+   echo "    ifyou (LC, Linux, x86_64),"
    echo "    cab (LC, Linux, x86_64),"
    echo "    quartz (LC, Linux, x86_64),"
    echo "    rztrona (LC, Linux, x86_64),"
@@ -425,28 +428,28 @@ then
 fi
 
 #
-# Build on ubuntu1104_64.
+# Build on ubuntu1404_64.
 #
-rm -f ubuntu1104_64
-cat <<EOF > ubuntu1104_64
+rm -f ubuntu1404_64
+cat <<EOF > ubuntu1404_64
 #!/bin/sh
-if test ! -e /home/visit/ubuntu1104_64; then
-   mkdir /home/visit/ubuntu1104_64
+if test ! -e /home/brugger1/ubuntu1404_64; then
+   mkdir /home/brugger1/ubuntu1404_64
 fi
-rm -rf /home/visit/ubuntu1104_64/visitbuild
-mkdir /home/visit/ubuntu1104_64/visitbuild
-mv ubuntu1104_64_$dist.tar.gz /home/visit/ubuntu1104_64/visitbuild/$dist.tar.gz
-cd /home/visit/ubuntu1104_64/visitbuild
+rm -rf /home/brugger1/ubuntu1404_64/visitbuild
+mkdir /home/brugger1/ubuntu1404_64/visitbuild
+mv ubuntu1404_64_$dist.tar.gz /home/brugger1/ubuntu1404_64/visitbuild/$dist.tar.gz
+cd /home/brugger1/ubuntu1404_64/visitbuild
 gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
 cd $dist/src
 ver=\`cat VERSION\`
 ver2=\`echo \$ver | tr "." "_"\`
-/home/visit/visit/thirdparty_shared/2.13.0/cmake/3.8.1/linux-x86_64_gcc-4.5/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON >> ../../buildlog 2>&1
+/home/brugger1/visit/thirdparty_shared/2.13.0/cmake/3.8.1/linux-x86_64_gcc-4.8/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON >> ../../buildlog 2>&1
 make -j 3 package >> ../../buildlog 2>&1
 mv visit\$ver2.linux-x86_64.tar.gz ../..
 cd ../..
 rm -f resultlog
-echo "     build of visit on ubuntu1104_64"    > resultlog 2>&1
+echo "     build of visit on ubuntu1404_64"    > resultlog 2>&1
 echo "    ---------------------------------"  >> resultlog 2>&1
 echo ""                                       >> resultlog 2>&1
 ls -l                                         >> resultlog 2>&1
@@ -460,12 +463,12 @@ ls $dist/src/plugins/databases/libI* | sed "s/$dist\/src\/plugins\/databases\/li
 rm -rf $dist
 gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
 cd $dist/src
-/home/visit/visit/thirdparty_shared/2.13.0/cmake/3.8.1/linux-x86_64_gcc-4.5/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON -DVISIT_MESA_DIR="/home/visit/visit/thirdparty_shared/2.13.0/mesa/7.10.2/linux-x86_64_gcc-4.5" >> ../../buildlog 2>&1
+/home/brugger1/visit/thirdparty_shared/2.13.0/cmake/3.8.1/linux-x86_64_gcc-4.8/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON -DVISIT_MESA_DIR="/home/brugger1/visit/thirdparty_shared/2.13.0/mesa/7.10.2/linux-x86_64_gcc-4.8" >> ../../buildlog 2>&1
 make -j 3 package >> ../../buildlog 2>&1
 mv visit\$ver2.linux-x86_64.tar.gz ../../visit\$ver2.linux-x86_64-wmesa.tar.gz
 cd ../..
 echo ""                                       >> resultlog 2>&1
-echo "     build of visit on ubuntu1104_64"   >> resultlog 2>&1
+echo "     build of visit on ubuntu1404_64"   >> resultlog 2>&1
 echo "    ---------------------------------"  >> resultlog 2>&1
 echo ""                                       >> resultlog 2>&1
 ls -l                                         >> resultlog 2>&1
@@ -478,41 +481,41 @@ echo "The database plugins:"                  >> resultlog 2>&1
 ls $dist/src/plugins/databases/libI* | sed "s/$dist\/src\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
 EOF
 
-if [ $ubuntu1104_64 = true ]
+if [ $ubuntu1404_64 = true ]
 then
    if [ $test = no ]
    then
-      echo "Building on ubuntu1104_64"
-      cp ubuntu1104_64 ubuntu1104_64_buildit
-      cp $dist.tar.gz ubuntu1104_64_$dist.tar.gz
-      chmod 750 ubuntu1104_64_buildit;./ubuntu1104_64_buildit &
+      echo "Building on ubuntu1404_64"
+      cp ubuntu1404_64 ubuntu1404_64_buildit
+      cp $dist.tar.gz ubuntu1404_64_$dist.tar.gz
+      chmod 750 ubuntu1404_64_buildit;./ubuntu1404_64_buildit &
    fi
 fi
 
 #
-# Build on ubuntu1404_64.
+# Build on ifyou.
 #
-rm -f ubuntu1404_64
-cat <<EOF > ubuntu1404_64
+rm -f ifyou
+cat <<EOF > ifyou
 #!/bin/sh
-if test ! -e /home/brugger1/ubuntu1404_64; then
-   mkdir /home/brugger1/ubuntu1404_64
+if test ! -e /net/wci-cl1.llnl.gov/vol/home/brugger1/ifyou; then
+   mkdir /net/wci-cl1.llnl.gov/vol/home/brugger1/ifyou
 fi
-rm -rf /home/brugger1/ubuntu1404_64/visitbuild
-mkdir /home/brugger1/ubuntu1404_64/visitbuild
-mv ubuntu1404_64_$dist.tar.gz /home/brugger1/ubuntu1404_64/visitbuild/$dist.tar.gz
-cd /home/brugger1/ubuntu1404_64/visitbuild
+rm -rf /net/wci-cl1.llnl.gov/vol/home/brugger1/ifyou/visitbuild
+mkdir /net/wci-cl1.llnl.gov/vol/home/brugger1/ifyou/visitbuild
+mv ifyou_$dist.tar.gz /net/wci-cl1.llnl.gov/vol/home/brugger1/ifyou/visitbuild/$dist.tar.gz
+cd /net/wci-cl1.llnl.gov/vol/home/brugger1/ifyou/visitbuild
 gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
 cd $dist/src
 ver=\`cat VERSION\`
 ver2=\`echo \$ver | tr "." "_"\`
-/home/brugger1/visit/thirdparty_shared/2.13.0/cmake/3.8.1/linux-x86_64_gcc-4.8/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON >> ../../buildlog 2>&1
+/net/wci-cl1.llnl.gov/vol/home/brugger1/buildvisit/thirdparty_shared/2.13.1/cmake/3.8.1/linux-x86_64_gcc-7.3/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON >> ../../buildlog 2>&1
 make -j 3 package >> ../../buildlog 2>&1
 mv visit\$ver2.linux-x86_64.tar.gz ../..
 cd ../..
 rm -f resultlog
-echo "     build of visit on ubuntu1404_64"    > resultlog 2>&1
-echo "    ---------------------------------"  >> resultlog 2>&1
+echo "     build of visit on ifyou"           > resultlog 2>&1
+echo "    -------------------------"          >> resultlog 2>&1
 echo ""                                       >> resultlog 2>&1
 ls -l                                         >> resultlog 2>&1
 echo ""                                       >> resultlog 2>&1
@@ -525,13 +528,13 @@ ls $dist/src/plugins/databases/libI* | sed "s/$dist\/src\/plugins\/databases\/li
 rm -rf $dist
 gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
 cd $dist/src
-/home/brugger1/visit/thirdparty_shared/2.13.0/cmake/3.8.1/linux-x86_64_gcc-4.8/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON -DVISIT_MESA_DIR="/home/brugger1/visit/thirdparty_shared/2.13.0/mesa/7.10.2/linux-x86_64_gcc-4.8" >> ../../buildlog 2>&1
+/net/wci-cl1.llnl.gov/vol/home/brugger1/buildvisit/thirdparty_shared/2.13.1/cmake/3.8.1/linux-x86_64_gcc-7.3/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON -DVISIT_MESA_DIR="/net/wci-cl1.llnl.gov/vol/home/brugger1/buildvisit/thirdparty_shared/2.13.1/mesa/7.10.2/linux-x86_64_gcc-7.3" >> ../../buildlog 2>&1
 make -j 3 package >> ../../buildlog 2>&1
 mv visit\$ver2.linux-x86_64.tar.gz ../../visit\$ver2.linux-x86_64-wmesa.tar.gz
 cd ../..
 echo ""                                       >> resultlog 2>&1
-echo "     build of visit on ubuntu1404_64"   >> resultlog 2>&1
-echo "    ---------------------------------"  >> resultlog 2>&1
+echo "     build of visit on ifyou"           >> resultlog 2>&1
+echo "    -------------------------"          >> resultlog 2>&1
 echo ""                                       >> resultlog 2>&1
 ls -l                                         >> resultlog 2>&1
 echo ""                                       >> resultlog 2>&1
@@ -543,14 +546,14 @@ echo "The database plugins:"                  >> resultlog 2>&1
 ls $dist/src/plugins/databases/libI* | sed "s/$dist\/src\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
 EOF
 
-if [ $ubuntu1404_64 = true ]
+if [ $ifyou = true ]
 then
    if [ $test = no ]
    then
-      echo "Building on ubuntu1404_64"
-      cp ubuntu1404_64 ubuntu1404_64_buildit
-      cp $dist.tar.gz ubuntu1404_64_$dist.tar.gz
-      chmod 750 ubuntu1404_64_buildit;./ubuntu1404_64_buildit &
+      echo "Building on ifyou"
+      cp ifyou ifyou_buildit
+      cp $dist.tar.gz ifyou_$dist.tar.gz
+      chmod 750 ifyou_buildit;./ifyou_buildit &
    fi
 fi
 
@@ -1013,5 +1016,5 @@ fi
 #
 if [ $test = no ]
 then
-   rm -f kickit ubuntu1104_64 ubuntu1404_64 cab quartz rztrona rzalastor rzuseq carver glory vulcan
+   rm -f kickit ubuntu1404_64 ifyou cab quartz rztrona rzalastor rzuseq carver glory vulcan
 fi
diff --git a/src/svn_bin/visit-create-chksums b/src/svn_bin/visit-create-chksums
@@ -122,12 +122,12 @@ do
    $cmd visit${version}_x64.exe                           >> ../$output
    $cmd visit$version2.darwin-x86_64.tar.gz               >> ../$output
    $cmd visit${version2}-10.11.darwin-x86_64.tar.gz       >> ../$output
-   $cmd visit$version2.linux-x86_64-ubuntu11.tar.gz       >> ../$output
-   $cmd visit$version2.linux-x86_64-ubuntu11-wmesa.tar.gz >> ../$output
    $cmd visit$version2.linux-x86_64-ubuntu14.tar.gz       >> ../$output
    $cmd visit$version2.linux-x86_64-ubuntu14-wmesa.tar.gz >> ../$output
    $cmd visit$version2.linux-x86_64-rhel7.tar.gz          >> ../$output
    $cmd visit$version2.linux-x86_64-rhel7-wmesa.tar.gz    >> ../$output
+   $cmd visit$version2.linux-x86_64-fc27.tar.gz           >> ../$output
+   $cmd visit$version2.linux-x86_64-fc27-wmesa.tar.gz     >> ../$output
 
    echo ""                                                >> ../$output
    echo "The VisIt source code $property"                 >> ../$output

diff --git a/src/svn_bin/visit-install-open b/src/svn_bin/visit-install-open
@@ -100,6 +100,9 @@
 #   systems. I made a change in internallauncher and customlauncher
 #   that made this unnecessary.
 #
+#   Eric Brugger, Tue Apr  3 11:09:51 PDT 2018
+#   I deleted ubuntu1104_64 and added ifyou (Fedora Core 27).
+#
 #-----------------------------------------------------------------------
 
 test=no
@@ -141,8 +144,8 @@ esac
 # Parse the execute line, providing default values for error checking.
 #
 kickit=true
-ubuntu1104_64=false
 ubuntu1404_64=false
+ifyou=false
 cab=true
 quartz=true
 rztrona=true
@@ -164,8 +167,8 @@ do
    case $1 in
       -none)
          kickit=false
-         ubuntu1104_64=false
          ubuntu1404_64=false
+         ifyou=false
          cab=false
          quartz=false
          rztrona=false
@@ -182,14 +185,6 @@ do
          kickit=true
          shift
          ;;
-      -ubuntu1104_64)
-         ubuntu1104_64=false
-         shift
-         ;;
-      +ubuntu1104_64)
-         ubuntu1104_64=true
-         shift
-         ;;
       -ubuntu1404_64)
          ubuntu1404_64=false
          shift
@@ -198,6 +193,14 @@ do
          ubuntu1404_64=true
          shift
          ;;
+      -ifyou)
+         ifyou=false
+         shift
+         ;;
+      +ifyou)
+         ifyou=true
+         shift
+         ;;
       -cab)
          cab=false
          shift
@@ -326,40 +329,6 @@ then
    fi
 fi
 
-#
-# Install on ubuntu1104_64.
-#
-rm -f ubuntu1104_64
-cat <<EOF > ubuntu1104_64
-#!/bin/sh
-./visit-install -private -c llnl_open -g visit -b wbronze -gw -l $ver linux-x86_64-ubuntu11 /home/visit/visit > installlog 2>&1
-rm -f resultlog
-echo "      install of visit on ubuntu1104_64"      > resultlog 2>&1
-echo "     -----------------------------------"    >> resultlog 2>&1
-echo ""                                            >> resultlog 2>&1
-df -k /home/visit/visit                            >> resultlog 2>&1
-echo ""                                            >> resultlog 2>&1
-ls -l /home/visit/visit/$ver+/linux-x86_64/bin     >> resultlog 2>&1
-echo ""                                            >> resultlog 2>&1
-echo "number of database plugins = "\`ls /home/visit/visit/$ver+/linux-x86_64/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
-echo "number of operator plugins = "\`ls /home/visit/visit/$ver+/linux-x86_64/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
-echo "number of plot plugins = "\`ls /home/visit/visit/$ver+/linux-x86_64/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
-echo ""                                            >> resultlog 2>&1
-echo "The database plugins:"                       >> resultlog 2>&1
-ls /home/visit/visit/$ver+/linux-x86_64/plugins/databases/libI* | sed "s/\/home\/visit\/visit\/$ver+\/linux-x86_64\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
-EOF
-
-if [ $ubuntu1104_64 = true ]
-then
-   if [ $test = no ]
-   then
-      cp /home/visit/ubuntu1104_64/visitbuild/visit$ver2.linux-x86_64.tar.gz visit$ver2.linux-x86_64-ubuntu11.tar.gz
-      cp /home/visit/ubuntu1104_64/visitbuild/visit$ver2.linux-x86_64-wmesa.tar.gz visit$ver2.linux-x86_64-ubuntu11-wmesa.tar.gz
-      cp ubuntu1104_64 ubuntu1104_64_install
-      chmod 750 ubuntu1104_64_install;./ubuntu1104_64_install
-   fi
-fi
-
 #
 # Install on ubuntu1404_64.
 #
@@ -394,6 +363,40 @@ then
    fi
 fi
 
+#
+# Install on ifyou.
+#
+rm -f ifyou
+cat <<EOF > ifyou
+#!/bin/sh
+./visit-install -private -c llnl_open -g visit -b wbronze -gw -l $ver linux-x86_64-fc27 /net/wci-cl1.llnl.gov/vol/home/brugger1/visit > installlog 2>&1
+rm -f resultlog
+echo "      install of visit on ifyou"                > resultlog 2>&1
+echo "     ---------------------------"              >> resultlog 2>&1
+echo ""                                              >> resultlog 2>&1
+df -k /net/wci-cl1.llnl.gov/vol/home/brugger1/visit  >> resultlog 2>&1
+echo ""                                              >> resultlog 2>&1
+ls -l /net/wci-cl1.llnl.gov/vol/home/brugger1/visit/$ver+/linux-x86_64/bin >> resultlog 2>&1
+echo ""                                              >> resultlog 2>&1
+echo "number of database plugins = "\`ls /net/wci-cl1.llnl.gov/vol/home/brugger1/visit/$ver+/linux-x86_64/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
+echo "number of operator plugins = "\`ls /net/wci-cl1.llnl.gov/vol/home/brugger1/visit/$ver+/linux-x86_64/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
+echo "number of plot plugins = "\`ls /net/wci-cl1.llnl.gov/vol/home/brugger1/visit/$ver+/linux-x86_64/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
+echo ""                                              >> resultlog 2>&1
+echo "The database plugins:"                         >> resultlog 2>&1
+ls /net/wci-cl1.llnl.gov/vol/home/brugger1/visit/$ver+/linux-x86_64/plugins/databases/libI* | sed "s/\/net\/wci-cl1.llnl.gov\/vol\/home\/brugger1\/visit\/$ver+\/linux-x86_64\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
+EOF
+
+if [ $ifyou = true ]
+then
+   if [ $test = no ]
+   then
+      cp /net/wci-cl1.llnl.gov/vol/home/brugger1/ifyou/visitbuild/visit$ver2.linux-x86_64.tar.gz visit$ver2.linux-x86_64-fc27.tar.gz
+      cp /net/wci-cl1.llnl.gov/vol/home/brugger1/ifyou/visitbuild/visit$ver2.linux-x86_64-wmesa.tar.gz visit$ver2.linux-x86_64-fc27-wmesa.tar.gz
+      cp ifyou ifyou_install
+      chmod 750 ifyou_install;./ifyou_install
+   fi
+fi
+
 #
 # Install on cab.
 #
@@ -703,5 +706,5 @@ fi
 #
 if [ $test = no ]
 then
-   rm -f kickit ubuntu1104_64 ubuntu1404_64 cab quartz rztrona rzalastor rzuseq carver glory vulcan
+   rm -f kickit ubuntu1404_64 ifyou cab quartz rztrona rzalastor rzuseq carver glory vulcan
 fi