Changeset 277 for trunk/idl-compiler/c/nom-idl-compiler.c

Timestamp:

Mar 27, 2007, 7:58:40 PM (18 years ago)

Author:

cinc

Message:

IDL compiler: improved outfile handling.

File:

• trunk/idl-compiler/c/nom-idl-compiler.c (modified) (8 diffs)

trunk/idl-compiler/c/nom-idl-compiler.c

@@ -55 +55 @@
 
 static gchar* chrOutputDir="";
-static gchar* chrOutputName="";
 static gboolean fOptionEmitH=FALSE;
 static gboolean fOptionEmitIH=FALSE;
@@ -67 +66 @@
   {"emit-ih", 0, 0, G_OPTION_ARG_NONE, &fOptionEmitIH, "Emmit an include header (*.ih)", NULL},
   {"emit-c", 0, 0, G_OPTION_ARG_NONE, &fOptionEmitC, "Emmit an implementation template (*.c)", NULL},
-  {"output", 'o', 0, G_OPTION_ARG_FILENAME, &chrOutputName, "Output name. Must not be omitted.", NULL},
   {NULL}
 };
@@ -480 +478 @@
   helpCmd[0]=chrExeName;
 
-  g_printf("An output filename must always be specified. If the name is an absolute path\n\
-it will be used unmodified. Otherwise the output name is built from the given\n\
-name and the directory specification.\n\n\
+  g_printf("The output filename is specified in the IDL file using the 'filestem' keyword.\n\
 -If no directory is specified the output name is built from the current directory\n\
  path and the given filename.\n\
@@ -533 +529 @@
   /* Vars for filename building */
   char* chrOutputFileName="";
-  char* chrTemp;
 
   GError *gError = NULL;
@@ -565 +560 @@
   }
 
-  if(strlen(chrOutputName)==0)
-    {
-      g_printf("No output file name given.\n\n");
-      outputCompilerHelp(gContext, argv[0]);
-    }
   g_option_context_free(gContext);
 
@@ -585 +575 @@
 
   
-  /*** Create output file name ****/
-  if(!g_path_is_absolute(chrOutputName))
-    {
-      if(g_path_is_absolute(chrOutputDir))
-        chrOutputFileName=g_build_filename(chrOutputDir, chrOutputName, NULL);
-      else
-        {
-          /* Yes this is a memory leak but I don't care */
-          chrOutputFileName=g_build_filename(g_get_current_dir(), chrOutputDir, chrOutputName, NULL);
-        }
-    }
+  /*** Create output path name ****/
+  if(g_path_is_absolute(chrOutputDir))
+    chrOutputFileName=chrOutputDir;
   else
-    chrOutputFileName=chrOutputName;
-
-  /* Add emitter extension */
-  if(fOptionEmitH)
-    chrTemp=g_strconcat(chrOutputFileName, ".h", NULL);
-  else if(fOptionEmitIH)
-    chrTemp=g_strconcat(chrOutputFileName, ".ih", NULL);
-  else if(fOptionEmitC)
-    chrTemp=g_strconcat(chrOutputFileName, ".c", NULL);
-  g_free(chrOutputFileName);
-  chrOutputFileName=chrTemp;
-
-  g_message("Output file: %s", chrOutputFileName);
+    {
+      /* Yes this is a memory leak but I don't care */
+      chrOutputFileName=g_build_filename(g_get_current_dir(), chrOutputDir, NULL);
+    }
+
+  g_message("Output path: %s", chrOutputFileName);
+  parseInfo.chrOutfilePath=chrOutputFileName;
 
   /* Open input */
@@ -622 +598 @@
       exit(1);
     }
-  
-  /* Open output */
-  parseInfo.outFile=fopen(chrOutputFileName, "w");
 
   g_printf("\n");
@@ -663 +636 @@
 
 #if 0
-  else if(fOptionEmitIH)
-
   else if(fOptionEmitC)
     a++;