Ticket #519 (new task)

Opened 1 year ago

Last modified 1 year ago

osgeo4w build

Reported by: jef Assigned to: grass-dev@lists.osgeo.org
Priority: major Milestone: 6.4.0
Component: default Version: svn-develbranch6
Keywords: Cc: martinl
Platform: All CPU: All

Description

attached the modifications I did to my GRASS tree to build for OSGeo4W

Attachments

519.diff (14.1 kB) - added by jef on 03/05/09 16:33:05.
mingw_updated.2.diff (3.3 kB) - added by neteler on 03/07/09 09:13:46.
patch reduced to outstanding item
mingw_updated.diff (3.3 kB) - added by neteler on 03/07/09 09:13:48.
patch reduced to outstanding item
mingw_updated3.diff (1.6 kB) - added by neteler on 03/08/09 17:22:07.
patch reduced to outstanding changes

Change History

03/05/09 16:33:05 changed by jef

  • attachment 519.diff added.

03/06/09 16:42:00 changed by neteler

  • platform changed from Unspecified to All.
  • cpu changed from Unspecified to All.

I have merged in the changes from Glynn (mailing list).

Questions: is the NOFILTEROUT=1 stuff needed (see include/Make/Lib.make and lib/gis/Makefile in the path)?

I have taken out in the revised patch: 

Index: lib/g3d/g3dmask.c
===================================================================
--- lib/g3d/g3dmask.c   (revision 36200)
+++ lib/g3d/g3dmask.c   (working copy)
@@ -309,12 +309,12 @@
        for (dy = y; dy < rows; dy++) {
            for (dx = x; dx < cols; dx++) {
                G3D_MASKNUM(map, dx, dy, dz, tile, type);
-               tile += length;
+               (unsigned char *)tile += length;
            }

-           tile += xLength;
+           (unsigned char *)tile += xLength;
        }
-       tile += yLength;
+       (unsigned char *)tile += yLength;
     }
 }

since it doesn't compile on Linux (C++ syntax?).

Please review the mingw_updated.diff patch and suggest for lib/g3d/g3dmask.c.

(follow-up: ↓ 4 ) 03/06/09 17:56:59 changed by martinl

wxGUI-related part of the patch submitted to devbr6 (http://trac.osgeo.org/grass/changeset/36220). The rest in progress...

Martin

03/06/09 17:57:24 changed by martinl

  • cc set to martinl.

(in reply to: ↑ 2 ) 03/07/09 08:24:50 changed by martinl

Replying to martinl:

wxGUI-related part of the patch submitted to devbr6 (http://trac.osgeo.org/grass/changeset/36220). The rest in progress...

Please can someone review unsubmitted part of the patch: 

M      raster/Makefile
M      lib/g3d/g3dcache.c
M      lib/g3d/g3dmask.c
M      lib/gis/spawn.c
M      lib/gis/Makefile
M      lib/gis/gdal.c
M      include/Make/Lib.make
M      include/Make/Shlib.make

I don't feel enough familiar with building system in GRASS.

M.

03/07/09 09:13:46 changed by neteler

  • attachment mingw_updated.2.diff added.

patch reduced to outstanding item

03/07/09 09:13:48 changed by neteler

  • attachment mingw_updated.diff added.

patch reduced to outstanding item

03/07/09 09:15:22 changed by neteler

I have reduced the attached patch to the outstanding items except for the lib/g3d/g3dmask.c

part which is only in the original submission. For that, see comment 1 above.

03/08/09 17:22:07 changed by neteler

  • attachment mingw_updated3.diff added.

patch reduced to outstanding changes

03/08/09 17:23:45 changed by neteler

Patch reduced to outstanding items (with modification for raster/Makefile). Left out lib/g3d/g3dmask.c as unclear how to write it correctly (see first comment here). Please test + comment.

The other issues are in 6.4.0svn and 6.5svn now.