svn commit: r468190 - in /lucene/lucy/trunk/charmonizer: charmonize.c src/Charmonizer.charm src/Charmonizer.harm src/Charmonizer/Core/ModHandler.harm

[ma...@apache.org]

Author: marvin
Date: Thu Oct 26 16:43:58 2006
New Revision: 468190

URL: http://svn.apache.org/viewvc?view=rev&rev=468190
Log:
Integrate HeadCheck and Headers into Charmonizer.  Re-add the conf_fh as an
arg to chaz_init(), because eventually, it will be needed.  Add a missing
short name for ModHand_init().

Modified:
    lucene/lucy/trunk/charmonizer/charmonize.c
    lucene/lucy/trunk/charmonizer/src/Charmonizer.charm
    lucene/lucy/trunk/charmonizer/src/Charmonizer.harm
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm

Modified: lucene/lucy/trunk/charmonizer/charmonize.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/charmonize.c?view=diff&rev=468190&r1=468189&r2=468190
==============================================================================
--- lucene/lucy/trunk/charmonizer/charmonize.c (original)
+++ lucene/lucy/trunk/charmonizer/charmonize.c Thu Oct 26 16:43:58 2006
@@ -8,6 +8,7 @@
 #include <stdarg.h>
 #include "Charmonizer.h"
 #include "Charmonizer/Modules/FuncMacro.h"
+#include "Charmonizer/Modules/Headers.h"
 #include "Charmonizer/Modules/Integers.h"
 #include "Charmonizer/Modules/LargeFiles.h"
 #include "Charmonizer/Modules/UnusedVars.h"
@@ -51,6 +52,7 @@
     FILE *config_fh = init(argc, argv);
 
     /* modules section */
+    chaz_Headers_run(config_fh);
     chaz_FuncMacro_run(config_fh);
     chaz_Integers_run(config_fh);
     chaz_LargeFiles_run(config_fh);
@@ -99,7 +101,7 @@
         const long verbosity = strtol(verbosity_str, NULL, 10);
         chaz_set_verbosity(verbosity);
     }
-    chaz_init(os_name, cc_command, cc_flags);
+    chaz_init(conf_fh, os_name, cc_command, cc_flags);
     chaz_set_prefixes("LUCY_", "Lucy_", "lucy_", "lucy_");
     chaz_write_charm_test_h();
 

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer.charm?view=diff&rev=468190&r1=468189&r2=468190
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer.charm Thu Oct 26 16:43:58 2006
@@ -4,14 +4,18 @@
 #include <stdlib.h>
 #include <string.h>
 #include "Charmonizer.h"
+#include "Charmonizer/Core/HeadCheck.h"
 #include "Charmonizer/Core/ModHandler.h"
 #include "Charmonizer/Core/Util.h"
 #include "Charmonizer/Core/Compiler.h"
 #include "Charmonizer/Core/OperSys.h"
 
 void
-chaz_init(const char *osname, const char *cc_command, const char *cc_flags)
+chaz_init(FILE *conf_fh, const char *osname, const char *cc_command,    
+          const char *cc_flags)
 {
+    (void)conf_fh; /* unused for now */
+
     /* create os and compiler objects */
     os       = OS_new(osname);
     compiler = CC_new(os, cc_command, cc_flags);
@@ -21,7 +25,8 @@
     want_short_names = false;
 
     /* dispatch other tasks */
-    chaz_ModHand_init();
+    ModHand_init();
+    HeadCheck_init();
 
     if (verbosity)
         printf("Initialization complete.\n");

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer.harm?view=diff&rev=468190&r1=468189&r2=468190
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer.harm Thu Oct 26 16:43:58 2006
@@ -2,12 +2,14 @@
 #define H_CHAZ 1
 
 #include <stddef.h>
+#include <stdio.h>
 
 /* Set up the Charmonizer environment.  This should be called before anything
  * else.
  */
 void
-chaz_init(const char *os_name, const char *cc_command, const char *cc_flags);
+chaz_init(FILE *conf_fh, const char *os_name, const char *cc_command, 
+          const char *cc_flags);
 
 /* Clean up the Charmonizer environment -- deleting tempfiles, etc.  This
  * should be called only after everything else finishes.

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm?view=diff&rev=468190&r1=468189&r2=468190
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm Thu Oct 26 16:43:58 2006
@@ -123,6 +123,7 @@
 # define typedef_prefix         chaz_ModHand_typedef_prefix
 # define function_prefix        chaz_ModHand_function_prefix
 # define want_short_names       chaz_ModHand_want_short_names
+# define ModHand_init           chaz_ModHand_init
 # define write_charm_h          chaz_ModHand_write_charm_h
 # define build_charm_run        chaz_ModHand_build_charm_run
 # define Start_Short_Names      Chaz_ModHand_Start_Short_Names