BRL-CAD/stepcode
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prevent make_schema from being created by fedex_plus

Browse Source
This commit is contained in:
Mark Pictor
2011-08-17 18:15:02 -04:00
parent cd3d06d3ad
commit 900d94d5d4
2 changed files with 1 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fedex_plus/classes.h
-1
View File
@@ -61,7 +61,6 @@ typedef struct file_holder {
FILE* lib; /* library file */
FILE* incall; /* include file for collecting all include files */
FILE* initall; /* for registering all entities from all schemas */
FILE* make; /* for indicating schema source files in makefile */
FILE* code;
FILE* init; /* contains function to initialize program
to use schema's entities */
src/fedex_plus/classes_wrapper.cc
+1 -59
View File
@@ -57,8 +57,7 @@ create_builtin_type_defn( FILES * files, char * name ) {
** Returns:
** Description: handles file related tasks that need to be done once
** at the beginning of processing.
** In this case the files make_schema and schema.h are initiated
** Side Effects: prints opening line of make_schema file
** In this case the file schema.h is initiated
** Status: ok 1/15/91
******************************************************************/
@@ -81,13 +80,6 @@ print_file_header( Express express, FILES * files ) {
fclose( corbafile );
}
/* open file to record schema source files in to be used in makefile */
if( ( ( files -> make ) = fopen( "make_schema", "w" ) ) == NULL ) {
printf( "**Error in print_file_header: unable to open file make_schema ** \n" );
}
fprintf( files -> make, "OFILES = schema.o SdaiAll.o compstructs.o" );
/* open file which unifies all schema specific header files
of input Express source */
files -> incall = FILEcreate( "schema.h" );
@@ -170,15 +162,12 @@ print_file_header( Express express, FILES * files ) {
** FILE* file - file on which to print trailer
** Returns:
** Description: handles cleaning up things at end of processing
** Side Effects: closes make_schema file
** Status: ok 1/15/91
******************************************************************/
/*ARGSUSED*/
void
print_file_trailer( Express express, FILES * files ) {
fprintf( files->make, "\n" );
fclose( files->make );
FILEclose( files->incall );
FILEclose( files->initall );
fprintf( files->create, "}\n\n" );
@@ -538,7 +527,6 @@ SCHEMAprint( Schema schema, FILES * files, Express model, void * complexCol,
*incfile,
*schemafile = files->incall,
*schemainit = files->initall,
*makefile = files->make,
*initfile,
*createall = files->create;
Rule r;
@@ -744,19 +732,6 @@ SCHEMAprint( Schema schema, FILES * files, Express model, void * complexCol,
/********** record in files relating to entire input ***********/
/* add source files to list for makefile */
fprintf( makefile, "\\\n\t%s.o ", sufnm );
if( schema->search_id == PROCESSED ) {
/* if this is our last pass through schema */
fprintf( makefile, "\\\n\t%s.init.o ", schnm );
}
/* the following messes things up when it generates the extra select .h and
.cc files. */
/*
fprintf (makefile, "\n#\t%s.init.o \\",schnm);
fprintf (makefile, "\n#\tosdb_%s.o ",schnm);
*/
/* add to schema's include and initialization file */
fprintf( schemafile, "#include <%s.h> \n", sufnm );
if( schema->search_id == PROCESSED ) {
@@ -765,20 +740,6 @@ SCHEMAprint( Schema schema, FILES * files, Express model, void * complexCol,
fprintf( schemainit, "\t %sInit (reg); \n", schnm );
}
/********** make an explicit makefile rule for the schema ***********/
/* replaced by list of source files (above) used with a general rule
in the makefile. the code is here in case it is needed later */
/* fprintf (makefile, " \n%s.o: %s.cc\n", schnm);
// fprintf (makefile, "\techo \"compiling %s.cc\" \n", schnm);
// fprintf (makefile, "\tCC -I$(INCLUDE) -c %s.cc -L$(LIBS)\n", schnm);
// fclose (makefile);
// if ((makefile = fopen ("makefull", "a")) == NULL) {
// printf ("**Error in SCHEMAprint: unable to open file sources ** \n");
// return;
// }
*/
/********** do the schemas ***********/
/* really, create calls for entity constructors */
@@ -867,7 +828,6 @@ EXPRESSPrint( Express express, ComplexCollect & col, FILES * files ) {
FILE * incfile;
FILE * schemafile = files -> incall;
FILE * schemainit = files -> initall;
FILE * makefile = files -> make;
FILE * initfile;
/* new */
Schema schema;
@@ -913,30 +873,12 @@ EXPRESSPrint( Express express, ComplexCollect & col, FILES * files ) {
/********** record in files relating to entire input ***********/
/* add source files to list for makefile */
fprintf( makefile, "\\\n %s.o ", schnm );
fprintf( makefile, "\\\n %s.init.o ", schnm );
/* add to schema's include and initialization file */
fprintf( schemafile, "#include <%s.h>\n\n", schnm );
fprintf( schemafile, "extern void %sInit (Registry & r);\n", schnm );
fprintf( schemainit, "\t extern void %sInit (Registry & r);\n", schnm );
fprintf( schemainit, "\t %sInit (reg);\n", schnm );
/********** make an explicit makefile rule for the schema ***********/
/* replaced by list of source files (above) used with a general rule
in the makefile. the code is here in case it is needed later */
/* fprintf (makefile, " \n%s.o: %s.cc\n", schnm, schnm);
// fprintf (makefile, "\techo \"compiling %s.cc\" \n", schnm);
// fprintf (makefile, "\tCC -I$(INCLUDE) -c %s.cc -L$(LIBS)\n", schnm);
// fclose (makefile);
// if ((makefile = fopen ("makefull", "a")) == NULL) {
// printf ("**Error in SCHEMAprint: unable to open file sources ** \n");
// return;
// }
*/
/********** do all schemas ***********/
DICTdo_init( express->symbol_table, &de );
while( 0 != ( schema = ( Scope )DICTdo( &de ) ) ) {