Changeset 281

Timestamp:

Mar 30, 2007, 10:31:57 PM (18 years ago)

Author:

cinc

Message:

Some minor changes for the new IDL compiler

Location:

trunk/nom

Files:

• Makefile (modified) (2 diffs)
• idl/nomclassmanager.idl (modified) (3 diffs)
• idl/nomcls.idl (modified) (1 diff)
• idl/nomobj.idl (modified) (1 diff)
• include/nom.h (modified) (2 diffs)
• src/nomdebug.c (modified) (1 diff)

trunk/nom/Makefile

@@ -22 +22 @@
 
 GCLIB           =       ./../../../o/gc.a
+
+# NOM IDL compiler
+NOMIDLINC       =
+#       -I$(FOUNDATIONPATH)/idl -I$(TKIDLDIR) \
+#               -I$(GUITKPATH)/idl
+
+NOMIDLCOMPILER  =       $(BINDIR)/nom-idl-compiler.exe 
 
 ADDLIBS         =
@@ -84 +91 @@
 BASE_SCCOMPILEH         =       sc -I $(IDLDIR) -p -r -sh -d$(CLASSINC) -maddstar -mnoint -S128000 -C128000  $< && $(FIXLINKAGEH)
 
-BASE_NOMCOMPILEH        =       $(IDLCOMP) --showcpperrors --header --output-dir=$(CLASSINC) $<
-BASE_NOMCOMPILEIH       =       $(IDLCOMP) --showcpperrors --ihfile --output-dir=$(CLASSINC) $<
+#BASE_NOMCOMPILEH       =       $(IDLCOMP) --showcpperrors --header --output-dir=$(CLASSINC) $<
+#BASE_NOMCOMPILEIH      =       $(IDLCOMP) --showcpperrors --ihfile --output-dir=$(CLASSINC) $<
 BASE_NOMCOMPILEC        =       $(IDLCOMP) --showcpperrors --c-template --output-dir=$(CLASSTEMPLATEDIR) $< 
  
+BASE_NOMCOMPILEH        =       gcc -E -x c -D__NOM_IDL_COMPILER__ $(NOMIDLINC) $< | $(NOMIDLCOMPILER) --emit-h -d $(CLASSINC) -
+BASE_NOMCOMPILEIH       =       gcc -E -x c -D__NOM_IDL_COMPILER__ $(NOMIDLINC) $< | $(NOMIDLCOMPILER) --emit-ih -d $(CLASSINC) -
+
 
 $(OBJDIR)/%.o:  $(CLASSCDIR)/%.c $(NOMINCLUDES)

trunk/nom/idl/nomclassmanager.idl

@@ -40 +40 @@
 #define nomcm_idl
 
-#include <nomobj.idl>
+#include "nomobj.idl"
 
 /** \interface NOMClassMgr
@@ -51 +51 @@
 interface NOMClassMgr : NOMObject
 {
-
+#ifdef __NOM_IDL_COMPILER__
+  filestem=nomclassmanager;
+#endif
   NOMCLASSVERSION(1, 0 );
 
@@ -69 +71 @@
      The class with the given name or NULL if not found.
    */
-  Object nomFindClassFromId(in long classId, 
+  PNOMObject nomFindClassFromId(in long classId, 
                             in long ulMajorVersion, 
                             in long ulMinorVersion);

trunk/nom/idl/nomcls.idl

@@ -50 +50 @@
 interface NOMClass:NOMObject
 {
+#ifdef __NOM_IDL_COMPILER__
+  filestem=nomcls;
+#endif
 
   NOMCLASSVERSION(1, 0 );

trunk/nom/idl/nomobj.idl

@@ -53 +53 @@
 interface NOMObject
 {
+#ifdef __NOM_IDL_COMPILER__
+  filestem=nomobj;
+#endif
 
   NOMCLASSVERSION(1, 0 );

trunk/nom/include/nom.h

@@ -98 +98 @@
 typedef char*     CORBA_string;
 
+//typedef gboolean    boolean;
+
 #if 0
 #if !defined(ORBIT_DECL_CORBA_Object) && !defined(_CORBA_Object_defined)
@@ -121 +123 @@
 #ifndef NOM_BOOLEAN
   #define NOM_BOOLEAN
-  typedef unsigned char boolean;  
+  typedef gboolean boolean;  
 #endif /* NOM_BOOLEAN */
 

trunk/nom/src/nomdebug.c

@@ -109 +109 @@
   if(!fInitialized)
     return TRUE;
-
-  //if(strstr( chrMethodName, "nomIsObj"))
-  //return TRUE;
 
   if(ev && (ev->fFlags & NOMENV_FLG_DONT_CHECK_OBJECT))