You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2006/10/24 22:49:31 UTC
svn commit: r467476 - in /lucene/lucy/trunk/charmonizer: charmonize.c
src/Charmonizer.charm src/Charmonizer.harm
src/Charmonizer/Core/ModHandler.charm
Author: marvin
Date: Tue Oct 24 13:49:30 2006
New Revision: 467476
URL: http://svn.apache.org/viewvc?view=rev&rev=467476
Log:
Change the init routine back, so the conf_fh isn't needed. Print os name to
_charm_test.h when the user requests it.
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.charm
Modified: lucene/lucy/trunk/charmonizer/charmonize.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/charmonize.c?view=diff&rev=467476&r1=467475&r2=467476
==============================================================================
--- lucene/lucy/trunk/charmonizer/charmonize.c (original)
+++ lucene/lucy/trunk/charmonizer/charmonize.c Tue Oct 24 13:49:30 2006
@@ -84,7 +84,7 @@
start_conf_file(conf_fh);
/* set up Charmonizer */
- chaz_init(conf_fh, os_name, cc_command, cc_flags);
+ chaz_init(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=467476&r1=467475&r2=467476
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer.charm Tue Oct 24 13:49:30 2006
@@ -10,8 +10,7 @@
#include "Charmonizer/Core/OperSys.h"
void
-chaz_init(FILE *conf_fh, const char *osname, const char *cc_command,
- const char *cc_flags)
+chaz_init(const char *osname, const char *cc_command, const char *cc_flags)
{
/* create os and compiler objects */
os = OS_new(osname);
@@ -23,9 +22,6 @@
/* dispatch other tasks */
chaz_ModHand_init();
-
- /* record the name of the OS -- private, for now */
- fprintf(conf_fh, "#define CHAZ_OS_NAME \"%s\"\n\n", osname);
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=467476&r1=467475&r2=467476
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer.harm Tue Oct 24 13:49:30 2006
@@ -7,8 +7,7 @@
* else.
*/
void
-chaz_init(FILE *conf_fh, const char *os_name, const char *cc_command,
- const char *cc_flags);
+chaz_init(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.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.charm?view=diff&rev=467476&r1=467475&r2=467476
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.charm Tue Oct 24 13:49:30 2006
@@ -219,6 +219,7 @@
die("Couldn't open '_charm_test.h': %s", strerror(errno));
fprintf(charm_test_h_fh, "#define %sUSE_SHORT_NAMES\n", constant_prefix);
+ fprintf(charm_test_h_fh, "#define CHAZ_OS_NAME \"%s\"\n", os->name);
want_charm_test_h = true;
}