Changeset 239

Timestamp:

Mar 6, 2007, 8:05:58 PM (18 years ago)

Author:

cinc

Message:

Synching before applying WC2007 patches

Location:

trunk

Files:

• gc6.8/mark_rts.c (modified) (1 diff)
• gc6.8/os_dep.c (modified) (1 diff)
• nom/Makefile (modified) (6 diffs)
• nom/class_c/nomclassmanager.c (modified) (2 diffs)
• nom/idl/nomclassmanager.idl (modified) (1 diff)
• nom/make.inc (modified) (2 diffs)

trunk/gc6.8/mark_rts.c

@@ -175 +175 @@
 {
     struct roots * old;
-    
+    printf("----> %s: %x %x \n", __FUNCTION__, b, e);
 #   if defined(MSWIN32) || defined(MSWINCE)
       /* Spend the time to ensure that there are no overlapping */

trunk/gc6.8/os_dep.c

@@ -1160 +1160 @@
       if (flags & OBJINVALID) {
           GC_err_printf0("Object with invalid pages?\n");
+          printf("   ----> %s: %x %x \n", path, O32_BASE(seg), O32_BASE(seg)+O32_SIZE(seg));
           continue;
       } 
+      printf("----> %s: %x %x \n", path, O32_BASE(seg), O32_BASE(seg)+O32_SIZE(seg));
       GC_add_roots_inner(O32_BASE(seg), O32_BASE(seg)+O32_SIZE(seg), FALSE);
     }

trunk/nom/Makefile

@@ -5 +5 @@
 
 GCCINC          =       $(INC) 
-INC             =       ./include -I ./class_h 
+INC             =       ./include -I ./class_h -I $(FOUNDATIONPATH)/class_h -I $(FOUNDATIONPATH)/include
  
-WPSLIBS         =       $(OBJDIR)/cwsomtk.lib
 
 # Define search directories
@@ -13 +12 @@
 CLASSCDIR       =       ./class_c
 CLASSTEMPLATEDIR        =       ./../../../class_templates
-WPSCDIR         =       ./wpsclass_c
+
 CLASSINC        =       ./class_h
-WPSINC          =       ./wps_h
 IDLDIR          =       ./idl
-WPSIDLDIR       =       ./wps_idl
 INCDIR          =       ./include
 OBJDIR          =       ./../../../o
@@ -25 +22 @@
 
 GCLIB           =       ./../../../o/gc.a
+
+ADDLIBS         =       -l$(OBJDIR)/voyfcls
 
 # Define objects to build
@@ -58 +57 @@
 
 
-WPSIHFILES      =       $(CLASSINC)/cwwpobject.ih
-
-.PRECIOUS:      $(CLASSINC)/%.ih $(CLASSCDIR)/%.c $(CDIR)/%.c $(WPSCDIR)/%.c
+.PRECIOUS:      $(CLASSINC)/%.ih $(CLASSCDIR)/%.c $(CDIR)/%.c
 
 .PHONY:         dox
@@ -70 +67 @@
         @echo "[33;1;mLinking "$@"...[0;m"
         cmd.exe /C create_vobjtk_def $(OBJDIR)/nobjtk.def
-        $(CC) $(GCCLDFLAGS)  -o $@ $(OBJECTS) $(LIBS) $(GCLIB) $(OBJDIR)/nobjtk.def
+        $(CC) $(GCCLDFLAGS)  -o $@ $(OBJECTS) $(LIBS) $(ADDLIBS) $(GCLIB) $(OBJDIR)/nobjtk.def
         emximp -o $(OBJDIR)/$(basename $(notdir $@)).a $(OBJDIR)/nobjtk.def
         @echo "[32;1;mDone linking "$@"...[0;m"
 
-$(OBJDIR)/cwwp.dll:      $(WPSIHFILES) $(WPSOBJECTS) cwwp.def
-        @echo "[33;1;mLinking "$@"...[0;m"
-        gcc -o $@ $(GCCLDFLAGS) $(WPSOBJECTS) $(WPSLIBS) cwwp.def
-        implib $(basename $@).lib cwwp.def
-        @echo "[32;1;mDone linking "$@"...[0;m"
 
 ###################################
@@ -101 +93 @@
 $(OBJDIR)/%.o:  $(CDIR)/%.c $(NOMINCLUDES)
         $(CC) -I $(INC) $(GCCFLAGS)  -o$@ $<
-
-# For WPS classes
-$(OBJDIR)/%.obj:        $(WPSCDIR)/%.c $(INCDIR)/nomtk.h
-        gcc -I $(GCCINC) $(GCCFLAGS) -o $@ $<
 
 

trunk/nom/class_c/nomclassmanager.c

@@ -50 +50 @@
 #include "nomclassmanager.ih"
 
+#include "nomfilepath.h"
 
 /**
@@ -255 +256 @@
 }
 
+NOM_Scope CORBA_string NOMLINK impl_NOMClassMgr_nomQueryDLLForClass(NOMClassMgr* nomSelf,
+                                                                    const CORBA_char * chrClassName,
+                                                                    CORBA_Environment *ev)
+{
+/* NOMClassMgrData* nomThis=NOMClassMgrGetData(nomSelf); */
+  NOMPath* thePath;
+
+  if(!chrClassName)
+    return NULL;
+
+  if((thePath=NOMPathNew())==NULLHANDLE)
+    return NULL;
+
+  /* We probably use the home dir later */
+  thePath=NOMPath_assignCString(thePath, g_get_current_dir(), NULL);
+  thePath=NOMPath_appendCString(thePath, "classlist.ini", NULL);
+
+  return NULL;
+}
+
+
 static
 int nomClassMgrCompareFunc(gconstpointer a, gconstpointer b)

trunk/nom/idl/nomclassmanager.idl

@@ -173 +173 @@
 
   /**
+     Query the name of the DLL in which the class can be found. The name can be used to
+     dynamically load the DLL get the class exports and finally create the class.
+
+     \remark The returned path is in the system encoding.
+   */
+  string nomQueryDLLForClass(in string chrClassName);
+  /**
      Override of nomInit(). The list of methods and the list of classes are initialized
      in that method. In addition the balanced binary tree for registering mtabs is created.

trunk/nom/make.inc

@@ -18 +18 @@
 VERSION         =       0_0_1
 VERSION_STRING  =       0.0.1
-AUTHOR_STRING   =       "(C) Chris Wohlgemuth 2003-2006"
+AUTHOR_STRING   =       "(C) Chris Wohlgemuth 2003-2007"
 
 # Put version in environment for REXX skripts
@@ -38 +38 @@
 
 GCPATH          =       L:/svn-sources/nom/trunk/gc6.8
+NOMPATH         =       L:/svn-sources/nom/trunk/nom
+GUITKPATH       =       L:/svn-sources/desktop/trunk/gui
+FOUNDATIONPATH  =       L:/svn-sources/desktop/trunk/foundation
+DESKTOPPATH     =       L:/svn-sources/desktop/trunk/desktop