Merge "Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts" into development

Former-commit-id: cd8b9072bf3c0e5c4c29f6656bb1a65c406fd5d1

cave/build/alertviz/customTargets.xml

@@ -188,6 +188,13 @@
             		excludes="cave/**" />
         		
         	</zip>
+            <!-- Update the 64-bit (amd64) win32 CAVE zip with static files -->
+            <zip destfile="${buildDirectory}/${buildLabel}/${buildId}-win32.win32.x86_64.zip"
+            	update="true">
+            	
+            	<fileset dir="${buildDirectory}/../../static/win32.amd64" 
+            		excludes="cave/**" />
+            </zip>
         </target>
 
 

cave/build/cave/customTargets.xml

@@ -197,6 +197,13 @@
         		<fileset dir="${buildDirectory}/../../static/win32.x86" 
         			excludes="alertviz/**" />
         	</zip>
+        	<!-- Update the 64-bit (amd64) win32 CAVE zip with static files -->
+        	<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-win32.win32.x86_64.zip"
+        		update="true">
+        	
+        		<fileset dir="${buildDirectory}/../../static/win32.amd64" 
+        			excludes="alertviz/**" />
+        	</zip>
         </target>
 
         <!-- ===================================================================== -->

cave/build/static/README.txt

@@ -15,4 +15,5 @@ designation.
 	linux.x86 - these files will only be installed on a 32-bit Linux Operating System.
 	linux.x86_64 - these files will only be installed on a 64-bit Linux Operating System.
 	win32.x86 - these files will only be installed on a 32-bit MS Windows Operating System.
+	win32.amd64 - these files will only be installed on a 64-bit Windows Operating System.
 	macosx.x86 - these files will only be installed on a 32-bit Apple OS X Operating System.

cave/build/static/win32.amd64/alertviz/alertviz.bat

@@ -0,0 +1,65 @@
+@echo OFF
+
+REM Always use the System32 (64-bit) reg.exe.
+SET REG_EXE=C:\Windows\System32\reg.exe
+
+REM Determine where we are located.
+SET CONTAINING_DIRECTORY=%~dp0
+
+REM Prepare the environment.
+
+REM Registry Query Variables.
+SET A2_JAVA_REG="HKLM\Software\Raytheon\Runtime Environment\AWIPS II Java"
+SET A2_PYTHON_REG="HKLM\Software\Raytheon\Runtime Environment\AWIPS II Python"
+REM Determine where AWIPS II Java (the jre) is located.
+%REG_EXE% QUERY %A2_JAVA_REG% /v JavaJreDirectory > NUL 2>&1
+IF ERRORLEVEL 1 (echo ENVIRONMENT ERROR - Unable to find AWIPS II Java. && PAUSE && EXIT)
+FOR /F "tokens=2* delims=	 " %%A IN (
+'%REG_EXE% QUERY %A2_JAVA_REG% /v JavaJreDirectory') DO (
+SET JavaJreDirectory=%%B)
+REM Determine where AWIPS II Python is located.
+%REG_EXE% QUERY %A2_PYTHON_REG% /v PythonInstallDirectory > NUL 2>&1
+IF ERRORLEVEL 1 (echo ENVIRONMENT ERROR - Unable to find AWIPS II Python. && PAUSE && EXIT)
+FOR /F "tokens=2* delims=	 " %%A IN (
+'%REG_EXE% QUERY %A2_PYTHON_REG% /v PythonInstallDirectory') DO (
+SET PythonInstallDirectory=%%B)
+
+REM Add Java and Python to the path.
+SET Path=%PythonInstallDirectory%;%PythonInstallDirectory%\DLLs;%Path%
+SET Path=%JavaJreDirectory%\bin;%Path%
+REM Define 'PythonPath'.
+SET PythonPath=%PythonInstallDirectory%\Lib\lib-tk;%PythonPath%
+SET PythonPath=%PythonInstallDirectory%\DLLs;%PythonPath%
+SET PythonPath=%PythonInstallDirectory%\Lib;%PythonPath%
+SET PythonPath=%PythonInstallDirectory%;%PythonPath%
+
+REM Eliminate variables that will no longer be used.
+SET PythonInstallDirectory=
+SET JavaJreDirectory=
+SET REG_EXE=
+SET A2_JAVA_REG=
+SET A2_PYTHON_REG=
+
+REM Determine where we will be logging to.
+SET HOME_DIRECTORY=%HOMEDRIVE%%HOMEPATH%
+SET CAVEDATA_LOG_DIRECTORY=%HOMEDRIVE%%HOMEPATH%\caveData\logs
+SET CONSOLE_LOG_DIRECTORY=%CAVEDATA_LOG_DIRECTORY%\consoleLogs\%COMPUTERNAME%
+IF NOT EXIST "%CONSOLE_LOG_DIRECTORY%" (MKDIR "%CONSOLE_LOG_DIRECTORY%")
+
+echo Starting ALERTVIZ; leave this CMD window open to enable AlertViz 'restart'.
+REM Start AlertViz (and implement the alertviz restart capability).
+:AlertVizLoopStart
+SET RND=%random%
+SET RND_DATETIME_FILE=%TMP%\awips2dt_%RND%.tmp
+REM Python is used to retrieve the current date and time because the order
+REM of the Windows date/time fields is not necessarily guaranteed and the
+REM Windows date/time fields can only be extracted using substring operations
+REM instead of -formatter- strings like Linux allows.
+python -c "from datetime import datetime; print datetime.now().strftime('%%Y%%m%%d_%%H%%M%%S');" > %RND_DATETIME_FILE%
+SET /p LOG_DATETIME= < %RND_DATETIME_FILE%
+DEL %RND_DATETIME_FILE%
+"%CONTAINING_DIRECTORY%alertviz.exe" %* > "%CONSOLE_LOG_DIRECTORY%\alertviz_%LOG_DATETIME%.log" 2>&1
+IF %ERRORLEVEL% == 0 (EXIT)
+echo Restarting AlertViz.
+GOTO AlertVizLoopStart
+

