[MXD2map-commits] r324:5e7e6d99f997
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Mon Oct 15 11:02:06 CEST 2012
details: http://hg.intevation.org/geospatial/mxd2map/rev/5e7e6d99f997
changeset: 324:5e7e6d99f997
user: Andre Heinecke <aheinecke at intevation.de>
date: Mon Oct 15 09:02:01 2012 +0000
description:
Make mapserver install location version independent
* src/java/de/intevation/mxd/writer/MapScriptWriter.java,
mxd/connections/SDE/sde_areas.txt,
contrib/installer/bin/ms_6.1-dev/Readme.txt,
contrib/installer/bin/MXD2map-Shell.bat,
INSTALL.txt HowTo-Release.txt: Make mapserver install location
version independent s/ms-6.1-dev/mapserver/g
diffstat:
ChangeLog | 9 +++++
HowTo-Release.txt | 2 +-
INSTALL.txt | 22 +++++++-------
contrib/installer/bin/MXD2map-Shell.bat | 14 ++++----
contrib/installer/bin/mapserver/Readme.txt | 28 ++++++++++++++++++
contrib/installer/bin/ms_6.1-dev/Readme.txt | 28 ------------------
contrib/installer/example/RunExample.bat | 14 ++++----
mxd/connections/SDE/sde_areas.txt | 2 +-
src/java/de/intevation/mxd/writer/MapScriptWriter.java | 2 +-
9 files changed, 65 insertions(+), 56 deletions(-)
diffs (240 lines):
diff -r 4051c39757db -r 5e7e6d99f997 ChangeLog
--- a/ChangeLog Fri Oct 12 16:26:30 2012 +0200
+++ b/ChangeLog Mon Oct 15 09:02:01 2012 +0000
@@ -1,3 +1,12 @@
+2011-10-15 Andre Heinecke <aheinecke at intevation.de>
+
+ * src/java/de/intevation/mxd/writer/MapScriptWriter.java,
+ mxd/connections/SDE/sde_areas.txt,
+ contrib/installer/bin/ms_6.1-dev/Readme.txt,
+ contrib/installer/bin/MXD2map-Shell.bat,
+ INSTALL.txt HowTo-Release.txt: Make mapserver install location
+ version independent s/ms-6.1-dev/mapserver/g
+
2011-10-12 Andre Heinecke <aheinecke at intevation.de>
* doku/source/conf.py, contrib/installer/MXD2map-installer.nsi:
diff -r 4051c39757db -r 5e7e6d99f997 HowTo-Release.txt
--- a/HowTo-Release.txt Fri Oct 12 16:26:30 2012 +0200
+++ b/HowTo-Release.txt Mon Oct 15 09:02:01 2012 +0000
@@ -28,7 +28,7 @@
Copy resulting mxd2map.jar into contrib/installer/bin/
-4.1.2 Fill ms_6.1-dev-Folder with Binary-windows-build
+4.1.2 Fill mapserver-Folder with Binary-windows-build
4.1.3 Download example-data
diff -r 4051c39757db -r 5e7e6d99f997 INSTALL.txt
--- a/INSTALL.txt Fri Oct 12 16:26:30 2012 +0200
+++ b/INSTALL.txt Mon Oct 15 09:02:01 2012 +0000
@@ -53,12 +53,12 @@
It is recommended to use the latest binary release version from http://www.gisinternals.com/sdk/
as the MapServer for MXD2Map.
-1. Unzip the MapServer ZIP-file at ``c:\ms_6.1-dev``
+1. Unzip the MapServer ZIP-file at ``c:\mapserver``
#. Modify the Apache configuration (e.g. ``c:\Program Files\Apache Software Foundation\Apache2.2\conf\httpd.conf``)
by adding::
- ScriptAlias /cgi-bin/ "C:/ms_6.1-dev/bin/"
+ ScriptAlias /cgi-bin/ "C:/mapserver/bin/"
<Location "/cgi-bin">
Options None
@@ -66,20 +66,20 @@
Allow from all
</Location>
- SetEnv PROJ_LIB "c:/ms_6.1-dev/bin/proj/SHARE"
- SetEnv PATH "c:/ms_6.1-dev/bin"
- SetEnv PATH "c:/ms_6.1-dev/bin/gdal/python/osgeo"
+ SetEnv PROJ_LIB "c:/mapserver/bin/proj/SHARE"
+ SetEnv PATH "c:/mapserver/bin"
+ SetEnv PATH "c:/mapserver/bin/gdal/python/osgeo"
# set GDAL_DATA environment variable to location of supporting gdal files
- SetEnv GDAL_DATA "c:/ms_6.1-dev/bin/gdaldata"
+ SetEnv GDAL_DATA "c:/mapserver/bin/gdaldata"
# set GDAL_DRIVER_PATH environment variable for gdal plugins
- SetEnv GDAL_DRIVER_PATH "c:/ms_6.1-dev/bin/gdal/plugins"
+ SetEnv GDAL_DRIVER_PATH "c:/mapserver/bin/gdal/plugins"
-#. Copy mapserv.exe from ``c:\ms_6.1-dev\bin\ms\apps`` to ``c:\ms_6.1-dev\bin\``
+#. Copy mapserv.exe from ``c:\mapserver\bin\ms\apps`` to ``c:\mapserver\bin\``
-#. Optional: Add additional Libraries (DLL's) to ``c:\ms_6.1-dev\bin`` for Oracle, SDE etc.
+#. Optional: Add additional Libraries (DLL's) to ``c:\mapserver\bin`` for Oracle, SDE etc.
Install the Converter
------------
@@ -103,7 +103,7 @@
#. Remove the version numbers of the jar file names in lib, or adopt the build.xml accordingly!
-#. Copy mapscript.jar and mapscript.dll from your MapServer Installation (e.g. ``c:\ms_6.1-dev\bin\ms\java``) to ``c:\mxd2map\lib\``
+#. Copy mapscript.jar and mapscript.dll from your MapServer Installation (e.g. ``c:\mapserver\bin\ms\java``) to ``c:\mxd2map\lib\``
#. Copy the converter.properties.sample file to ``c:\mxd2map\converter.properties`` and edit it
according to your needs.
@@ -136,7 +136,7 @@
rem Set the following Path variables according to your installation:
set MXD2MAP_PATH=c:\mxd2map
- set MAPSERVER_PATH=c:\ms_6.1-dev
+ set MAPSERVER_PATH=c:\mapserver
set ARCGISSDK_PATH=c:\Program Files\ArcGIS\DeveloperKit10.0
set ARCGISENGINE_PATH=c:\Program Files\ArcGIS\Engine10.0
diff -r 4051c39757db -r 5e7e6d99f997 contrib/installer/bin/MXD2map-Shell.bat
--- a/contrib/installer/bin/MXD2map-Shell.bat Fri Oct 12 16:26:30 2012 +0200
+++ b/contrib/installer/bin/MXD2map-Shell.bat Mon Oct 15 09:02:01 2012 +0000
@@ -21,19 +21,19 @@
: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
+if not exist %CD%\mapserver\bin\gdal\plugins-optional mkdir %CD%\mapserver\bin\gdal\plugins-optional
+if exist %CD%\mapserver\bin\gdal\plugins\ogr_OCI.dll move %CD%\mapserver\bin\gdal\plugins\ogr_OCI.dll %CD%\mapserver\bin\gdal\plugins-optional\ogr_OCI.dll
+if exist %CD%\mapserver\bin\gdal\plugins\gdal_GEOR.dll move %CD%\mapserver\bin\gdal\plugins\gdal_GEOR.dll %CD%\mapserver\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 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%\mapserver\bin;%CD%\mapserver\bin\gdal\python\osgeo;%CD%\mapserver\bin\proj\apps;%CD%\mapserver\bin\gdal\apps;%CD%\mapserver\bin\ms\apps;%CD%\mapserver\bin\gdal\csharp;%CD%\mapserver\bin\ms\csharp;%CD%\mapserver\bin\curl;%CD%\mapserver\bin\ms\java;%PATH%
+SET GDAL_DATA=%CD%\mapserver\bin\gdal-data
+SET GDAL_DRIVER_PATH=%CD%\mapserver\bin\gdal\plugins
+SET PYTHONPATH=%CD%\mapserver\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
diff -r 4051c39757db -r 5e7e6d99f997 contrib/installer/bin/mapserver/Readme.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/installer/bin/mapserver/Readme.txt Mon Oct 15 09:02:01 2012 +0000
@@ -0,0 +1,28 @@
+Download the installation package for MapServer from
+
+http://gisinternals.com/sdk/
+
+and unpack the binaries.
+
+The following structure is expected for the MXD2map converter:
+
+mapserver
+|-- bin
+| |-- curl
+| |-- gdal
+| | |-- apps
+| | |-- plugins
+| | `-- plugins-optional
+| |-- gdal-data
+| |-- ms
+| | |-- apps
+| | |-- java
+| | `-- plugins
+| | |-- mssql2008
+| | |-- oci
+| | `-- sde
+| `-- proj
+| |-- apps
+| `-- SHARE
+`-- doc
+
diff -r 4051c39757db -r 5e7e6d99f997 contrib/installer/bin/ms_6.1-dev/Readme.txt
--- a/contrib/installer/bin/ms_6.1-dev/Readme.txt Fri Oct 12 16:26:30 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-Download the installation package for MapServer from
-
-http://gisinternals.com/sdk/
-
-and unpack the binaries.
-
-The following structure is expected for the MXD2map converter:
-
-ms_6.1-dev
-|-- bin
-| |-- curl
-| |-- gdal
-| | |-- apps
-| | |-- plugins
-| | `-- plugins-optional
-| |-- gdal-data
-| |-- ms
-| | |-- apps
-| | |-- java
-| | `-- plugins
-| | |-- mssql2008
-| | |-- oci
-| | `-- sde
-| `-- proj
-| |-- apps
-| `-- SHARE
-`-- doc
-
diff -r 4051c39757db -r 5e7e6d99f997 contrib/installer/example/RunExample.bat
--- a/contrib/installer/example/RunExample.bat Fri Oct 12 16:26:30 2012 +0200
+++ b/contrib/installer/example/RunExample.bat Mon Oct 15 09:02:01 2012 +0000
@@ -21,19 +21,19 @@
: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
+if not exist %CD%\mapserver\bin\gdal\plugins-optional mkdir %CD%\mapserver\bin\gdal\plugins-optional
+if exist %CD%\mapserver\bin\gdal\plugins\ogr_OCI.dll move %CD%\mapserver\bin\gdal\plugins\ogr_OCI.dll %CD%\mapserver\bin\gdal\plugins-optional\ogr_OCI.dll
+if exist %CD%\mapserver\bin\gdal\plugins\gdal_GEOR.dll move %CD%\mapserver\bin\gdal\plugins\gdal_GEOR.dll %CD%\mapserver\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 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%\mapserver\bin;%CD%\mapserver\bin\gdal\python\osgeo;%CD%\mapserver\bin\proj\apps;%CD%\mapserver\bin\gdal\apps;%CD%\mapserver\bin\ms\apps;%CD%\mapserver\bin\gdal\csharp;%CD%\mapserver\bin\ms\csharp;%CD%\mapserver\bin\curl;%CD%\mapserver\bin\ms\java;%PATH%
+SET GDAL_DATA=%CD%\mapserver\bin\gdal-data
+SET GDAL_DRIVER_PATH=%CD%\mapserver\bin\gdal\plugins
+SET PYTHONPATH=%CD%\mapserver\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
diff -r 4051c39757db -r 5e7e6d99f997 mxd/connections/SDE/sde_areas.txt
--- a/mxd/connections/SDE/sde_areas.txt Fri Oct 12 16:26:30 2012 +0200
+++ b/mxd/connections/SDE/sde_areas.txt Mon Oct 15 09:02:01 2012 +0000
@@ -5,7 +5,7 @@
...
CONNECTIONTYPE PLUGIN
CONNECTION "hostname,port:xxx,database,username,password"
- PLUGIN "C:/ms_6.1-dev/bin/msplugin_sde_93.dll"
+ PLUGIN "C:/mapserver/bin/msplugin_sde_93.dll"
DATA "layername,geometrycolumn,SDE.DEFAULT"
...
END # layer
diff -r 4051c39757db -r 5e7e6d99f997 src/java/de/intevation/mxd/writer/MapScriptWriter.java
--- a/src/java/de/intevation/mxd/writer/MapScriptWriter.java Fri Oct 12 16:26:30 2012 +0200
+++ b/src/java/de/intevation/mxd/writer/MapScriptWriter.java Mon Oct 15 09:02:01 2012 +0000
@@ -73,7 +73,7 @@
private mapObj map;
private MapScriptUtils msutils;
private String mapFilename;
- private String MS_BINDIR = "c:/ms_6.1-dev/bin";
+ private String MS_BINDIR = "c:/mapserver/bin";
private String prefix = "";
private MS_UNITS units = MS_UNITS.MS_METERS;
More information about the MXD2map-commits
mailing list