The following commit has been merged in the master branch:
commit 7c74c9fc1d53dc8c01e69adf2e4bf48a8abc90bb
Author: David Paleino <da...@debian.org>
Date: Sat Feb 20 17:16:38 2010 +0100
Revert changes to upstream sources made by old maintainer.
diff --git a/demo/README b/demo/README
deleted file mode 100644
index e16fc88..0000000
--- a/demo/README
+++ /dev/null
@@ -1,4 +0,0 @@
-To use the files contained within, you need to copy the directory to
-somewhere you can write to, then gunzip */*.gz.
-
--- Dominic Hargreaves, for the Debian package.
diff --git a/demo/c++/readme.txt b/demo/c++/readme.txt
index e4c9930..c9d546b 100644
--- a/demo/c++/readme.txt
+++ b/demo/c++/readme.txt
@@ -1,17 +1,20 @@
This directory contains a simple c++ program demonstrating the Mapnik C++ API.
It mimics the python 'rundemo.py' example with a couple exceptions.
-To build it:
+To build it re-configure SCons with DEMO=True then rebuild::
-g++ -O3 -I/usr/include/freetype2 -I/usr/include/agg2 -lmapnik rundemo.cpp -o
rundemo
+ $ python scons/scons.py configure DEMO=True
+ $ python scons/scons.py
-(You will need to have libagg-dev installed for this to work).
-To run:
+The sample program will be compiled (but not installed).
+
+
+To run::
$ cd demo/c++
- $ ./rundemo `mapnik-plugin-base`
+ $ ./rundemo /usr/local/lib/mapnik
For more detailed comments have a look in demo/python/rundemo.py
Have fun!
-Artem (and Dominic for the Debian package)
+Artem.
diff --git a/demo/c++/rundemo.cpp b/demo/c++/rundemo.cpp
index f556c2a..00cd0f1 100644
--- a/demo/c++/rundemo.cpp
+++ b/demo/c++/rundemo.cpp
@@ -43,7 +43,7 @@ int main ( int argc , char** argv)
{
if (argc != 2)
{
- std::cout << "usage: ./rundemo <mapnik_plugin_dir>\n";
+ std::cout << "usage: ./rundemo <mapnik_install_dir>\nUsually
/usr/local/lib/mapnik\n";
std::cout << "Warning: ./rundemo looks for data in
../data/,\nTherefore must be run from within the demo/c++ folder.\n";
return EXIT_SUCCESS;
}
@@ -51,9 +51,11 @@ int main ( int argc , char** argv)
using namespace mapnik;
try {
std::cout << " running demo ... \n";
- std::string mapnik_plugin_dir(argv[1]);
- datasource_cache::instance()->register_datasources(mapnik_plugin_dir);
-
freetype_engine::register_font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf");
+ std::string mapnik_dir(argv[1]);
+ std::cout << " looking for 'shape.input' plugin in... " << mapnik_dir
<< "/input/" << "\n";
+ datasource_cache::instance()->register_datasources(mapnik_dir +
"/input/");
+ std::cout << " looking for DejaVuSans font in... " << mapnik_dir <<
"/fonts/DejaVuSans.ttf" << "\n";
+ freetype_engine::register_font(mapnik_dir + "/fonts/DejaVuSans.ttf");
Map m(800,600);
m.set_background(color_factory::from_string("white"));
--
C++/Python toolkit for developing GIS applications
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
