xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omaha #4295 Removed AlertViz and the use of bat files on Windows.

Browse source 
Former-commit-id: 254bfd36954d44ee0b639b21b747c4f600ed2678
This commit is contained in:
David Lovely 2015-06-30 13:19:23 -05:00
parent 780a7e249c
commit bd94c98253
14 changed files with 129 additions and 237 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cave/build/build.xml
View file

@ -7,6 +7,8 @@
value="gtk" />
<property name="build.arch"
value="x86" />
<property name="build.product"
value="awips.product" />
<!-- Copy the zip file that is produced to this location. -->
<property name="destination.dir"
value="" />
@ -71,6 +73,7 @@
<arg value="-DbuildDirectory=${basedir}/cave/tmp" />
<arg value="-Dbase=${basedir}/cave" />
<arg value="-Dconfigs=${build.os},${build.ws},${build.arch}" />
<arg value="-DproductFile=${build.product}" />
<classpath>
<pathelement
@ -128,4 +131,4 @@
<taskdef resource="net/sf/antcontrib/antlib.xml"
classpath="${basedir}/lib/ant/ant-contrib-1.0b3.jar" />
</project>
</project>

5
cave/build/cave/build.properties
View file

@ -19,7 +19,10 @@
# them on the command line (e.g., -DbaseLocation=d:/eclipse
############# PRODUCT/PACKAGING CONTROL #############
product=${base}/../../com.raytheon.viz.product.awips/awips.product
# The product file is specified in the build.xml as a default and is
# overridable setting 'build.product' from ant.
product=${base}/../../com.raytheon.viz.product.awips/${productFile}
#product=${base}/../../com.raytheon.viz.product.awips/developer.product
runPackager=true

10
cave/build/cave/customTargets.xml
View file

@ -196,16 +196,6 @@
<fileset dir="${buildDirectory}/../../../rpms/legal/FOSS_licenses"/>
</zip>
<!-- Update the 32-bit win32 CAVE zip with static and license files -->
<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-win32.win32.x86.zip"
update="true">
<fileset dir="${buildDirectory}/../../static/win32.x86"
excludes="alertviz/**" />
<zipfileset dir="${buildDirectory}/../../../rpms/legal"
includes="Master_Rights_File.pdf" prefix="cave"/>
<zipfileset dir="/tmp/cave" includes="FOSS_licenses.zip" prefix="cave"/>
</zip>
<!-- Update the 64-bit (amd64) win32 CAVE zip with static and license files -->
<zip destfile="${buildDirectory}/${buildLabel}/${buildId}-win32.win32.x86_64.zip"
update="true">

4
cave/build/static/README.txt
View file

@ -10,10 +10,8 @@ The following common directories exist within the static directory:
architecture.
We also have the following os / architecture specific directories within the static
directory. The name of the directories is based on the eclipse (3.6.1) os.arch
directory. The name of the directories is based on the eclipse (3.8.2) os.arch
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.

40
cave/build/static/win32.amd64/alertviz/alertviz.bat
View file

@ -1,40 +0,0 @@
@echo OFF
REM Determine where we are located.
SET CONTAINING_DIRECTORY=%~dp0
REM Prepare the environment.
REM Location of AWIPS II Java (the jre).
SET JavaJreDirectory=C:\Program Files\Raytheon\AWIPS II\Java\jre7
REM Location of AWIPS II Python.
SET PythonInstallDirectory=C:\Program Files\Raytheon\AWIPS II\Python
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=
REM Determine where we will be logging to.
SET HOME_DIRECTORY=%USERPROFILE%
REM Use by logback configuration files to determine console and admin
SET LOGDIR=%HOME_DIRECTORY%\caveData\logs
echo Starting ALERTVIZ; leave this CMD window open to enable AlertViz 'restart'.
REM Start AlertViz (and implement the alertviz restart capability).
:AlertVizLoopStart
"%CONTAINING_DIRECTORY%alertviz.exe" %*
IF %ERRORLEVEL% == 0 (EXIT)
echo Restarting AlertViz.
GOTO AlertVizLoopStart

41
cave/build/static/win32.amd64/cave/cave.bat
View file

@ -1,41 +0,0 @@
@echo OFF
REM Determine where we are located.
SET CONTAINING_DIRECTORY=%~dp0
REM Prepare the environment.
REM Location of AWIPS II Java (the jre).
SET JavaJreDirectory=C:\Program Files\Raytheon\AWIPS II\Java\jre7
REM Location of AWIPS II Python.
SET PythonInstallDirectory=C:\Program Files\Raytheon\AWIPS II\Python
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=
REM Determine where we will be logging to.
SET HOME_DIRECTORY=%USERPROFILE%
REM Used by logback configuration files to determine console and admin
SET LOGDIR=%HOME_DIRECTORY%\caveData\logs
echo THIS CMD WINDOW CAN BE CLOSED AT ANY TIME!
cd %HOMEPATH%
REM Start CAVE.
"%CONTAINING_DIRECTORY%cave.exe" %*
IF ERRORLEVEL 1 (echo CAVE ERROR - check the logs for additional information. && PAUSE)
EXIT

69
cave/build/static/win32.x86/alertviz/alertviz.bat
View file

@ -1,69 +0,0 @@
@echo OFF
REM Determine if we are running on a 32-bit or 64-bit OS.
IF NOT EXIST C:\Windows\SysWOW64\reg.exe (
SET REG_EXE=C:\Windows\System32\reg.exe
) ELSE (
SET REG_EXE=C:\Windows\SysWOW64\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

72
cave/build/static/win32.x86/cave/cave.bat
View file

@ -1,72 +0,0 @@
@echo OFF
REM Determine if we are running on a 32-bit or 64-bit OS.
IF NOT EXIST C:\Windows\SysWOW64\reg.exe (
SET REG_EXE=C:\Windows\System32\reg.exe
) ELSE (
SET REG_EXE=C:\Windows\SysWOW64\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

BIN
cave/build/static/win32.x86/cave/lib/gridslice.pyd
View file

Binary file not shown.

BIN
cave/build/static/win32.x86/cave/lib/libgcc_s_dw2-1.dll
View file

Binary file not shown.

BIN
cave/build/static/win32.x86/cave/lib/libgfortran-3.dll
View file

Binary file not shown.

BIN
cave/build/static/win32.x86/cave/lib/libquadmath-0.dll
View file

Binary file not shown.

BIN
cave/build/static/win32.x86/cave/lib/zlib1.dll
View file

Binary file not shown.

120
cave/com.raytheon.viz.product.awips/thinclient.product Normal file
View file

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product name="CAVE" id="com.raytheon.viz.product.awips.CAVE" application="com.raytheon.uf.viz.application.application" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/com.raytheon.viz.product.awips/icons/ipr.gif"/>
<text>
%caveAboutText
</text>
</aboutInfo>
<configIni use="default" path="/com.raytheon.viz.product.awips/config.ini">
</configIni>
<launcherArgs>
<programArgs>-data @user.home/caveData -user @user.home/caveData -alertviz</programArgs>
<programArgsLin>-consoleLog</programArgsLin>
<vmArgs>-XX:+UseG1GC
-Dosgi.instance.area.readOnly=true
-Dorg.eclipse.update.reconcile=false
-XX:MaxPermSize=128m
-Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.awips.scheme
-Dqpid.dest_syntax=BURL
-Dlogback.configurationFile=logback-viz-alertview.xml
-Dlogback.statusListenerClass=com.raytheon.uf.common.logback.UFLogbackInternalStatusListener
-Dthrift.stream.maxsize=200
-Dviz.memory.warn.threshold=98
-Dhttps.certificate.check=false
-XX:+UnlockExperimentalVMOptions
-XX:G1HeapRegionSize=4M
-XX:InitiatingHeapOccupancyPercent=25
-XX:G1MixedGCCountTarget=16
-XX:G1MixedGCLiveThresholdPercent=25
-XX:G1OldCSetRegionThresholdPercent=25
-XX:G1HeapWastePercent=5</vmArgs>
<vmArgsWin>-Dfile.encoding=UTF-8 -Xmx2560M</vmArgsWin>
</launcherArgs>
<windowImages/>
<splash
location="com.raytheon.viz.ui.personalities.awips"
startupProgressRect="3,234,413,13"
startupMessageRect="7,252,445,20"
startupForegroundColor="000000" />
<launcher name="cave">
<solaris/>
<win useIco="false">
<bmp
winSmallHigh="/com.raytheon.viz.ui.personalities.awips/alertViz_icon16x16_32bit.bmp"
winSmallLow="/com.raytheon.viz.ui.personalities.awips/alertViz_icon16x16_8bit.bmp"
winMediumHigh="/com.raytheon.viz.ui.personalities.awips/alertViz_icon32x32_32bit.bmp"
winMediumLow="/com.raytheon.viz.ui.personalities.awips/alertViz_icon32x32_8bit.bmp"
winLargeHigh="/com.raytheon.viz.ui.personalities.awips/alertViz_icon48x48_32bit.bmp"
winLargeLow="/com.raytheon.viz.ui.personalities.awips/alertViz_icon48x48_8bit.bmp"/>
</win>
</launcher>
<vm>
<linux include="true">jdk1.6.0</linux>
<windows include="true">jdk1.6.0</windows>
</vm>
<plugins>
</plugins>
<features>
<feature id="com.raytheon.viz.feature.awips" version="1.9.0.qualifier"/>
<feature id="com.raytheon.uf.common.base.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.base.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.cots.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.common.core.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.localization.perspective.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.core.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.core.maps.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.sounding.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.dataplugin.obs.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.dataplugins.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.d2d.core.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.viz.radar.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.viz.text.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.viz.grib.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.kml.export.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.nwsauth.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.viz.gfe.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.displays.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.viz.satellite.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.ncep.core.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.aviation.advisory.feature" version="1.14.0.qualifier"/>
<feature id="com.raytheon.uf.viz.ncep.dataplugins.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.d2d.xy.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.ncep.displays.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.ncep.nsharp.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.d2d.nsharp.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.ncep.perspective.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.thinclient.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.npp.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.d2d.skewt.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.viz.volumebrowser.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.acarssounding.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.viz.avnfps.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.viz.hydro.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.dat.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.d2d.gfe.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.collaboration.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.d2d.damagepath.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.gisdatastore.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.d2d.ui.awips.feature" version="1.0.0.qualifier"/>
<feature id="com.raytheon.uf.viz.alertview.feature" version="1.0.0.qualifier"/>
</features>
<configurations>
<plugin id="com.raytheon.uf.viz.spring.dm" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
</configurations>
</product>