cave/build/static/win32.amd64/cave/cave.bat

@@ -0,0 +1,68 @@
+@echo OFF
+
+REM Always use the System32 (64-bit) reg.exe.
+SET REG_EXE=C:\Windows\System32\reg.exe
+
+REM Determine where we are located.
+SET CONTAINING_DIRECTORY=%~dp0
+
+REM Prepare the environment.
+
+REM Registry Query Variables.
+SET A2_JAVA_REG="HKLM\Software\Raytheon\Runtime Environment\AWIPS II Java"
+SET A2_PYTHON_REG="HKLM\Software\Raytheon\Runtime Environment\AWIPS II Python"
+REM Determine where AWIPS II Java (the jre) is located.
+%REG_EXE% QUERY %A2_JAVA_REG% /v JavaJreDirectory > NUL 2>&1
+IF ERRORLEVEL 1 (echo ENVIRONMENT ERROR - Unable to find AWIPS II Java. && PAUSE && EXIT)
+FOR /F "tokens=2* delims=	 " %%A IN (
+'%REG_EXE% QUERY %A2_JAVA_REG% /v JavaJreDirectory') DO (
+SET JavaJreDirectory=%%B)
+REM Determine where AWIPS II Python is located.
+%REG_EXE% QUERY %A2_PYTHON_REG% /v PythonInstallDirectory > NUL 2>&1
+IF ERRORLEVEL 1 (echo ENVIRONMENT ERROR - Unable to find AWIPS II Python. && PAUSE && EXIT)
+FOR /F "tokens=2* delims=	 " %%A IN (
+'%REG_EXE% QUERY %A2_PYTHON_REG% /v PythonInstallDirectory') DO (
+SET PythonInstallDirectory=%%B)
+
+REM Add Java and Python to the path.
+SET Path=%PythonInstallDirectory%;%PythonInstallDirectory%\DLLs;%Path%
+SET Path=%JavaJreDirectory%\bin;%Path%
+REM Add the CAVE lib directory to the path.
+SET Path=%CONTAINING_DIRECTORY%lib;%Path%
+REM Define 'PythonPath'.
+SET PythonPath=%CONTAINING_DIRECTORY%lib;%PythonPath%
+SET PythonPath=%PythonInstallDirectory%\Lib\lib-tk;%PythonPath%
+SET PythonPath=%PythonInstallDirectory%\DLLs;%PythonPath%
+SET PythonPath=%PythonInstallDirectory%\Lib;%PythonPath%
+SET PythonPath=%PythonInstallDirectory%;%PythonPath%
+
+REM Eliminate variables that will no longer be used.
+SET PythonInstallDirectory=
+SET JavaJreDirectory=
+SET REG_EXE=
+SET A2_JAVA_REG=
+SET A2_PYTHON_REG=
+
+REM Determine where we will be logging to.
+SET HOME_DIRECTORY=%HOMEDRIVE%%HOMEPATH%
+SET CAVEDATA_LOG_DIRECTORY=%HOMEDRIVE%%HOMEPATH%\caveData\logs
+SET CONSOLE_LOG_DIRECTORY=%CAVEDATA_LOG_DIRECTORY%\consoleLogs\%COMPUTERNAME%
+IF NOT EXIST "%CONSOLE_LOG_DIRECTORY%" (MKDIR "%CONSOLE_LOG_DIRECTORY%")
+
+SET RND=%random%
+SET RND_DATETIME_FILE=%TMP%\awips2dt_%RND%.tmp
+REM Python is used to retrieve the current date and time because the order
+REM of the Windows date/time fields is not necessarily guaranteed and the
+REM Windows date/time fields can only be extracted using substring operations
+REM instead of -formatter- strings like Linux allows.
+python -c "from datetime import datetime; print datetime.now().strftime('%%Y%%m%%d_%%H%%M%%S');" > %RND_DATETIME_FILE%
+SET /p LOG_DATETIME= < %RND_DATETIME_FILE%
+DEL %RND_DATETIME_FILE%
+
+echo THIS CMD WINDOW CAN BE CLOSED AT ANY TIME!
+cd %HOMEPATH%
+REM Start CAVE.
+"%CONTAINING_DIRECTORY%cave.exe" %* > "%CONSOLE_LOG_DIRECTORY%\cave_%LOG_DATETIME%.log" 2>&1
+IF ERRORLEVEL 1 (echo CAVE ERROR - check the logs for additional information. && PAUSE)
+
+EXIT

msi/AWIPSII.CAVE/AWIPSII.CAVE/AWIPSII.wxs

@@ -24,14 +24,30 @@
       <Directory Id="ProgramFilesFolder" Name="PFiles">
         <Directory Id="INSTALLDIR" Name="Raytheon">
           <Directory Id="AwipsII" Name="AWIPS II">
-              <Component Id="VizLauncherExe" Guid="8924277C-5B6A-4EEB-AE9F-5471481F92A6">
+            <Directory Id="CaveDir" Name="CAVE">
-                <File Id="VizLauncherExe" Name="VizLauncher.exe"
+              <Component Id="caveBatch" Guid="8924277C-5B6A-4EEB-AE9F-5471481F92A6">
-                  DiskId="1" Source="SourceDir\VizLauncher.exe" />
+                <File Id="caveBAT" Name="cave.bat"
-                <Shortcut Id="vizLauncherDesktopShortcut" Directory="DesktopFolder" Name="Viz Launcher"
+                  DiskId="1" Source="SourceDir\CAVE\cave.bat" />
-                  WorkingDirectory="SourceDir" Advertise="yes" Icon="cave.exe" IconIndex="0" />
+                <Shortcut Id="caveDesktopShortcut" Directory="DesktopFolder" Name="CAVE"
-                <Shortcut Id="vizLauncherStartMenu" Directory="ProgramMenuDir" Name="Viz Launcher"
+                  WorkingDirectory="CaveDir" Advertise="yes" Icon="cave.exe" IconIndex="0" 
-                  WorkingDirectory="SourceDir" Advertise="yes" Icon="cave.exe" IconIndex="0" />
+                  Arguments="-component thinclient" />
+                <Shortcut Id="caveStartMenu" Directory="ProgramMenuDir" Name="CAVE"
+                  WorkingDirectory="CaveDir" Advertise="yes" Icon="cave.exe" IconIndex="0"
+                  Arguments="-component thinclient" />
               </Component>
+            </Directory>
+            <Directory Id="AlertvizDir" Name="AlertViz">
+              <Component Id="alertvizBatch" Guid="8924277C-5B6A-4EEB-AE9F-5471481F92B4">
+                <File Id="alertvizBAT" Name="alertviz.bat"
+                  DiskId="1" Source="SourceDir\AlertViz\alertviz.bat" />
+                <Shortcut Id="alertvizDesktopShortcut" Directory="DesktopFolder" Name="AlertViz"
+                  WorkingDirectory="AlertvizDir" Advertise="yes" Icon="alertviz.exe" IconIndex="0" 
+                  Arguments="-component thinalertviz" />
+                <Shortcut Id="alertvizStartMenu" Directory="ProgramMenuDir" Name="AlertViz"
+                  WorkingDirectory="AlertvizDir" Advertise="yes" Icon="alertviz.exe" IconIndex="0"
+                  Arguments="-component thinalertviz" />
+              </Component>              
+            </Directory>
           </Directory>
         </Directory>
 
@@ -55,6 +71,7 @@
     <Feature Id="AWIPS_II_CAVE" Title="AWIPS II CAVE" Level="1"
     Display="expand" Description="AWIPS II Common AWIPS Visualization Environment (CAVE)"
     ConfigurableDirectory="INSTALLDIR">
+      <ComponentRef Id="caveBatch" />
       <ComponentRef Id="ProgramMenuDir" />
       
       <ComponentGroupRef Id="AWIPSII_CAVE" />
@@ -63,20 +80,16 @@
     <Feature Id="AWIPS_II_ALERTVIZ" Title="AWIPS II AlertViz" Level="1"
     Display="expand" Description="AWIPS II AlertViz"
     ConfigurableDirectory="INSTALLDIR">
+      <ComponentRef Id="alertvizBatch" />
       
       <ComponentGroupRef Id="AWIPSII_ALERTVIZ" />
     </Feature>
 
-    <Feature Id="AWIPS_II_LAUNCHER" Title="AWIPS II Viz Launcher" Level="1"
-    Display="expand" Description="Viz Launcher - Starts both AlertViz and CAVE"
-    ConfigurableDirectory="INSTALLDIR">
-      <ComponentRef Id="VizLauncherExe" />
-    </Feature>
-
     <UIRef Id="WixUI_FeatureTree" />
     <UIRef Id="WixUI_ErrorProgressText" />
 
     <Icon Id="cave.exe" SourceFile="SourceDir\CAVE\cave.exe" />
+    <Icon Id="alertviz.exe" SourceFile="SourceDir\AlertViz\alertviz.exe" />
 
   </Product>
 </Wix>