Okay I pushed both d48e13e489e35be17a6a881e2f0c94649dec1622 && 9514b8974df55064bf54a4d27816cdffeaa71723 to the release branch.
On Fri, May 28, 2010 at 9:28 AM, Utkarsh Ayachit < [email protected]> wrote: > Alright, I've committed it to master. Dave, can you move this to the > release branch as well, thanks. > > commit d48e13e489e35be17a6a881e2f0c94649dec1622 > Author: Utkarsh Ayachit <[email protected]> > Date: Fri May 28 09:27:12 2010 -0400 > > Removed BUILD_PARAVIEW_PLUGINLIST. > > Removing unnecessary BUILD_PARAVIEW_PLUGINLIST varible. This was > resulting in > plugins included using PARAVIEW_EXTRA_EXTERNAL_MODULES not being > listed in the > default list of plugins. > > > Utkarsh > > On Thu, May 27, 2010 at 5:59 PM, Mike Jackson > <[email protected]> wrote: > > The patch is close but there are a few corrections and since I don't > > have a "patch" tool on my windows machine I'll have to try to describe > > the corrections here by hand so look carefully rather than trying to > > use 'patch' to apply these changes. > > > > diff --git a/CMakeLists.txt b/CMakeLists.txt > > index 8b77219..b08089d 100644 > > --- a/CMakeLists.txt > > +++ b/CMakeLists.txt > > @@ -30,9 +30,7 @@ FILE(WRITE ${PARAVIEW_PLUGINLIST_TXT} "") > > > ######################################################################### > > # PARAVIEW_PLUGINLIST is used to generate the config file distributed > with > > # ParaView that lists the plugins distributed with ParaView. > > > > -SET(PARAVIEW_PLUGIN_CONFIG_LIST "" CACHE INTERNAL "List of configured > > plugins.") > > > > > > diff --git a/CMake/ParaViewPlugins.cmake b/CMake/ParaViewPlugins.cmake > > index 1d03765..00e0ec9 100644 > > --- a/CMake/ParaViewPlugins.cmake > > +++ b/CMake/ParaViewPlugins.cmake > > @@ -1010,11 +1010,7 @@ FUNCTION(ADD_PARAVIEW_PLUGIN NAME VERSION) > > # this builds a list of actual plugin names added by plugins > > provided in the > > # ParaView source directory itself. > > # This is used to generate the ".plugins" configuration file. > > - if (BUILD_PARAVIEW_PLUGINLIST) > > - SET(PARAVIEW_PLUGINLIST ${PARAVIEW_PLUGINLIST} ${NAME} CACHE > INTERNAL > > - "List of configured plugins") > > - endif (BUILD_PARAVIEW_PLUGINLIST) > > - > > + SET(PARAVIEW_PLUGINLIST ${PARAVIEW_PLUGINLIST} ${NAME} CACHE > > INTERNAL "List of configured plugins") > > ENDIF(GUI_SRCS OR SM_SRCS OR ARG_SOURCES OR ARG_PYTHON_MODULES) > > > > ENDFUNCTION(ADD_PARAVIEW_PLUGIN) > > > > Those changes allowed my ParaView 3.8.0 source to correctly generate > > the .plugins file. > > _________________________________________________________ > > Mike Jackson [email protected] > > BlueQuartz Software www.bluequartz.net > > Principal Software Engineer Dayton, Ohio > > > > > > > > On Thu, May 27, 2010 at 5:32 PM, Utkarsh Ayachit > > <[email protected]> wrote: > >> Mike, > >> > >> Attached is a patch that fixes this issue. Can you try if that works? > >> Dave, if that works, can you commit that to the master and release > >> branches? > >> > >> Utkarsh > >> > >> On Thu, May 27, 2010 at 4:54 PM, Mike Jackson > >> <[email protected]> wrote: > >>> Here is some more information about what is going on with my windows > >>> build. I had to add the following to the top of my > >>> "*ParaViewImport.cmake" file: > >>> > >>> SET (BUILD_PARAVIEW_PLUGINLIST ON) > >>> > >>> So now the .plugins file correctly has my plugins listed except that > >>> the "autoload" property is set to "0". Shouldn't that be "1" by > >>> default? Seems odd but I am sure I don't fully understand all the > >>> ramifications of having that value set to "1" by default. > >>> > >>> Also, during the build I am compiling a 3rd party library that needs > >>> to get added to the installer generation. Is there a way to do this? > >>> If I run the "INSTALL" project from VS I get everything installed > >>> correctly. If I use the CPack command like took to generate the > >>> installer the library is missing from the install. > >>> _________________________________________________________ > >>> Mike Jackson [email protected] > >>> > >>> On Thu, May 27, 2010 at 4:23 PM, Michael Jackson > >>> <[email protected]> wrote: > >>>> > http://gitorious.bluequartz.net/mxa/pvmxadatamodel/blobs/master/PVMXADataModelParaViewImport.cmake > >>>> > >>>> I am calling ADD_PARAVIEW_PLUGIN in my Cmake files. Not sure why this > isn't > >>>> working. I thought we had that fixed. At least at some point during > the RC > >>>> process this did actually work. > >>>> -- > >>>> Mike J. > >>>> > >>>> On May 27, 2010, at 4:06 PM, Dave Partyka wrote: > >>>> > >>>>> How are you building your plugin? I believe that the > ADD_PARAVIEW_PLUGIN > >>>>> macro constructs the list of Plugins that get written into the > .plugins > >>>>> file. > >>>>> > >>>>> On Thu, May 27, 2010 at 3:54 PM, Mike Jackson > >>>>> <[email protected]> wrote: > >>>>> So then what is the point of having ParaView look in the plugins > >>>>> directory if it is not going to be used. Why not just have ParaView > >>>>> look in the "bin" folder (at least on windows)? > >>>>> > >>>>> I see there is a file called ".plugins" inside the bin directory. > Mine > >>>>> has the following content: > >>>>> > >>>>> <?xml version="1.0"?> > >>>>> <Plugins> > >>>>> <Plugin name="SierraPlotTools" auto_load="0"/> > >>>>> <Plugin name="SurfaceLIC" auto_load="0"/> > >>>>> <Plugin name="AnalyzeReader" auto_load="0"/> > >>>>> <Plugin name="AnalyzeWriter" auto_load="0"/> > >>>>> <Plugin name="NIfTIReader" auto_load="0"/> > >>>>> <Plugin name="NIfTIWriter" auto_load="0"/> > >>>>> </Plugins> > >>>>> > >>>>> This is missing my plugins although the plugins are "installed" in > the > >>>>> bin directory during the "INSTALL" project build. There is another > >>>>> file in the build directory called "PluginList.txt" that _does_ list > >>>>> my plugins though. > >>>>> _________________________________________________________ > >>>>> Mike Jackson [email protected] > >>>>> BlueQuartz Software www.bluequartz.net > >>>>> Principal Software Engineer Dayton, Ohio > >>>>> > >>>>> > >>>>> > >>>>> On Thu, May 27, 2010 at 3:42 PM, Utkarsh Ayachit > >>>>> <[email protected]> wrote: > >>>>> > Mike, > >>>>> > > >>>>> > That was a conscious decision. We deliberately install all plugin > dlls > >>>>> > in the same directory as the paraview.exe on windows, just to avoid > >>>>> > missing dlls issues at runtime. Originally, we had the separate > >>>>> > "plugins" directory to make it easier for users to locate the > plugins > >>>>> > and load them manually. But now, that's a non-issue, since paraview > >>>>> > explicitly lists all the plugins it's distributed with in the > plugin > >>>>> > manager dialog. > >>>>> > > >>>>> > Are you saying that the plugins added using > >>>>> > PARAVIEW_EXTRA_EXTERNAL_MODULES are not being installed at all? If > >>>>> > that's the case, then it's definitely a bug. > >>>>> > > >>>>> > As far as the package generation goes, you need to use CPack. Refer > to > >>>>> > this wiki page for details: > >>>>> > > http://www.paraview.org/Wiki/ParaView:Build_And_Install#Install_ParaView > >>>>> > > >>>>> > Utkarsh > >>>>> > > >>>>> > On Thu, May 27, 2010 at 12:37 PM, Mike Jackson > >>>>> > <[email protected]> wrote: > >>>>> >> Pulled ParaView 3.8.0 from Git. Configured with CMake for VS2008 > x64 > >>>>> >> with PARAVIEW_EXTRA_EXTERNAL_MODULES listing 4 of my custom > plugins. > >>>>> >> Compiled. Installed. And all the "client" plugins are installed > lose > >>>>> >> into the ParaView-3.8.0/bin directory instead of > >>>>> >> ParaView-3.8.0/bin/plugins. Also, I have NSIS installed, where is > the > >>>>> >> "PACKAGE" target in the VS Solution or is there another mechanism > to > >>>>> >> use to create the installer? > >>>>> >> The other (probably more likely) possibility is that I didn't > really > >>>>> >> pull the 3.8.0 tag from git and instead have some other tag. > >>>>> >> > >>>>> >> # On branch v3.8.0 > >>>>> >> # Changed but not updated: > >>>>> >> # (use "git add <file>..." to update what will be committed) > >>>>> >> # (use "git checkout -- <file>..." to discard changes in working > >>>>> >> directory) > >>>>> >> # > >>>>> >> # modified: CMake/FindHDF5.cmake > >>>>> >> # > >>>>> >> # Untracked files: > >>>>> >> # (use "git add <file>..." to include in what will be committed) > >>>>> >> # > >>>>> >> # .cproject > >>>>> >> # .project > >>>>> >> # Applications/ParaView/Testing/XML/Fractal3D.xml > >>>>> >> # CMake/AdjustLibVars.cmake > >>>>> >> # CMake/_FindHDF5.cmake > >>>>> >> # i386/ > >>>>> >> # x64/ > >>>>> >> no changes added to commit (use "git add" and/or "git commit -a") > >>>>> >> > >>>>> >> I just tried this with the ParaView 3.8.0 source code .zip file > from > >>>>> >> the paraview.org web site and had the same results. I also built > the > >>>>> >> NSIS installer, and then actually ran the installer and the same > issue > >>>>> >> happens. Bug? > >>>>> >> _________________________________________________________ > >>>>> >> Mike Jackson [email protected] > >>>>> >> BlueQuartz Software www.bluequartz.net > >>>>> >> Principal Software Engineer Dayton, Ohio > >>>>> >> _______________________________________________ > >>>>> >> Powered by www.kitware.com > >>>>> >> > >>>>> >> Visit other Kitware open-source projects at > >>>>> >> http://www.kitware.com/opensource/opensource.html > >>>>> >> > >>>>> >> Please keep messages on-topic and check the ParaView Wiki at: > >>>>> >> http://paraview.org/Wiki/ParaView > >>>>> >> > >>>>> >> Follow this link to subscribe/unsubscribe: > >>>>> >> http://www.paraview.org/mailman/listinfo/paraview > >>>>> >> > >>>>> > > >>>>> _______________________________________________ > >>>>> Powered by www.kitware.com > >>>>> > >>>>> Visit other Kitware open-source projects at > >>>>> http://www.kitware.com/opensource/opensource.html > >>>>> > >>>>> Please keep messages on-topic and check the ParaView Wiki at: > >>>>> http://paraview.org/Wiki/ParaView > >>>>> > >>>>> Follow this link to subscribe/unsubscribe: > >>>>> http://www.paraview.org/mailman/listinfo/paraview > >>>>> > >>>> > >>>> > >>> _______________________________________________ > >>> Powered by www.kitware.com > >>> > >>> Visit other Kitware open-source projects at > http://www.kitware.com/opensource/opensource.html > >>> > >>> Please keep messages on-topic and check the ParaView Wiki at: > http://paraview.org/Wiki/ParaView > >>> > >>> Follow this link to subscribe/unsubscribe: > >>> http://www.paraview.org/mailman/listinfo/paraview > >>> > >> > > > _______________________________________________ > Powered by www.kitware.com > > Visit other Kitware open-source projects at > http://www.kitware.com/opensource/opensource.html > > Please keep messages on-topic and check the ParaView Wiki at: > http://paraview.org/Wiki/ParaView > > Follow this link to subscribe/unsubscribe: > http://www.paraview.org/mailman/listinfo/paraview >
_______________________________________________ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the ParaView Wiki at: http://paraview.org/Wiki/ParaView Follow this link to subscribe/unsubscribe: http://www.paraview.org/mailman/listinfo/paraview
