Commit 48251c9d authored by bonnell's avatar bonnell

Add windows silent uninstall info to release notes. Add a few options sent to windows installer.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@22889 18c085ea-50e0-402c-830e-de6fd14e8384
parent 0b3f95ac
......@@ -2576,16 +2576,20 @@ ELSE (NOT WIN32)
#
FILE(TO_NATIVE_PATH ${VISIT_SOURCE_DIR} VSD_NATIVE)
FILE(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX} CIP_NATIVE)
FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR} CBD_NATIVE)
ADD_CUSTOM_COMMAND(OUTPUT visit${VISIT_VERSION}.exe
COMMAND ${MAKENSIS}
/DVISIT_SOURCE_DIR=${VSD_NATIVE}
/DINSTALL_PREFIX=${CIP_NATIVE}
${VISIT_WINDOWS_DIR}/distribution/installation/CreateDBSections.nsi
/DBIN_DIR=${CBD_NATIVE}
/DCL_64=${CMAKE_CL_64}
${VISIT_WINDOWS_DIR}/installation/CreateDBSections.nsi
COMMAND ${MAKENSIS}
/DVisItVersion=${VISIT_VERSION}
/DCOMPILER=${VISIT_MSVC_VERSION}
/DVISIT_SOURCE_DIR=${VSD_NATIVE}
/DINSTALL_PREFIX=${CIP_NATIVE}
/DBIN_DIR=${CBD_NATIVE}
/DCL_64=${CMAKE_CL_64}
${VISIT_WINDOWS_DIR}/distribution/installation/binaryinstallation.nsi
DEPENDS ${VISIT_WINDOWS_DIR}/distribution/installation/CreateDBSections.nsi
......@@ -2612,6 +2616,9 @@ ELSE (NOT WIN32)
)
ADD_CUSTOM_TARGET(_SRC_PACKAGE ALL DEPENDS visitdev${VISIT_VERSION}.exe)
SET_TARGET_PROPERTIES(_SRC_PACKAGE PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
UNSET(VSD_NATIVE)
UNSET(CIP_NATIVE)
UNSET(CBD_NATIVE)
ELSE(${MAKENSIS_FOUND})
MESSAGE(FATAL_ERROR "NSIS installer package requested, but 'makensis' could not be found.")
ENDIF(${MAKENSIS_FOUND})
......
......@@ -30,6 +30,7 @@ list of changes in release 2.6.</p>
<li>An engine crash on Windows when cmfe expressions were passed an invalid filename.</li>
<li>A plot got put in perpetual 'pending' state when NamedSelections' 'Automatially apply updated selections' was checked before the selection had been applied to a plot.</li>
<li>VisIt's Annotation window has been fixed so that it is once again possible to select axis tick marks that are both inside and outside of the 3D bounding box.</li>
<li>The silent uninstall option on Windows (/S from command-line) has been fixed.</li>
</ul>
<p><b><font size="4">Enhancements in version 2.7.2</font></b></p>
......
......@@ -53,7 +53,7 @@ INCLUDE_DIRECTORIES(
${VISIT_BINARY_DIR}/include
${PYTHON_INCLUDE_PATH}
)
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${VISIT_SOURCE_DIR}/CMake/)
FIND_PACKAGE(Numpy)
SET(SIMV2_USE_NUMPY FALSE)
IF (NUMPY_FOUND)
......
......@@ -1096,6 +1096,7 @@ ViewerQueryManager::DatabaseQuery(const MapNode &queryParams)
queryClientAtts->SetResultsMessage("");
queryClientAtts->SetResultsValue(0.);
queryClientAtts->SetXmlResult("");
if (!queryTypes->QueryExists(qName, QueryList::DatabaseQuery))
{
// we've reset some values, notify clients
......@@ -5345,6 +5346,9 @@ ViewerQueryManager::DoSpatialExtentsQuery(ViewerPlot *oplot, bool actualData)
for (int i = 0 ; i < 2*dim ; i++)
d.push_back(ext[i]);
queryClientAtts->SetResultsValue(d);
MapNode result_node;
result_node["extents"] = d;
queryClientAtts->SetXmlResult(result_node.ToXML());
delete [] ext;
queryClientAtts->Notify();
if (!suppressQueryOutput)
......
......@@ -1097,6 +1097,30 @@ CreateDictionaryFromDBOptions(DBOptionsAttributes &opts)
}
// ****************************************************************************
// Function: ToggleSuppressQueryOutput_NoLogging
//
// Purpose:
// Helper method for toggling SuppressQueryOutput without it being logged.
// Used when query ouput suppression is a consequence of another action,
// like with Pick functions.
//
// Programmer: Kathleen Bigagas
// Creation: January 9, 2012
//
// Modifications:
//
// ****************************************************************************
void
ToggleSuppressQueryOutput_NoLogging(bool onoff)
{
LogFile_IncreaseLevel();
GetViewerMethods()->SuppressQueryOutput(onoff);
Synchronize();
LogFile_DecreaseLevel();
}
//
// Python callbacks for VisIt
......@@ -8917,7 +8941,6 @@ STATIC PyObject *
visit_GetQueryOutputObject(PyObject *self, PyObject *args)
{
ENSURE_VIEWER_EXISTS();
NO_ARGUMENTS();
QueryAttributes *qa = GetViewerState()->GetQueryAttributes();
std::string xml_string = qa->GetXmlResult();
......@@ -11313,12 +11336,24 @@ visit_Query_deprecated(PyObject *self, PyObject *args)
params["vars"] = vars;
debug3 << mn << " sending query params: " << params.ToXML() << endl;
#if 0
if (!suppressQueryOutputState)
ToggleSuppressQueryOutput_NoLogging(true);
#endif
MUTEX_LOCK();
GetViewerMethods()->Query(params);
GetViewerMethods()->Query(params);
MUTEX_UNLOCK();
Synchronize();
#if 0
if (!suppressQueryOutputState)
ToggleSuppressQueryOutput_NoLogging(false);
#endif
// Return the success value.
return IntReturnValue(Synchronize());
return visit_GetQueryOutputObject(self, args);
}
......@@ -11411,12 +11446,23 @@ visit_Query(PyObject *self, PyObject *args, PyObject *kwargs)
queryParams["query_name"] = std::string(queryName);
}
#if 0
if (!suppressQueryOutputState)
ToggleSuppressQueryOutput_NoLogging(true);
#endif
MUTEX_LOCK();
GetViewerMethods()->Query(queryParams);
GetViewerMethods()->Query(queryParams);
MUTEX_UNLOCK();
Synchronize();
#if 0
if (!suppressQueryOutputState)
ToggleSuppressQueryOutput_NoLogging(false);
#endif
// Return the success value.
return IntReturnValue(Synchronize());
return visit_GetQueryOutputObject(self, args);
}
......@@ -11734,29 +11780,6 @@ visit_SuppressQueryOutputOff(PyObject *self, PyObject *args)
return IntReturnValue(Synchronize());
}
// ****************************************************************************
// Function: ToggleSuppressQueryOutput_NoLogging
//
// Purpose:
// Helper method for toggling SuppressQueryOutput without it being logged.
// Used when query ouput suppression is a consequence of another action,
// like with Pick functions.
//
// Programmer: Kathleen Bigagas
// Creation: January 9, 2012
//
// Modifications:
//
// ****************************************************************************
void
ToggleSuppressQueryOutput_NoLogging(bool onoff)
{
LogFile_IncreaseLevel();
GetViewerMethods()->SuppressQueryOutput(onoff);
Synchronize();
LogFile_DecreaseLevel();
}
// ****************************************************************************
// Function: visit_SetQueryFloatFormat()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment