Changeset 27 for sources/src/global_functions.cc

Timestamp:

May 4, 2009, 8:51:56 PM (15 years ago)

Author:

buchmann

Message:

SystemCASS now uses autoconf/automake to build the API. Regression tests still
use the old Makefiles.
(thanks to Nicolas Pouillon)

The library directory no longer is "lib-arch-system". The directory now is "lib-linux". Everyone needs to pay attention about SYSTEMCASS environment variable.

Changes:

• system header includes
• Add includes to config.h (generated by autoconf/automake)
• test:
  • linux preprocessor macro instead of _WIN32
  • CONFIG_DEBUG instead of DEBUG

Removes:

• Makefile
• guess_endianness.cc
• guess_os.sh
• assert.h (we now use standard assert.h)
• Options.def

File:

• sources/src/global_functions.cc (modified) (3 diffs)

sources/src/global_functions.cc

@@ -35 +35 @@
  */
 
-#include<iostream>
-#include<dlfcn.h>
-#include"schedulers.h" // get_scheduling & run_schedule_editor
-#include"sc_module.h" // check_all_method_process
-#include"gen_code.h"  // gen_scheduling_code_for_dynamic_link & gen_scheduling_code_for_static_func
-#include"sc_clock_ext.h" // clock list
-#include"usage.h"
-#include"module_hierarchy2dot.h"
-#include"assert.h"
+#include <iostream>
+#include <dlfcn.h>
+#include "schedulers.h" // get_scheduling & run_schedule_editor
+#include "sc_module.h" // check_all_method_process
+#include "gen_code.h"  // gen_scheduling_code_for_dynamic_link & gen_scheduling_code_for_static_func
+#include "sc_clock_ext.h" // clock list
+#include "usage.h"
+#include "module_hierarchy2dot.h"
+#include "assert.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef CONFIG_CHECK_FSM_RULES
+#include "fsm_rules.h"
+#endif
 
 using namespace std;
@@ -218 +225 @@
    
   char lib_absolutepath[256]; 
-#if defined(darwin) //macosx)
+#if defined(CONFIG_OS_DARWIN)
   sprintf(lib_absolutepath, "/tmp/%s.so", base_name);
-#elif defined(linux)
+#elif defined(CONFIG_OS_LINUX)
   sprintf(lib_absolutepath, "/tmp/%s.so", base_name);
 #else
@@ -255 +262 @@
   }
   // Init variables to be able to run combinational functions
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
         casc_fsm_step = STIMULI;
 #endif