Ported the icglue module to carbon.

diff --git a/Mac/Lib/ic.py b/Mac/Lib/ic.py
index 47091c79c6a7124dfc49e9874233acc2c940b41e..57564633b5456b897a4a8a92bffb59ac3e71388b 100644 (file)
--- a/Mac/Lib/ic.py
+++ b/Mac/Lib/ic.py
@@ -162,7 +162,8 @@ class IC:
                        self.ic = ic
                else:
                        self.ic = icglue.ICStart(signature)
-                       self.ic.ICFindConfigFile()
+                       if hasattr(self.ic, 'ICFindConfigFile'):
+                               self.ic.ICFindConfigFile()
                self.h = Res.Resource('')
                        
        def keys(self):

diff --git a/Mac/Modules/icgluemodule.c b/Mac/Modules/icgluemodule.c
index 2189996de8d7d434cc468a7d14e21471a60a0d60..b6174399ca9388d4d835eae74f23de2842c23ea9 100644 (file)
--- a/Mac/Modules/icgluemodule.c
+++ b/Mac/Modules/icgluemodule.c
@@ -69,6 +69,7 @@ staticforward PyTypeObject Icitype;
 
 /* ---------------------------------------------------------------- */
 
+#if !TARGET_API_MAC_CARBON
 static char ici_ICFindConfigFile__doc__[] = 
 "()->None; Find config file in standard places"
 ;
@@ -128,6 +129,7 @@ ici_ICChooseConfig(self, args)
        Py_INCREF(Py_None);
        return Py_None;
 }
+#endif /* !TARGET_API_MAC_CARBON */
 
 
 static char ici_ICChooseNewConfig__doc__[] = 
@@ -458,10 +460,12 @@ ici_ICMapTypeCreator(self, args)
 
 
 static struct PyMethodDef ici_methods[] = {
-       {"ICFindConfigFile",    (PyCFunction)ici_ICFindConfigFile,      METH_VARARGS,   ici_ICFindConfigFile__doc__},
+#if !TARGET_API_MAC_CARBON
+ {"ICFindConfigFile",  (PyCFunction)ici_ICFindConfigFile,      METH_VARARGS,   ici_ICFindConfigFile__doc__},
  {"ICFindUserConfigFile",      (PyCFunction)ici_ICFindUserConfigFile,  METH_VARARGS,   ici_ICFindUserConfigFile__doc__},
  {"ICChooseConfig",    (PyCFunction)ici_ICChooseConfig,        METH_VARARGS,   ici_ICChooseConfig__doc__},
  {"ICChooseNewConfig", (PyCFunction)ici_ICChooseNewConfig,     METH_VARARGS,   ici_ICChooseNewConfig__doc__},
+#endif /* !TARGET_API_MAC_CARBON */
  {"ICGetSeed", (PyCFunction)ici_ICGetSeed,     METH_VARARGS,   ici_ICGetSeed__doc__},
  {"ICBegin",   (PyCFunction)ici_ICBegin,       METH_VARARGS,   ici_ICBegin__doc__},
  {"ICFindPrefHandle",  (PyCFunction)ici_ICFindPrefHandle,      METH_VARARGS,   ici_ICFindPrefHandle__doc__},

diff --git a/Mac/mwerks/mwerks_nscarbon_config.h b/Mac/mwerks/mwerks_nscarbon_config.h
index 5d54e85fbed87fcf505e5a80cde79b3feca0dfd7..6a4307a797a49e3627955baac747ed0214dd65da 100644 (file)
--- a/Mac/mwerks/mwerks_nscarbon_config.h
+++ b/Mac/mwerks/mwerks_nscarbon_config.h
@@ -29,7 +29,7 @@
 /* #define HAVE_DYNAMIC_LOADING                /* Enable dynamically loaded modules */
 #define USE_GDBM               /* Include the gdbm module */
 #define USE_ZLIB               /* Include the zlib module */
-/* #define USE_IC                      /* Include Internet Config module */
+#define USE_IC                 /* Include Internet Config module */
 #define USE_PYEXPAT            /* Include Pyexpat module */
 #define USE_APPEARANCE /* Enable Appearance support */
 #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */

diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py
index af0b85d45b1b5c800c4278eac62c492f700c2211..a6d81591e60a8bb682c803dbf4b0d7b66f07ad16 100644 (file)
--- a/Mac/scripts/fullbuild.py
+++ b/Mac/scripts/fullbuild.py
@@ -249,7 +249,7 @@ I_CARBON_PLUGINS :  (buildmwproject, "CWIE", [
        (":Mac:Build:pyexpat.carbon.mcp", "pyexpat.carbon"),
        (":Mac:Build:calldll.carbon.mcp", "calldll.carbon"),
        (":Mac:Build:gdbm.carbon.mcp", "gdbm.carbon"),
-##     (":Mac:Build:icglue.carbon.mcp", "icglue.carbon"),
+       (":Mac:Build:icglue.carbon.mcp", "icglue.carbon"),
        (":Mac:Build:waste.carbon.mcp", "waste.carbon"),
        (":Mac:Build:zlib.carbon.mcp", "zlib.carbon"),
 ##     (":Mac:Build:_tkinter.mcp", "_tkinter.carbon"),

diff --git a/Mac/scripts/genpluginprojects.py b/Mac/scripts/genpluginprojects.py
index bacdb718d7b3590620d01c3a461d6b942b4dba0b..398677132b96422c464d093ffdc37c8db93d44db 100644 (file)
--- a/Mac/scripts/genpluginprojects.py
+++ b/Mac/scripts/genpluginprojects.py
@@ -174,6 +174,8 @@ def genallprojects(force=0):
        genpluginproject("ppc", "icglue", sources=["icgluemodule.c"], 
                libraries=["ICGlueCFM-PPC.lib"], 
                extradirs=["::::ICProgKit1.4:APIs"])
+       genpluginproject("carbon", "icglue", sources=["icgluemodule.c"], 
+               extradirs=["::::ICProgKit1.4:APIs"])
        genpluginproject("ppc", "macspeech", libraries=["SpeechLib"])
 
 if __name__ == '__main__':