Some minor issues I think should be changed for the plucker_desktop
dir in CVS:
- COPYING should be removed (we have a COPYING file in the top dir)
- REQUIREMENTS could be removed. I have updated the file in the top
dir with the new info. However, I removed the part saying that the
same compiler is used to compile the desktop tool and the viewer --
it's true that GCC can be used in both cases, but you can't use the
*same* compiler (need a cross-compiler for the viewer). Just to avoid
any confusion...
- makefile_temp.g95??
- plucker.ini, exclusionlist.txt seems kind of misplaced. The Linux/Unix
version should use $HOME/.pluckerrc and exclusionlist.txt found in
PLUCKERHOME, PLUCKERDIR and any extra exclusionlists added to the
current section. I'd guess the Windows version also has some kind of
default plucker.ini and exclusionlist.txt files.
- plucker_showcase.htm is a resource file, so it might be a better idea
to put it in the resource dir
I also think the channels dir created by the tool should be put in
PLUCKERHOME (defaults to ~/.plucker on Linux/Unix). Right now it
creates the channels dir in the current dir, so if you run the desktop
tool from different dirs you will create new channels dirs all over the
place ;-)
I have updated the config scripts to also build the plucker desktop tool.
This includes replacing the makefile.unix file with a Makefile.in file. I
don't know if/how Windows can use the configure scripts, though. If it is
possible to use autoconf and friends with Windows we could update the
Makefile.in to create different Makefiles for Linux/Unix and Windows.
For the Linux/Unix version I have selected to install the resource files
together with the other shared Plucker data, i.e. in
<TOP_INSTALL_DIR>/share/plucker/desktop/
This would require a setting in the config file, so that the desktop tool
knows where to find the resources. That could be added to the config file
at installation.
diff -r1.1 configuration.cpp
154c154
< wxString string;
---
> wxString directory;
158,159c158,176
< string = wxGetCwd() << '/' << "channels";
< break;
---
> #ifdef __WXGTK__
> bool pluckerhome_exists;
>
> pluckerhome_exists = wxGetEnv( "PLUCKERHOME", &directory );
> if ( ! pluckerhome_exists )
> directory = wxGetHomeDir() << "/.plucker";
>
> directory.Append( "/channels" );
> #else
> directory = wxGetCwd() << '/' << "channels";
> #endif
> break;
>
> case RESOURCES:
> directory = the_configuration->Read( "/PLUCKER-DESKTOP/resource_dir",
>_T( "resource" ) );
> break;
>
> default:
> break;
162c179
< return string;
---
> return directory;
164d180
<
diff -r1.1 configuration.h
38a39,41
> #define RESOURCES 2
>
> #endif //_CONFIGURATION_H_
40d42
< #endif //_CONFIGURATION_H_
\ No newline at end of file
diff -r1.1 plucker-desktop.cpp
78a79,83
> // Get the path to the resource files
> wxString resource_file;
>
> resource_file = get_plkr_directory( RESOURCES ) << "/resource.xrc";
>
81c86
< wxTheXmlResource->Load( "resource/resource.xrc" );
---
> wxTheXmlResource->Load( resource_file );
104c109,110
< }
\ No newline at end of file
---
> }
>
diff -r1.1 splashscreen.cpp
56a57,60
> wxString splash_image;
>
> splash_image = get_plkr_directory( RESOURCES ) << "/splash.png";
>
61c65
< if ( bitmap.LoadFile("resource/splash.png", wxBITMAP_TYPE_PNG ) )
---
> if ( bitmap.LoadFile( splash_image, wxBITMAP_TYPE_PNG ) )
86c90,91
< }
\ No newline at end of file
---
> }
>
None of these changes have been added to the code in CVS, yet.
/Mike
