Merge remote-tracking branch 'origin/develop' into feature/ECC-2038-p…

…aram-limits

.gitignore

@@ -4,21 +4,21 @@ Makefile.in
 config.h.in
 lex.yy.c
 stamp-h1
-src/config.h
-src/grib_api.h.new
-src/grib_api_constants.h.new
-src/eccodes_constants.h.new
-src/grib_errors.c.new
-src/grib_errors.h.new
-src/errors.py.new
+src/eccodes/config.h
+src/eccodes/grib_api.h.new
+src/eccodes/grib_api_constants.h.new
+src/eccodes/eccodes_constants.h.new
+src/eccodes/grib_errors.c.new
+src/eccodes/grib_errors.h.new
+src/eccodes/errors.py.new
 configure
 grib_api.spec
 grib_api.pc
 grib_api_f90.pc
 *.analyzerinfo
 *.snalyzerinfo
 tags
-src/convert_*.sh
+src/eccodes/convert_*.sh
 
 # compiled source #
 ###################
@@ -55,7 +55,7 @@ ehthumbs.db
 Thumbs.db
 .directory
 
-src/tags
+src/eccodes/tags
 
 data/exp/
 

CMakeLists.txt

@@ -415,7 +415,11 @@ endif()
 
 ### export package to other ecbuild packages
 
-set( ECCODES_INCLUDE_DIRS    ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src )
+set( ECCODES_INCLUDE_DIRS
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/eccodes
+  ${CMAKE_CURRENT_BINARY_DIR}/src/eccodes
+)
 set( ECCODES_LIBRARIES       eccodes )
 
 get_directory_property( COMPILE_DEFINITIONS ECCODES_DEFINITIONS )
@@ -469,7 +473,7 @@ add_subdirectory( ifs_samples ) # must come after samples
 ecbuild_dont_pack( FILES .cproject .project )
 ecbuild_dont_pack( DIRS
     experimental deprecated doxygen confluence tests/deprecated tests/tests.ecmwf
-    src/deprecated tools/deprecated ifs_samples/grib1_mlgrib2_ieee32
+    src/eccodes/deprecated tools/deprecated ifs_samples/grib1_mlgrib2_ieee32
     examples/examples.dev examples/extra examples/deprecated bamboo
     fortran/fortranCtypes share/eccodes  .settings )
 #ecbuild_dont_pack( DIRS data/bufr  DONT_PACK_REGEX "*.bufr" )

examples/extra/include.sh

@@ -23,12 +23,12 @@ cd ${examples_dir}
 
 if [ -z "${GRIB_API_INCLUDE}" ]
 then 
-  GRIB_API_INCLUDE=`pwd`/src
+  GRIB_API_INCLUDE=`pwd`/src/eccodes
 fi
 
 if [ -z "${GRIB_API_LIB}" ]
 then 
-  GRIB_API_LIB=`pwd`/src
+  GRIB_API_LIB=`pwd`/src/eccodes
 fi
 
 set -u

memfs.py

@@ -185,7 +185,7 @@ def get_outfile_name(base, count):
 print("MEMFS: Generating output:", opath)
 g = open(opath, "w")
 
-f = open(os.path.join(os.path.dirname(__file__), "src", "memfs.c"))
+f = open(os.path.join(os.path.dirname(__file__), "src", "eccodes", "memfs.c"))
 for line in f.readlines():
     line = line.rstrip()
     if "<MARKER>" in line: