Restructure file layout

Split lib folder into common, decompress, icu_compress rdcu_compress
Move cmp_tool files into programs directory

INSTALL.md

@@ -45,7 +45,7 @@ cd builddir
 meson compile cmp_tool
 ```
 
-Now you should find the cmp\_tool executable in the folder.
+Now you should find the cmp\_tool executable in the programs folder.
 
 ### Release Build
 
@@ -57,7 +57,7 @@ cd build_relase_dir
 meson compile cmp_tool
 ```
 
-You find the build executable in the `build_relase_dir` directory
+You find the build cmp\_tool executable in the `build_relase_dir/programs` directory.
 
 ### Build for Windows
 

doc/doxygen/meson.build

@@ -37,7 +37,7 @@ if doxygen.found()
   custom_target('doc',
     input : doxy_file,
     output : 'generated_documentation',
-    depend_files : [doxy_file, doc_layout_files, doxygen_awesome_css_files, main, cmplib_sources], # test files are missing
+    depend_files : [doxy_file, doc_layout_files, doxygen_awesome_css_files, cmp_tool_src, common_sources, decompress_sources, icu_compress_sources, rdcu_compress_sources], # test files are missing
     command : [doxygen, '@INPUT@'],
     build_by_default : false,
     console : true,

include/meson.build

-# generate the configuration file
-cdata = configuration_data()
-cdata.set_quoted('PROGRAM_NAME', 'cmp_tool')
-cdata.set_quoted('CMP_TOOL_VERSION', meson.project_version())
-if get_option('argument_input_mode')
-  cdata.set('ARGUMENT_INPUT_MODE', '')
-endif
-
-configure_file(
-  output : 'cmp_tool-config.h',
-  configuration : cdata)
-
-incdir = include_directories('.')

include/cmp_icu.h → lib/cmp_icu.h

@@ -20,7 +20,7 @@
 #ifndef CMP_ICU_H
 #define CMP_ICU_H
 
-#include <cmp_support.h>
+#include "common/cmp_support.h"
 
 #define CMP_PAR_UNUSED 0
 

include/cmp_rdcu.h → lib/cmp_rdcu.h

@@ -20,8 +20,8 @@
 #ifndef CMP_RDCU_H
 #define CMP_RDCU_H
 
-#include <cmp_support.h>
-#include <cmp_rdcu_cfg.h>
+#include "common/cmp_support.h"
+#include "rdcu_compress/cmp_rdcu_cfg.h"
 
 
 /* Compression Error Register bits definition, see RDCU-FRS-FN-0952 */

lib/cmp_data_types.c → lib/common/cmp_data_types.c

@@ -20,12 +20,10 @@
 #include <stdint.h>
 #include <limits.h>
 
-
-#include <cmp_support.h>
-#include <cmp_data_types.h>
-#include <cmp_debug.h>
-#include <byteorder.h>
-
+#include "byteorder.h"
+#include "cmp_debug.h"
+#include "cmp_support.h"
+#include "cmp_data_types.h"
 
 
 /**

include/cmp_data_types.h → lib/common/cmp_data_types.h

@@ -36,8 +36,8 @@
 
 #include <stdint.h>
 
-#include <compiler.h>
-#include <cmp_support.h>
+#include "compiler.h"
+#include "../common/cmp_support.h"
 
 
 /* size of the source data header structure for multi entry packet */

lib/cmp_entity.c → lib/common/cmp_entity.c

@@ -19,8 +19,8 @@
 
 
 #include <stdint.h>
-#include <stdio.h>
 #include <string.h>
+#include <stdio.h>
 
 #ifndef ICU_ASW
 #  if defined __has_include
@@ -33,12 +33,12 @@
 #  endif
 #endif
 
-#include <byteorder.h>
-#include <cmp_debug.h>
-#include <cmp_support.h>
-#include <cmp_data_types.h>
-#include <cmp_entity.h>
-#include <leon_inttypes.h>
+#include "byteorder.h"
+#include "cmp_debug.h"
+#include "cmp_support.h"
+#include "cmp_data_types.h"
+#include "cmp_entity.h"
+#include "leon_inttypes.h"
 
 
 #ifdef HAS_TIME_H
@@ -1725,7 +1725,7 @@ int32_t cmp_ent_get_cmp_data(struct cmp_entity *ent, uint32_t *data_buf,
 		uint32_t cmp_data_len_32;
 
 		if (cmp_size_byte > data_buf_size) {
-			fprintf(stderr, "Error: data_buf size to small to hold the data.\n");
+			debug_print("Error: data_buf size to small to hold the data.\n");
 			return -1;
 		}
 

include/cmp_entity.h → lib/common/cmp_entity.h

@@ -29,8 +29,8 @@
 
 #include <stdint.h>
 
-#include <compiler.h>
-#include <cmp_support.h>
+#include "compiler.h"
+#include "cmp_support.h"
 
 
 #define GENERIC_HEADER_SIZE 32

lib/cmp_max_used_bits.c → lib/common/cmp_max_used_bits.c

@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 
-#include <cmp_data_types.h>
+#include "cmp_data_types.h"
 
 
 #define MAX_USED_NC_IMAGETTE_BITS		16

lib/cmp_support.c → lib/common/cmp_support.c

@@ -17,11 +17,11 @@
  * @see Data Compression User Manual PLATO-UVIE-PL-UM-0001
  */
 
-#include <compiler.h>
+#include "compiler.h"
 
-#include <cmp_support.h>
-#include <cmp_debug.h>
-#include <leon_inttypes.h>
+#include "cmp_support.h"
+#include "cmp_debug.h"
+#include "leon_inttypes.h"
 
 
 /**

include/cmp_support.h → lib/common/cmp_support.h

@@ -22,8 +22,8 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include <cmp_max_used_bits.h>
-#include <cmp_cal_up_model.h>
+#include "cmp_max_used_bits.h"
+#include "cmp_cal_up_model.h"
 
 
 /* return code if the bitstream buffer is too small to store the whole bitstream */

lib/common/meson.build

+common_sources = files([
+  'cmp_data_types.c',
+  'cmp_entity.c',
+  'cmp_max_used_bits.c',
+  'cmp_support.c'
+])