# HG changeset patch # User Stephan Holl # Date 1317900460 -7200 # Node ID c023b4978663c184a3b281a7667dc013c25cd0e0 # Parent b2df9936d4f85c3c72eaaf7668e2e4ae83777f50 Reworked the dir-layout to fit the need of the NSIS-installer; added the missing RunExample.bat-file to the repo diff -r b2df9936d4f8 -r c023b4978663 ChangeLog --- a/ChangeLog Thu Oct 06 12:31:05 2011 +0200 +++ b/ChangeLog Thu Oct 06 13:27:40 2011 +0200 @@ -1,3 +1,9 @@ +2011-10-06 Stephan Holl + + * contrib/installer/example: reworked the dir-layout to fit the + need of the NSIS-installer; added the missing RunExample.bat-file + to the repo. + 2011-10-06 Stephan Holl * doku/source/conf.py, contrib/installer/MXD2map-installer.nsi: diff -r b2df9936d4f8 -r c023b4978663 contrib/installer/example/RunExample.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/installer/example/RunExample.bat Thu Oct 06 13:27:40 2011 +0200 @@ -0,0 +1,43 @@ +@echo off +if "%1" == "setenv" goto setenv + +%comspec% /k RunExample.bat setenv %1 +goto exit + +:setenv +@echo Setting environment for using MXD2map based on gisinternals.com windows builds. +@echo See http://mxd2map.org and http://gisinternals.com/sdk/ for details. + +if "%2"=="hideoci" goto hideoci + +set ocipath=0 +set _path="%PATH:;=" "%" +for %%p in (%_path%) do if not "%%~p"=="" if exist %%~p\oci.dll set ocipath=1 + +if "%ocipath%"=="0" goto hideoci +@echo WARNING: If you encounter problems with missing oci libraries then type: +@echo MXD2mapShell hideoci +goto setenv2 + +:hideoci +@echo Hiding the OCI plugin library. +if not exist %CD%\ms_6.1-dev\bin\gdal\plugins-optional mkdir %CD%\ms_6.1-dev\bin\gdal\plugins-optional +if exist %CD%\ms_6.1-dev\bin\gdal\plugins\ogr_OCI.dll move %CD%\ms_6.1-dev\bin\gdal\plugins\ogr_OCI.dll %CD%\ms_6.1-dev\bin\gdal\plugins-optional\ogr_OCI.dll +if exist %CD%\ms_6.1-dev\bin\gdal\plugins\gdal_GEOR.dll move %CD%\ms_6.1-dev\bin\gdal\plugins\gdal_GEOR.dll %CD%\ms_6.1-dev\bin\gdal\plugins-optional\gdal_GEOR.dll + +REM SEE Details about the installation of arcobjects.jar!! +REM http://forums.arcgis.com/threads/17398-Unable-to-initialize-ArcObjects-environment-%28Java-API%29 +REM http://forums.arcgis.com/threads/12833-ArcGIS-Server-initialize-license-%28Java-version%29 +REM SEE Details about the installation of arcobjects.jar!! +:setenv2 +SET PATH=C:\Program Files\ArcGIS\DeveloperKit10.0\java\jre\bin;C:\Program Files\Java\jdk1.6.0_26\bin;C:\Program Files\ArcGIS\Desktop10.0\bin;C:\Program Files\ArcGIS\Desktop10.0\java\lib;C:\Program Files\ArcGIS\DeveloperKit10.0\java\tools\ant\bin;%CD%\ms_6.1-dev\bin;%CD%\ms_6.1-dev\bin\gdal\python\osgeo;%CD%\ms_6.1-dev\bin\proj\apps;%CD%\ms_6.1-dev\bin\gdal\apps;%CD%\ms_6.1-dev\bin\ms\apps;%CD%\ms_6.1-dev\bin\gdal\csharp;%CD%\ms_6.1-dev\bin\ms\csharp;%CD%\ms_6.1-dev\bin\curl;%CD%\ms_6.1-dev\bin\ms\java;%PATH% +SET GDAL_DATA=%CD%\ms_6.1-dev\bin\gdal-data +SET GDAL_DRIVER_PATH=%CD%\ms_6.1-dev\bin\gdal\plugins +SET PYTHONPATH=%CD%\ms_6.1-dev\bin\gdal\python\osgeo +SET PROJ_LIB=%CD%\bin\proj\SHARE +SET CURL_CA_BUNDLE=C:\ms4w\Apache\conf\ca-bundle\cacert.pem +SET JAVA_HOME=C:\Program Files\Java\jdk1.6.0_26 + +java -jar mxd2map.jar -m example\example.mxd -t example\template.map -a "%HOMEDRIVE%%HOMEPATH%\MXD2map\example\output.map" + +:exit diff -r b2df9936d4f8 -r c023b4978663 contrib/installer/example/epsg/epsg --- a/contrib/installer/example/epsg/epsg Thu Oct 06 12:31:05 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -# WGS 84 / LAT-LON -<4326> +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs <> - -# DHDN / Gauss-Kruger zone 3 -<31467> +proj=tmerc +lat_0=0 +lon_0=9 +k=1 +x_0=3500000 +y_0=0 +ellps=bessel +datum=potsdam +units=m +no_defs <> diff -r b2df9936d4f8 -r c023b4978663 contrib/installer/example/example.mxd Binary file contrib/installer/example/example.mxd has changed diff -r b2df9936d4f8 -r c023b4978663 contrib/installer/example/example/epsg/epsg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/installer/example/example/epsg/epsg Thu Oct 06 13:27:40 2011 +0200 @@ -0,0 +1,5 @@ +# WGS 84 / LAT-LON +<4326> +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs <> + +# DHDN / Gauss-Kruger zone 3 +<31467> +proj=tmerc +lat_0=0 +lon_0=9 +k=1 +x_0=3500000 +y_0=0 +ellps=bessel +datum=potsdam +units=m +no_defs <> diff -r b2df9936d4f8 -r c023b4978663 contrib/installer/example/example/example.mxd Binary file contrib/installer/example/example/example.mxd has changed diff -r b2df9936d4f8 -r c023b4978663 contrib/installer/example/example/mapfile_header.include --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/installer/example/example/mapfile_header.include Thu Oct 06 13:27:40 2011 +0200 @@ -0,0 +1,74 @@ +# +# Copyright (c) 2011 by Intevation GmbH, Germany +# +# This file is part of MXD2map. +# +# This program is free software under the LGPL (>=v2.1) +# Read the file LICENCE.txt coming with the software for details +# or visit http://www.gnu.org/licenses/ if it does not exist. +# +# MXD2map has been developed on behalf of the +# Bundesamt fuer Seeschifffahrt und Hydrographie (BSH) in Hamburg +# by Intevation GmbH. +# +# Authors: +# Raimund Renkert +# Bjoern Schilberg +# Stephan Holl + +STATUS ON +EXTENT 3427000 5787000 3444200 5801000 +UNITS meters +IMAGECOLOR -1 -1 -1 #transparent +FONTSET "ttf-fonts/fonts.txt" +SYMBOLSET "../symbols/symbols.sym" +SHAPEPATH "example/testdata-frida/" +IMAGETYPE png + +MAXSIZE 2500 # 2500x2500 pixel maximum Site + +# Own PROJECTION-file +CONFIG "PROJ_LIB" "epsg" + +PROJECTION + "init=epsg:31467" +END + +#8bit png, supports transparency. +OUTPUTFORMAT + NAME aggpng + DRIVER AGG/PNG + MIMETYPE "image/png" + + ## transparency only with RGBA Image Mode + ## mapserver had to be compiled -with-experimental-png + + IMAGEMODE RGBA + EXTENSION "png" + + ## The next options works with transparency, when requesting another + ## layer within the same request. When requesting the layer alone, + ## everything seems black. TODO: Verify if this is a bug or a features. + ## Anyway, it reduces the PNG-filesize by 70% though! + FORMATOPTION "QUANTIZE_FORCE=ON" + FORMATOPTION "QUANTIZE_COLORS=256" + FORMATOPTION "QUANTIZE_NEW=ON" + + + ## The next options will work with transparency but are incompatible + ## with the previous quantization options. + #FORMATOPTION "PALETTE_FORCE=ON" + #FORMATOPTION "PALETTE=/home/geo4/mapserver/palette.txt" #to be defined + + TRANSPARENT ON +END + +#24bit png, supports all colors but does not support transparency. +OUTPUTFORMAT + NAME aggpng24 + DRIVER AGG/PNG + MIMETYPE "image/png; mode=24bit" + IMAGEMODE RGBA + EXTENSION "png" +END + diff -r b2df9936d4f8 -r c023b4978663 contrib/installer/example/example/symbols/symbols.sym --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/installer/example/example/symbols/symbols.sym Thu Oct 06 13:27:40 2011 +0200 @@ -0,0 +1,8 @@ +SYMBOLSET + # basic symbol for hatching in all variantes which + # will be combined inside the STYLE-block + SYMBOL + NAME "hatch" + TYPE hatch + END +END diff -r b2df9936d4f8 -r c023b4978663 contrib/installer/example/example/template.map --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/installer/example/example/template.map Thu Oct 06 13:27:40 2011 +0200 @@ -0,0 +1,58 @@ +# +# Copyright (c) 2011 by Intevation GmbH, Germany +# +# This file is part of MXD2map. +# +# This program is free software under the LGPL (>=v2.1) +# Read the file LICENCE.txt coming with the software for details +# or visit http://www.gnu.org/licenses/ if it does not exist. +# +# MXD2map has been developed on behalf of the +# Bundesamt fuer Seeschifffahrt und Hydrographie (BSH) in Hamburg +# by Intevation GmbH. +# +# Authors: +# Raimund Renkert +# Bjoern Schilberg +# Stephan Holl + +#MapServer mxd map file +MAP + + NAME "mxd" + INCLUDE "mapfile_header.include" + +WEB + IMAGEPATH "/tmp/" + IMAGEURL "/tmp/" + + METADATA + 'ows_title' 'Intevation MXD WMS DemoService' + 'ows_srs' 'EPSG:4326 EPSG:31467' + 'ows_extent' '3427000 5787000 3444200 5801000' + 'ows_addresstype' 'postal' + 'ows_address' 'Neuer Graben 17' + 'ows_postcode' '49074' + 'ows_city' 'Osnabrueck' + 'ows_stateorprovince' 'DE-NDS' + 'ows_country' 'DE' + 'ows_contactposition' 'Geospatial' + 'ows_contactorganization' 'Geospatial' + 'ows_contactvoicetelephone' '+49 541 33 50 83 0' + 'ows_contactfacsimiletelephone' '+49 541 33 50 83 99' + 'ows_contactelectronicmailaddress' 'geospatial@intevation.de' + 'ows_abstract' 'MXD - Demo-Dienst für die Überprüfung der Konvertierung der MXD Dateien nach MAP Dateien.' + 'ows_fees' 'Die Nutzung dieses Dienstes ist kostenfrei.' + 'ows_accessconstraints' 'Sämtliche Rechte an diesem Produkt liegen bei der Intevation GmbH.' + 'ows_keywordlist' 'MXD, STYLES, SYMBOLOGY' + 'ows_sld_enabled' 'false' + 'ows_http_max_age' '86400' # should 24h in seconds + 'ows_enable_request' '*' + 'wms_feature_info_mime_type' 'text/html' + 'wms_getmap_formatlist' 'image/png,image/png; mode=24bit' + 'wms_encoding' 'UTF-8' + 'wms_exceptions_format' 'XML' + END +END + +END diff -r b2df9936d4f8 -r c023b4978663 contrib/installer/example/example/testdata-frida/Readme.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/installer/example/example/testdata-frida/Readme.txt Thu Oct 06 13:27:40 2011 +0200 @@ -0,0 +1,3 @@ +Find shape testdata on FTP: + +ftp://ftp.intevation.de/freegis/frida/frida-1.0.1-shp.tar.gz \ No newline at end of file diff -r b2df9936d4f8 -r c023b4978663 contrib/installer/example/example/ttf-fonts/DejaVuSans.ttf Binary file contrib/installer/example/example/ttf-fonts/DejaVuSans.ttf has changed diff -r b2df9936d4f8 -r c023b4978663 contrib/installer/example/example/ttf-fonts/fonts.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/installer/example/example/ttf-fonts/fonts.txt Thu Oct 06 13:27:40 2011 +0200 @@ -0,0 +1,81 @@ +# Make sure that your alias-names do _not_ contain spaces since the +# parser does not handle that correctly. +# +# Also make sure providing the fonts referenced here inside this folder or +# adopt the paths accordinly. +# +# FreeSans is a default fallback-font. +FreeSans DejaVuSans.ttf +ESRIMeteorological01 C:/Windows/Fonts/esri_105.ttf +ESRIDefaultMarker C:/Windows/Fonts/esri_11.ttf +ESRIOrdnanceSurvey C:/Windows/Fonts/esri_121.ttf +ESRINIMADNCPT C:/Windows/Fonts/esri_12.ttf +ESRISDS1.951 C:/Windows/Fonts/esri_130.ttf +ESRISDS1.952 C:/Windows/Fonts/esri_131.ttf +ESRISDS2.001 C:/Windows/Fonts/esri_132.ttf +ESRISDS2.002 C:/Windows/Fonts/esri_133.ttf +ESRINIMADNCLN C:/Windows/Fonts/esri_13.ttf +ESRIArrowhead C:/Windows/Fonts/esri_144.ttf +ESRISurveyor C:/Windows/Fonts/esri_149.ttf +ESRINIMAVMAP1&2PT C:/Windows/Fonts/esri_14.ttf +ESRIAMFMElectric C:/Windows/Fonts/esri_150.ttf +ESRIAMFMGas C:/Windows/Fonts/esri_151.ttf +ESRIAMFMSewer C:/Windows/Fonts/esri_152.ttf +ESRIAMFMWater C:/Windows/Fonts/esri_153.ttf +ESRIHydrants C:/Windows/Fonts/esri_159.ttf +ESRINIMAVMAP1&2LN C:/Windows/Fonts/esri_15.ttf +ESRITelecom C:/Windows/Fonts/esri_160.ttf +ESRIPipelineUS1 C:/Windows/Fonts/esri_161.ttf +ESRINIMACityGraphicPT C:/Windows/Fonts/esri_16.ttf +ESRINIMACityGraphicLN C:/Windows/Fonts/esri_17.ttf +ESRIMilMod02 C:/Windows/Fonts/esri_19.ttf +ESRICartography C:/Windows/Fonts/esri_1.ttf +ESRIMilRed01 C:/Windows/Fonts/esri_20.ttf +ESRIIGLFont16 C:/Windows/Fonts/esri_216.ttf +ESRIMilSym01 C:/Windows/Fonts/esri_21.ttf +ESRIIGLFont20 C:/Windows/Fonts/esri_220.ttf +ESRIIGLFont21 C:/Windows/Fonts/esri_221.ttf +ESRIIGLFont22 C:/Windows/Fonts/esri_222.ttf +ESRIIGLFont23 C:/Windows/Fonts/esri_223.ttf +ESRIIGLFont24 C:/Windows/Fonts/esri_224.ttf +ESRIIGLFont25 C:/Windows/Fonts/esri_225.ttf +ESRIMilSym02 C:/Windows/Fonts/esri_22.ttf +ESRIMilSym03 C:/Windows/Fonts/esri_23.ttf +ESRIMilSym04 C:/Windows/Fonts/esri_24.ttf +ESRIMilSym05 C:/Windows/Fonts/esri_25.ttf +ESRIMilMod01 C:/Windows/Fonts/esri_26.ttf +ESRIMil2525CModifiers C:/Windows/Fonts/esri_27Mcr_2.ttf +ESRIPublic1 C:/Windows/Fonts/esri_29.ttf +ESRIEnvironmental&Icons C:/Windows/Fonts/esri_2.ttf +ESRIArcPad C:/Windows/Fonts/esri_30s.ttf +ESRIClimate&Precipitation C:/Windows/Fonts/esri_33.ttf +ESRIBusiness C:/Windows/Fonts/esri_34.ttf +ESRICaves1 C:/Windows/Fonts/esri_375.ttf +ESRICaves2 C:/Windows/Fonts/esri_376.ttf +ESRICaves3 C:/Windows/Fonts/esri_377.ttf +ESRIDimensioning C:/Windows/Fonts/esri_39.ttf +ESRIGeometricSymbols C:/Windows/Fonts/esri_3.ttf +ESRIGeologyUSGS95-525 C:/Windows/Fonts/esri_400.ttf +ESRIElements C:/Windows/Fonts/esri_405.ttf +ESRICommodities C:/Windows/Fonts/esri_406.ttf +ESRINorth C:/Windows/Fonts/esri_40.ttf +ESRIShields C:/Windows/Fonts/esri_44.ttf +ESRIUSMUTCD1 C:/Windows/Fonts/esri_47.ttf +ESRIUSMUTCD2 C:/Windows/Fonts/esri_48.ttf +ESRIUSMUTCD3 C:/Windows/Fonts/esri_49.ttf +ESRIOilGasWater C:/Windows/Fonts/esri_4.ttf +ESRIGeologyAGSO1 C:/Windows/Fonts/esri_500.ttf +ESRIWeather C:/Windows/Fonts/esri_5.ttf +ESRIUSForestry1 C:/Windows/Fonts/esri_651.ttf +ESRIUSForestry2 C:/Windows/Fonts/esri_652.ttf +ESRIConservation C:/Windows/Fonts/esri_730.ttf +ESRIGeology C:/Windows/Fonts/esri_7.ttf +ESRIEnviroHazardIncident C:/Windows/Fonts/esri_800.ttf +ESRIEnviroHazardAnalysis C:/Windows/Fonts/esri_801.ttf +ESRIEnviroHazardSites C:/Windows/Fonts/esri_802.ttf +ESRIHazardousMaterials C:/Windows/Fonts/esri_803.ttf +ESRIFireIncidentNFPA C:/Windows/Fonts/esri_804.ttf +ESRIERSInfrastructuresS1 C:/Windows/Fonts/esri_832.ttf +ESRIERSOperationsS1 C:/Windows/Fonts/esri_837.ttf +ESRICrimeAnalysis C:/Windows/Fonts/esri_8.ttf +ESRITransportationCivic C:/Windows/Fonts/esri_9.ttf diff -r b2df9936d4f8 -r c023b4978663 contrib/installer/example/mapfile_header.include --- a/contrib/installer/example/mapfile_header.include Thu Oct 06 12:31:05 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,74 +0,0 @@ -# -# Copyright (c) 2011 by Intevation GmbH, Germany -# -# This file is part of MXD2map. -# -# This program is free software under the LGPL (>=v2.1) -# Read the file LICENCE.txt coming with the software for details -# or visit http://www.gnu.org/licenses/ if it does not exist. -# -# MXD2map has been developed on behalf of the -# Bundesamt fuer Seeschifffahrt und Hydrographie (BSH) in Hamburg -# by Intevation GmbH. -# -# Authors: -# Raimund Renkert -# Bjoern Schilberg -# Stephan Holl - -STATUS ON -EXTENT 3427000 5787000 3444200 5801000 -UNITS meters -IMAGECOLOR -1 -1 -1 #transparent -FONTSET "ttf-fonts/fonts.txt" -SYMBOLSET "../symbols/symbols.sym" -SHAPEPATH "example/testdata-frida/" -IMAGETYPE png - -MAXSIZE 2500 # 2500x2500 pixel maximum Site - -# Own PROJECTION-file -CONFIG "PROJ_LIB" "epsg" - -PROJECTION - "init=epsg:31467" -END - -#8bit png, supports transparency. -OUTPUTFORMAT - NAME aggpng - DRIVER AGG/PNG - MIMETYPE "image/png" - - ## transparency only with RGBA Image Mode - ## mapserver had to be compiled -with-experimental-png - - IMAGEMODE RGBA - EXTENSION "png" - - ## The next options works with transparency, when requesting another - ## layer within the same request. When requesting the layer alone, - ## everything seems black. TODO: Verify if this is a bug or a features. - ## Anyway, it reduces the PNG-filesize by 70% though! - FORMATOPTION "QUANTIZE_FORCE=ON" - FORMATOPTION "QUANTIZE_COLORS=256" - FORMATOPTION "QUANTIZE_NEW=ON" - - - ## The next options will work with transparency but are incompatible - ## with the previous quantization options. - #FORMATOPTION "PALETTE_FORCE=ON" - #FORMATOPTION "PALETTE=/home/geo4/mapserver/palette.txt" #to be defined - - TRANSPARENT ON -END - -#24bit png, supports all colors but does not support transparency. -OUTPUTFORMAT - NAME aggpng24 - DRIVER AGG/PNG - MIMETYPE "image/png; mode=24bit" - IMAGEMODE RGBA - EXTENSION "png" -END - diff -r b2df9936d4f8 -r c023b4978663 contrib/installer/example/symbols/symbols.sym --- a/contrib/installer/example/symbols/symbols.sym Thu Oct 06 12:31:05 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -SYMBOLSET - # basic symbol for hatching in all variantes which - # will be combined inside the STYLE-block - SYMBOL - NAME "hatch" - TYPE hatch - END -END diff -r b2df9936d4f8 -r c023b4978663 contrib/installer/example/template.map --- a/contrib/installer/example/template.map Thu Oct 06 12:31:05 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -# -# Copyright (c) 2011 by Intevation GmbH, Germany -# -# This file is part of MXD2map. -# -# This program is free software under the LGPL (>=v2.1) -# Read the file LICENCE.txt coming with the software for details -# or visit http://www.gnu.org/licenses/ if it does not exist. -# -# MXD2map has been developed on behalf of the -# Bundesamt fuer Seeschifffahrt und Hydrographie (BSH) in Hamburg -# by Intevation GmbH. -# -# Authors: -# Raimund Renkert -# Bjoern Schilberg -# Stephan Holl - -#MapServer mxd map file -MAP - - NAME "mxd" - INCLUDE "mapfile_header.include" - -WEB - IMAGEPATH "/tmp/" - IMAGEURL "/tmp/" - - METADATA - 'ows_title' 'Intevation MXD WMS DemoService' - 'ows_srs' 'EPSG:4326 EPSG:31467' - 'ows_extent' '3427000 5787000 3444200 5801000' - 'ows_addresstype' 'postal' - 'ows_address' 'Neuer Graben 17' - 'ows_postcode' '49074' - 'ows_city' 'Osnabrueck' - 'ows_stateorprovince' 'DE-NDS' - 'ows_country' 'DE' - 'ows_contactposition' 'Geospatial' - 'ows_contactorganization' 'Geospatial' - 'ows_contactvoicetelephone' '+49 541 33 50 83 0' - 'ows_contactfacsimiletelephone' '+49 541 33 50 83 99' - 'ows_contactelectronicmailaddress' 'geospatial@intevation.de' - 'ows_abstract' 'MXD - Demo-Dienst für die Überprüfung der Konvertierung der MXD Dateien nach MAP Dateien.' - 'ows_fees' 'Die Nutzung dieses Dienstes ist kostenfrei.' - 'ows_accessconstraints' 'Sämtliche Rechte an diesem Produkt liegen bei der Intevation GmbH.' - 'ows_keywordlist' 'MXD, STYLES, SYMBOLOGY' - 'ows_sld_enabled' 'false' - 'ows_http_max_age' '86400' # should 24h in seconds - 'ows_enable_request' '*' - 'wms_feature_info_mime_type' 'text/html' - 'wms_getmap_formatlist' 'image/png,image/png; mode=24bit' - 'wms_encoding' 'UTF-8' - 'wms_exceptions_format' 'XML' - END -END - -END diff -r b2df9936d4f8 -r c023b4978663 contrib/installer/example/testdata-frida/Readme.txt --- a/contrib/installer/example/testdata-frida/Readme.txt Thu Oct 06 12:31:05 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -Find shape testdata on FTP: - -ftp://ftp.intevation.de/freegis/frida/frida-1.0.1-shp.tar.gz \ No newline at end of file diff -r b2df9936d4f8 -r c023b4978663 contrib/installer/example/ttf-fonts/DejaVuSans.ttf Binary file contrib/installer/example/ttf-fonts/DejaVuSans.ttf has changed diff -r b2df9936d4f8 -r c023b4978663 contrib/installer/example/ttf-fonts/fonts.txt --- a/contrib/installer/example/ttf-fonts/fonts.txt Thu Oct 06 12:31:05 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -# Make sure that your alias-names do _not_ contain spaces since the -# parser does not handle that correctly. -# -# Also make sure providing the fonts referenced here inside this folder or -# adopt the paths accordinly. -# -# FreeSans is a default fallback-font. -FreeSans DejaVuSans.ttf -ESRIMeteorological01 C:/Windows/Fonts/esri_105.ttf -ESRIDefaultMarker C:/Windows/Fonts/esri_11.ttf -ESRIOrdnanceSurvey C:/Windows/Fonts/esri_121.ttf -ESRINIMADNCPT C:/Windows/Fonts/esri_12.ttf -ESRISDS1.951 C:/Windows/Fonts/esri_130.ttf -ESRISDS1.952 C:/Windows/Fonts/esri_131.ttf -ESRISDS2.001 C:/Windows/Fonts/esri_132.ttf -ESRISDS2.002 C:/Windows/Fonts/esri_133.ttf -ESRINIMADNCLN C:/Windows/Fonts/esri_13.ttf -ESRIArrowhead C:/Windows/Fonts/esri_144.ttf -ESRISurveyor C:/Windows/Fonts/esri_149.ttf -ESRINIMAVMAP1&2PT C:/Windows/Fonts/esri_14.ttf -ESRIAMFMElectric C:/Windows/Fonts/esri_150.ttf -ESRIAMFMGas C:/Windows/Fonts/esri_151.ttf -ESRIAMFMSewer C:/Windows/Fonts/esri_152.ttf -ESRIAMFMWater C:/Windows/Fonts/esri_153.ttf -ESRIHydrants C:/Windows/Fonts/esri_159.ttf -ESRINIMAVMAP1&2LN C:/Windows/Fonts/esri_15.ttf -ESRITelecom C:/Windows/Fonts/esri_160.ttf -ESRIPipelineUS1 C:/Windows/Fonts/esri_161.ttf -ESRINIMACityGraphicPT C:/Windows/Fonts/esri_16.ttf -ESRINIMACityGraphicLN C:/Windows/Fonts/esri_17.ttf -ESRIMilMod02 C:/Windows/Fonts/esri_19.ttf -ESRICartography C:/Windows/Fonts/esri_1.ttf -ESRIMilRed01 C:/Windows/Fonts/esri_20.ttf -ESRIIGLFont16 C:/Windows/Fonts/esri_216.ttf -ESRIMilSym01 C:/Windows/Fonts/esri_21.ttf -ESRIIGLFont20 C:/Windows/Fonts/esri_220.ttf -ESRIIGLFont21 C:/Windows/Fonts/esri_221.ttf -ESRIIGLFont22 C:/Windows/Fonts/esri_222.ttf -ESRIIGLFont23 C:/Windows/Fonts/esri_223.ttf -ESRIIGLFont24 C:/Windows/Fonts/esri_224.ttf -ESRIIGLFont25 C:/Windows/Fonts/esri_225.ttf -ESRIMilSym02 C:/Windows/Fonts/esri_22.ttf -ESRIMilSym03 C:/Windows/Fonts/esri_23.ttf -ESRIMilSym04 C:/Windows/Fonts/esri_24.ttf -ESRIMilSym05 C:/Windows/Fonts/esri_25.ttf -ESRIMilMod01 C:/Windows/Fonts/esri_26.ttf -ESRIMil2525CModifiers C:/Windows/Fonts/esri_27Mcr_2.ttf -ESRIPublic1 C:/Windows/Fonts/esri_29.ttf -ESRIEnvironmental&Icons C:/Windows/Fonts/esri_2.ttf -ESRIArcPad C:/Windows/Fonts/esri_30s.ttf -ESRIClimate&Precipitation C:/Windows/Fonts/esri_33.ttf -ESRIBusiness C:/Windows/Fonts/esri_34.ttf -ESRICaves1 C:/Windows/Fonts/esri_375.ttf -ESRICaves2 C:/Windows/Fonts/esri_376.ttf -ESRICaves3 C:/Windows/Fonts/esri_377.ttf -ESRIDimensioning C:/Windows/Fonts/esri_39.ttf -ESRIGeometricSymbols C:/Windows/Fonts/esri_3.ttf -ESRIGeologyUSGS95-525 C:/Windows/Fonts/esri_400.ttf -ESRIElements C:/Windows/Fonts/esri_405.ttf -ESRICommodities C:/Windows/Fonts/esri_406.ttf -ESRINorth C:/Windows/Fonts/esri_40.ttf -ESRIShields C:/Windows/Fonts/esri_44.ttf -ESRIUSMUTCD1 C:/Windows/Fonts/esri_47.ttf -ESRIUSMUTCD2 C:/Windows/Fonts/esri_48.ttf -ESRIUSMUTCD3 C:/Windows/Fonts/esri_49.ttf -ESRIOilGasWater C:/Windows/Fonts/esri_4.ttf -ESRIGeologyAGSO1 C:/Windows/Fonts/esri_500.ttf -ESRIWeather C:/Windows/Fonts/esri_5.ttf -ESRIUSForestry1 C:/Windows/Fonts/esri_651.ttf -ESRIUSForestry2 C:/Windows/Fonts/esri_652.ttf -ESRIConservation C:/Windows/Fonts/esri_730.ttf -ESRIGeology C:/Windows/Fonts/esri_7.ttf -ESRIEnviroHazardIncident C:/Windows/Fonts/esri_800.ttf -ESRIEnviroHazardAnalysis C:/Windows/Fonts/esri_801.ttf -ESRIEnviroHazardSites C:/Windows/Fonts/esri_802.ttf -ESRIHazardousMaterials C:/Windows/Fonts/esri_803.ttf -ESRIFireIncidentNFPA C:/Windows/Fonts/esri_804.ttf -ESRIERSInfrastructuresS1 C:/Windows/Fonts/esri_832.ttf -ESRIERSOperationsS1 C:/Windows/Fonts/esri_837.ttf -ESRICrimeAnalysis C:/Windows/Fonts/esri_8.ttf -ESRITransportationCivic C:/Windows/Fonts/esri_9.ttf