Ticket #315 (closed enhancement: fixed)

Opened 2 years ago

Last modified 2 years ago

Separate include directory from source

Reported by: mloskot Owned by: mloskot
Priority: major Milestone: 3.3.0
Component: Build/Install Version: svn-trunk
Severity: Unassigned Keywords: trunk,layout,directories
Cc: gary.crawford@…, dale@…, konstantin.baumann@…

Description (last modified by mloskot) (diff)

Long time ago, I  proposed to modify GEOS source tree layout and separate headers from source. In that time, Sandro  did second this idea.

The C API would stay where it is now.

The proposal is as follows:

  1. trunk/source/headers/geos moves to trunk/include/geos
  2. when headers moved, trunk/source moves to trunk/src

I'm willing to apply new structure and apply update to all supported build configurations.

Do I have green light?

Change History

Changed 2 years ago by mloskot

  • owner changed from pramsey to mloskot
  • status changed from new to assigned

Changed 2 years ago by mloskot

  • description modified (diff)

Changed 2 years ago by mloskot

  • description modified (diff)

Changed 2 years ago by pramsey

+1

Changed 2 years ago by hobu

+1

Also, src instead of source

Changed 2 years ago by mloskot

Hobu, yes, it is src

Changed 2 years ago by mloskot

  • cc gary.crawford@…, dal@… added

I've taken the liberty to add Gary and Dale to CC to assure they are notified.

Sandro, I assume you still agree on this change.

I'm slowly starting to implement this idea.

Changed 2 years ago by mloskot

  • cc dale@… added; dal@… removed

Changed 2 years ago by Kosta

  • cc konstantin.baumann@… added

Changed 2 years ago by mloskot

Changed 2 years ago by mloskot

  • Updated Makefile.am files in headers subtree after moved to new location in include (r2839)

Changed 2 years ago by mloskot

  • Updated new source structure in configure.in and root Makefile.am (r2840)

Changed 2 years ago by mloskot

  • Updated new source structure in configure.in and root Makefile.am - part 2 (r2841)

Changed 2 years ago by mloskot

  • Updated Makefile.am files in src subtree after moved to new location (r2842)

Changed 2 years ago by mloskot

  • Updated Makefile.am files in capi subtree after moved to new location (r2843)

Changed 2 years ago by mloskot

  • Updated remaining directories doc, macros, tools, tests, swig, capi with new src and include location. Fixed previous updates. Successfull build on Linux. (r2844)

Changed 2 years ago by mloskot

  • Updated makefile.vc, nmake.opt, src/makefile.vc files with new location of include and src (r2845)

Summary:

  • Build based on autotools is updated and should work well
  • Build based on NMAKE makefiles is updated and should work well as well
  • Visual Studio projects in build directory have not been updated, yet

Changed 2 years ago by mloskot

  • Updated Visual Studio 2008 projects in build/msvc90 with new location of include and src (r2846)

Changed 2 years ago by mloskot

  • Updated Visual Studio 2005 projects in build/msvc80 with new location of include and src (r2847)

Changed 2 years ago by mloskot

  • Successfully compiled with Visual C++ 8.0 after restructuring source tree (r2848)
  • Successfully compiled with Visual C++ 9.0

Changed 2 years ago by mloskot

  • Updated Visual Studio 2010 projects in build/msvc10 with new location of include and src (r2849)

Changed 2 years ago by mloskot

  • status changed from assigned to closed
  • resolution set to fixed

The migration to new structure completed.

Successfully built and tested using:

  • GCC 4.4.1 (Linux)
  • Visual C++ 8.0 on Windows XP Pro 32-bit
  • Visual C++ 9.0 on Windows Vista 64-bit (target 32-bit)
  • Visual C++ 10.0 on Windows 7 64-bit (target 32-bit)

Please, report here and reopen if anything is not working.

Changed 2 years ago by mloskot

One more small update:

  • Moved src/examples out of src directory (r2850)
Note: See TracTickets for help on using tickets.