? build
? oldglobus.diff
? src/ftpClient_wrap.c
? src/ftpControl_wrap.c
? src/gassCopy_wrap.c
? src/gassServerEZ_wrap.c
? src/gassTransfer_wrap.c
? src/gramClient_wrap.c
? src/gsi_wrap.c
? src/gss_wrap.c
? src/io_wrap.c
? src/util_wrap.c
Index: setup.py
===================================================================
RCS file: /home/portnoy/u5/repository/pyGlobus/setup.py,v
retrieving revision 1.99
diff -u -r1.99 setup.py
--- setup.py	26 Mar 2004 23:45:28 -0000	1.99
+++ setup.py	13 Apr 2004 18:42:22 -0000
@@ -493,8 +493,12 @@
         return
     #check_version uses GPT, and we don't use GPT with winGlobus
     if  get_platform() == 'win32':
-        major = 4
-        minor = 0
+        if os.path.isdir(os.path.join(GLOBUS_LOCATION, "WinProjects")):
+            major = 3
+            minor = 0
+        else:
+            major = 4
+            minor = 0
     else:
         major, minor = check_version(dep)
         
@@ -612,8 +616,12 @@
                    libraries=libList)
     eModList.append(e2)
     if  get_platform() == 'win32':
-        major = 3
-        minor = 8
+        if os.path.isdir(os.path.join(GLOBUS_LOCATION, "WinProjects")):
+            major = 3
+            minor = 4
+        else:
+            major = 3
+            minor = 8
     else:
         major, minor = check_version(dep)
 
Index: src/ftpClient.i
===================================================================
RCS file: /home/portnoy/u5/repository/pyGlobus/src/ftpClient.i,v
retrieving revision 1.24
diff -u -r1.24 ftpClient.i
--- src/ftpClient.i	12 Apr 2004 21:08:00 -0000	1.24
+++ src/ftpClient.i	13 Apr 2004 18:42:23 -0000
@@ -89,12 +89,12 @@
     TRANSFER,
     ABORT,
     CONNECT,
-    DELETE,
+    PLUGIN_DELETE,
     AUTH,
     READ,
     MOVE,
     LIST,
-    SIZE,
+    PLUGIN_SIZE,
     VERBOSELIST,
     RMDIR,
     MKDIR,
@@ -766,7 +766,7 @@
 
 /*     printf("PythonPluginDelete called\n");  */
 
-    func = PyList_GetItem(pyglobus_plugin->python_function_list, DELETE);
+    func = PyList_GetItem(pyglobus_plugin->python_function_list, PLUGIN_DELETE);
     ptemp = SWIG_NewPointerObj((void*)self, SWIGTYPE_p_globus_ftp_client_plugin_t, 0);
     ptemp1 = SWIG_NewPointerObj((void*)handle, SWIGTYPE_p_globus_ftp_client_handle_t, 0);
     ptemp2 = SWIG_NewPointerObj((void*)attr, SWIGTYPE_p_globus_ftp_client_operationattr_t, 0);
@@ -925,7 +925,7 @@
 
 /*     printf("PythonPluginSize called\n");  */
 
-    func = PyList_GetItem(pyglobus_plugin->python_function_list, SIZE);
+    func = PyList_GetItem(pyglobus_plugin->python_function_list, PLUGIN_SIZE);
     ptemp = SWIG_NewPointerObj((void*)self, SWIGTYPE_p_globus_ftp_client_plugin_t, 0);
     ptemp1 = SWIG_NewPointerObj((void*)handle, SWIGTYPE_p_globus_ftp_client_handle_t, 0);
     ptemp2 = SWIG_NewPointerObj((void*)attr, SWIGTYPE_p_globus_byte_t, 0);