cvs diff -c (in directory C:\software\pyGlobus\)
? build
? globus-makefile-header.py
? src/ftpClient_wrap.c
? src/ftpControl_wrap.c
? src/gassCache_wrap.c
? src/gassCopy_wrap.c
? src/gassServerEZ_wrap.c
? src/gassTransfer_wrap.c
? src/gramClient_wrap.c
? src/gsi_wrap.c
? src/io_wrap.c
? src/util_wrap.c
? test/FTPgetResult
cvs server: Diffing .
Index: setup.py
===================================================================
RCS file: /home/portnoy/u5/repository/pyGlobus/setup.py,v
retrieving revision 1.86
diff -c -r1.86 setup.py
*** setup.py	27 Feb 2004 16:58:57 -0000	1.86
--- setup.py	5 Mar 2004 21:59:48 -0000
***************
*** 75,85 ****
  
  # Globus-2.2 requires GPT_LOCATION be set before running
  # globus-makefile-header
! try:
!     environ["GPT_LOCATION"]
! except KeyError:
!     print "GPT_LOCATION must be set before installing pyGlobus"
!     sys.exit(-1)
      
  # parse special command line options and remove them
  # this way distutils won't attempt to parse them.
--- 75,88 ----
  
  # Globus-2.2 requires GPT_LOCATION be set before running
  # globus-makefile-header
! 
! # But not on windows, because there is no GPT on windows, d'oh
! if sys.platform != 'win32':
!     try:
!         environ["GPT_LOCATION"]
!     except KeyError:
!         print "GPT_LOCATION must be set before installing pyGlobus"
!         sys.exit(-1)
      
  # parse special command line options and remove them
  # this way distutils won't attempt to parse them.
***************
*** 158,172 ****
          MODULE_LIST = mList
          sys.argv.remove(arg)
          
! 
  
  #Find globus-makefile-header. If unable to find it, exit
! if isfile("%s/sbin/globus-makefile-header" % GLOBUS_LOCATION):
!     MAKEFILE_HEADER = "%s/sbin/globus-makefile-header -flavor=%s" % (GLOBUS_LOCATION, FLAVOR)
! elif isfile("%s/bin/globus-makefile-header" % GLOBUS_LOCATION):
!     MAKEFILE_HEADER = "%s/bin/globus-makefile-header -flavor=%s" % (GLOBUS_LOCATION, FLAVOR)
! else:
!     print "Unable to locate globus-makefile-header in either $GLOBUS_LOCATION/[bin,sbin]. This must be found before installing pyGlobus."
      sys.exit(-2)
      
  errRegEx = r".*ERROR.*|\s*No packages were found.*"
--- 161,184 ----
          MODULE_LIST = mList
          sys.argv.remove(arg)
          
! gmh_path_list = [os.path.join("%s", "sbin", "globus-makefile-header"),
!                  os.path.join("%s", "sbin", "globus-makefile-header.py"),
!                  os.path.join("%s", "bin", "globus-makefile-header"),
!                  os.path.join("%s", "bin", "globus-makefile-header.py"),
!                  "globus-makefile-header.py"]
  
  #Find globus-makefile-header. If unable to find it, exit
! MAKEFILE_HEADER = None
! for gmhp in gmh_path_list:
!     if gmhp.startswith("%"):
!         tp = gmhp % GLOBUS_LOCATION
!     else:
!         tp = gmhp
!     if isfile(tp):
!         MAKEFILE_HEADER = "%s -flavor=%s" % (tp, FLAVOR)
! 
! if MAKEFILE_HEADER == None:
!     print "Unable to locate globus-makefile-header or globus-makefile-header.py in either $GLOBUS_LOCATION/[bin,sbin]. This must be found before installing pyGlobus."
      sys.exit(-2)
      
  errRegEx = r".*ERROR.*|\s*No packages were found.*"
***************
*** 221,236 ****
  
  
  def check_util(pyModList, eModList, swigList):
!     print "Checking the util module"
      dep = "globus_common"
      try:
          libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
      except DependencyException, ex:
!         print "Missing dependency to build the util package."
!         print "This package is required to build all of pyGlobus."
!         print "The following is the error message from globus-makefile-header."
!         print ex.args
!         print "Now exiting from the build."
          sys.exit(-1)
      e = Extension("utilc", ["src/util_wrap.c"], include_dirs=incList,
                    library_dirs=ldFlagsList, extra_compile_args=cFlagsList,
--- 233,250 ----
  
  
  def check_util(pyModList, eModList, swigList):
!     print "Checking the util module...",
      dep = "globus_common"
      try:
          libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
+         print "yes"
      except DependencyException, ex:
!         print "no"
!         #print "Missing dependency to build the util package."
!         #print "This package is required to build all of pyGlobus."
!         #print "The following is the error message from globus-makefile-header."
!         #print ex.args
!         #print "Now exiting from the build."
          sys.exit(-1)
      e = Extension("utilc", ["src/util_wrap.c"], include_dirs=incList,
                    library_dirs=ldFlagsList, extra_compile_args=cFlagsList,
***************
*** 243,261 ****
      pyModList.append("pyGlobus.test.test_pyGlobus")
      pyModList.append("pyGlobus.test.config") 
      BUILT_LIST.append("util")
!     print "The util module will be built"
      return
  
  def check_rlsClient(pyModList, eModList, swigList):
!     print "Checking the rlsClient module"
      dep = "globus_rls_client"
      try:
!         libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep) 
      except DependencyException, ex:
!         print "Missing dependency to build the rlsClient package."
!         print "Will skip this package"
!         print "The following error from globus-makefile-header lists the missing dependencies."
!         print ex.args
          FAILED_LIST.append("rlsClient")
          return
      e = Extension("rlsClientc", ["src/rlsClient_wrap.c"], include_dirs=incList,
--- 257,277 ----
      pyModList.append("pyGlobus.test.test_pyGlobus")
      pyModList.append("pyGlobus.test.config") 
      BUILT_LIST.append("util")
!     #print "The util module will be built"
      return
  
  def check_rlsClient(pyModList, eModList, swigList):
!     print "Checking the rlsClient module...",
      dep = "globus_rls_client"
      try:
!         libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
!         print "yes"
      except DependencyException, ex:
!         print "no"
!         #print "Missing dependency to build the rlsClient package."
!         #print "Will skip this package"
!         #print "The following error from globus-makefile-header lists the missing dependencies."
!         #print ex.args
          FAILED_LIST.append("rlsClient")
          return
      e = Extension("rlsClientc", ["src/rlsClient_wrap.c"], include_dirs=incList,
***************
*** 267,285 ****
      pyModList.append("pyGlobus.test.test_RlsClient")
      pyModList.append("pyGlobus.test.test_rlsClient")
      BUILT_LIST.append("rlsClient")
!     print "The rlsClient module will be built"
      return
  
  def check_myProxy(pyModList, eModList, swigList):
!     print "Checking the myProxy module"
      dep = "myproxy"
      try:
!         libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep) 
      except DependencyException, ex:
!         print "Missing dependency to build the myProxy package."
!         print "Will skip this package"
!         print "The following error from globus-makefile-header lists the missing dependencies."
!         print ex.args
          FAILED_LIST.append("myProxy")
          return
      e = Extension("myProxyc", ["src/myProxy_wrap.c"], include_dirs=incList,
--- 283,303 ----
      pyModList.append("pyGlobus.test.test_RlsClient")
      pyModList.append("pyGlobus.test.test_rlsClient")
      BUILT_LIST.append("rlsClient")
!     #print "The rlsClient module will be built"
      return
  
  def check_myProxy(pyModList, eModList, swigList):
!     print "Checking the myProxy module...",
      dep = "myproxy"
      try:
!         libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
!         print "yes"
      except DependencyException, ex:
!         print "no"
!         #print "Missing dependency to build the myProxy package."
!         #print "Will skip this package"
!         #print "The following error from globus-makefile-header lists the missing dependencies."
!         #print ex.args
          FAILED_LIST.append("myProxy")
          return
      e = Extension("myProxyc", ["src/myProxy_wrap.c"], include_dirs=incList,
***************
*** 290,308 ****
      pyModList.append("pyGlobus.myProxy")
      pyModList.append("pyGlobus.test.testMyProxy") 
      BUILT_LIST.append("myProxy")
!     print "The myProxy module will be built"
      return
  
  def check_ftpClient(pyModList, eModList, swigList):
!     print "Checking the ftpClient module"
      dep = "globus_ftp_client"
      try:
!         libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep) 
      except DependencyException, ex:
!         print "Missing dependency to build the ftpClient package."
!         print "Will skip this package"
!         print "The following error from globus-makefile-header lists the missing dependencies."
!         print ex.args
          FAILED_LIST.append("ftpClient")
          return
      e = Extension("ftpClientc", ["src/ftpClient_wrap.c"], include_dirs=incList,
--- 308,328 ----
      pyModList.append("pyGlobus.myProxy")
      pyModList.append("pyGlobus.test.testMyProxy") 
      BUILT_LIST.append("myProxy")
!     #print "The myProxy module will be built"
      return
  
  def check_ftpClient(pyModList, eModList, swigList):
!     print "Checking the ftpClient module...",
      dep = "globus_ftp_client"
      try:
!         libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
!         print "yes"
      except DependencyException, ex:
!         print "no"
!         #print "Missing dependency to build the ftpClient package."
!         #print "Will skip this package"
!         #print "The following error from globus-makefile-header lists the missing dependencies."
!         #print ex.args
          FAILED_LIST.append("ftpClient")
          return
      e = Extension("ftpClientc", ["src/ftpClient_wrap.c"], include_dirs=incList,
***************
*** 319,337 ****
      pyModList.append("pyGlobus.test.test_EasyFtpClient")
      pyModList.append("pyGlobus.test.test_FtpClientPlugin")
      BUILT_LIST.append("ftpClient")
!     print "The ftpClient module will be built"
      return
  
  def check_ftpControl(pyModList, eModList, swigList):
!     print "Checking the ftpControl module"
      dep = "globus_ftp_control"
      try:
          libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
      except DependencyException, ex:
!         print "Missing dependency to build the ftpControl package."
!         print "Will skip this package"
!         print "The following error from globus-makefile-header lists the missing dependencies."
!         print ex.args
          FAILED_LIST.append("ftpControl")
          return
       
--- 339,359 ----
      pyModList.append("pyGlobus.test.test_EasyFtpClient")
      pyModList.append("pyGlobus.test.test_FtpClientPlugin")
      BUILT_LIST.append("ftpClient")
!     #print "The ftpClient module will be built"
      return
  
  def check_ftpControl(pyModList, eModList, swigList):
!     print "Checking the ftpControl module...",
      dep = "globus_ftp_control"
      try:
          libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
+         print "yes"
      except DependencyException, ex:
!         print "no"
!         #print "Missing dependency to build the ftpControl package."
!         #print "Will skip this package"
!         #print "The following error from globus-makefile-header lists the missing dependencies."
!         #print ex.args
          FAILED_LIST.append("ftpControl")
          return
       
***************
*** 344,363 ****
      pyModList.append("pyGlobus.test.test_FtpControl")
      pyModList.append("pyGlobus.test.test_ftpControl")
      BUILT_LIST.append("ftpControl")
!     print "The ftpControl module will be built"
      return
  
  def check_gassCache(pyModList, eModList, swigList):
!     print "Checking the gassCache module"
      dep = "globus_gass_cache"
      try:
          libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
!        
      except DependencyException, ex:
!         print "Missing dependency to build the gassCache package."
!         print "Will skip this package"
!         print "The following error from globus-makefile-header lists the missing dependencies."
!         print ex.args
          FAILED_LIST.append("gassCache")
          return
      e = Extension("gassCachec", ["src/gassCache_wrap.c"], include_dirs=incList,
--- 366,386 ----
      pyModList.append("pyGlobus.test.test_FtpControl")
      pyModList.append("pyGlobus.test.test_ftpControl")
      BUILT_LIST.append("ftpControl")
!     #print "The ftpControl module will be built"
      return
  
  def check_gassCache(pyModList, eModList, swigList):
!     print "Checking the gassCache module...",
      dep = "globus_gass_cache"
      try:
          libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
!         print "yes"
      except DependencyException, ex:
!         print "no"
!         #print "Missing dependency to build the gassCache package."
!         #print "Will skip this package"
!         #print "The following error from globus-makefile-header lists the missing dependencies."
!         #print ex.args
          FAILED_LIST.append("gassCache")
          return
      e = Extension("gassCachec", ["src/gassCache_wrap.c"], include_dirs=incList,
***************
*** 369,387 ****
      pyModList.append("pyGlobus.test.test_GassCache")
      pyModList.append("pyGlobus.test.test_gassCache")
      BUILT_LIST.append("gassCache")
!     print "The gassCache module will be built"
      return
  
  def check_gassCopy(pyModList, eModList, swigList):
!     print "Checking the gassCopy module"
      dep = "globus_gass_copy"
      try:
          libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
      except DependencyException, ex:
!         print "Missing dependency to build the gassCopy package."
!         print "Will skip this package"
!         print "The following error from globus-makefile-header lists the missing dependencies."
!         print ex.args
          FAILED_LIST.append("gassCopy")
          return
      e = Extension("gassCopyc", ["src/gassCopy_wrap.c"], include_dirs=incList,
--- 392,412 ----
      pyModList.append("pyGlobus.test.test_GassCache")
      pyModList.append("pyGlobus.test.test_gassCache")
      BUILT_LIST.append("gassCache")
!     #print "The gassCache module will be built"
      return
  
  def check_gassCopy(pyModList, eModList, swigList):
!     print "Checking the gassCopy module...",
      dep = "globus_gass_copy"
      try:
          libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
+         print "yes"
      except DependencyException, ex:
!         print "no"
!         #print "Missing dependency to build the gassCopy package."
!         #print "Will skip this package"
!         #print "The following error from globus-makefile-header lists the missing dependencies."
!         #print ex.args
          FAILED_LIST.append("gassCopy")
          return
      e = Extension("gassCopyc", ["src/gassCopy_wrap.c"], include_dirs=incList,
***************
*** 393,412 ****
      pyModList.append("pyGlobus.test.test_GassCopy")
      pyModList.append("pyGlobus.test.test_gassCopy")
      BUILT_LIST.append("gassCopy")
!     print "The gassCopy module will be built"
      return
  
  
  def check_gassServerEZ(pyModList, eModList, swigList):
!     print "Checking the gassServerEZ module"
      dep = "globus_gass_server_ez"
      try:
          libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
      except DependencyException, ex:
!         print "Missing dependency to build the gassServerEZ package."
!         print "Will skip this package"
!         print "The following error from globus-makefile-header lists the missing dependencies."
!         print ex.args
          FAILED_LIST.append("gassServerEZ")
          return
      e = Extension("gassServerEZc", ["src/gassServerEZ_wrap.c"], include_dirs=incList,
--- 418,439 ----
      pyModList.append("pyGlobus.test.test_GassCopy")
      pyModList.append("pyGlobus.test.test_gassCopy")
      BUILT_LIST.append("gassCopy")
!     #print "The gassCopy module will be built"
      return
  
  
  def check_gassServerEZ(pyModList, eModList, swigList):
!     print "Checking the gassServerEZ module...",
      dep = "globus_gass_server_ez"
      try:
          libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
+         print "yes"
      except DependencyException, ex:
!         print "no"
!         #print "Missing dependency to build the gassServerEZ package."
!         #print "Will skip this package"
!         #print "The following error from globus-makefile-header lists the missing dependencies."
!         #print ex.args
          FAILED_LIST.append("gassServerEZ")
          return
      e = Extension("gassServerEZc", ["src/gassServerEZ_wrap.c"], include_dirs=incList,
***************
*** 418,436 ****
      pyModList.append("pyGlobus.test.test_GassServerEZ")
      pyModList.append("pyGlobus.test.test_gassServerEZ")
      BUILT_LIST.append("gassServerEZ")
!     print "The gassServerEZ module will be built"
      return
  
  def check_gassTransfer(pyModList, eModList, swigList):
!     print "Checking the gassTransfer module"
      dep = "globus_gass_transfer"
      try:
          libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
      except DependencyException, ex:
!         print "Missing dependency to build the gassTransfer package."
!         print "Will skip this package"
!         print "The following error from globus-makefile-header lists the missing dependencies."
!         print ex.args
          FAILED_LIST.append("gassTransfer")
          return
      e = Extension("gassTransferc", ["src/gassTransfer_wrap.c"], include_dirs=incList,
--- 445,465 ----
      pyModList.append("pyGlobus.test.test_GassServerEZ")
      pyModList.append("pyGlobus.test.test_gassServerEZ")
      BUILT_LIST.append("gassServerEZ")
!     #print "The gassServerEZ module will be built"
      return
  
  def check_gassTransfer(pyModList, eModList, swigList):
!     print "Checking the gassTransfer module...",
      dep = "globus_gass_transfer"
      try:
          libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
+         print "yes"
      except DependencyException, ex:
!         print "no"
!         #print "Missing dependency to build the gassTransfer package."
!         #print "Will skip this package"
!         #print "The following error from globus-makefile-header lists the missing dependencies."
!         #print ex.args
          FAILED_LIST.append("gassTransfer")
          return
      e = Extension("gassTransferc", ["src/gassTransfer_wrap.c"], include_dirs=incList,
***************
*** 442,460 ****
      pyModList.append("pyGlobus.test.test_GassTransfer")
      pyModList.append("pyGlobus.test.test_gassTransfer")
      BUILT_LIST.append("gassTransfer")
!     print "The gassTransfer module will be built"
      return
  
  def check_gramClient(pyModList, eModList, swigList):
!     print "Checking the gramClient module"
      dep = "globus_gram_client"
      try:
          libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
      except DependencyException, ex:
!         print "Missing dependency to build the gramClient package."
!         print "Will skip this package"
!         print "The following error from globus-makefile-header lists the missing dependencies."
!         print ex.args
          FAILED_LIST.append("gramClient")
          return
      e = Extension("gramClientc", ["src/gramClient_wrap.c"], include_dirs=incList,
--- 471,491 ----
      pyModList.append("pyGlobus.test.test_GassTransfer")
      pyModList.append("pyGlobus.test.test_gassTransfer")
      BUILT_LIST.append("gassTransfer")
!     #print "The gassTransfer module will be built"
      return
  
  def check_gramClient(pyModList, eModList, swigList):
!     print "Checking the gramClient module...",
      dep = "globus_gram_client"
      try:
          libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
+         print "yes"
      except DependencyException, ex:
!         print "no"
!         #print "Missing dependency to build the gramClient package."
!         #print "Will skip this package"
!         #print "The following error from globus-makefile-header lists the missing dependencies."
!         #print ex.args
          FAILED_LIST.append("gramClient")
          return
      e = Extension("gramClientc", ["src/gramClient_wrap.c"], include_dirs=incList,
***************
*** 467,485 ****
      pyModList.append("pyGlobus.test.test_GramClient")
      pyModList.append("pyGlobus.test.test_gramClient") 
      BUILT_LIST.append("gramClient")
!     print "The gramClient module will be built"
      return
  
  def check_io(pyModList, eModList, swigList):
!     print "Checking the io module"
      dep = "globus_io"
      try:
          libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
      except DependencyException, ex:
!         print "Missing dependency to build the io package."
!         print "Will skip this package"
!         print "The following error from globus-makefile-header lists the missing dependencies."
!         print ex.args
          FAILED_LIST.append("io")
          return
      e = Extension("ioc", ["src/io_wrap.c"], include_dirs=incList,
--- 498,518 ----
      pyModList.append("pyGlobus.test.test_GramClient")
      pyModList.append("pyGlobus.test.test_gramClient") 
      BUILT_LIST.append("gramClient")
!     #print "The gramClient module will be built"
      return
  
  def check_io(pyModList, eModList, swigList):
!     print "Checking the io module...",
      dep = "globus_io"
      try:
          libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
+         print "yes"
      except DependencyException, ex:
!         print "no"
!         #print "Missing dependency to build the io package."
!         #print "Will skip this package"
!         #print "The following error from globus-makefile-header lists the missing dependencies."
!         #print ex.args
          FAILED_LIST.append("io")
          return
      e = Extension("ioc", ["src/io_wrap.c"], include_dirs=incList,
***************
*** 499,517 ****
      pyModList.append("pyGlobus.test.testTcpClient")
      pyModList.append("pyGlobus.test.testTcpServer") 
      BUILT_LIST.append("io")
!     print "The io module will be built"
      return
  
  def check_security(pyModList, eModList, swigList):
!     print "Checking the security module"
      dep = "globus_gss_assist"
      try:
          libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
      except DependencyException, ex:
!         print "Missing dependency to build the security package."
!         print "Will skip this package"
!         print "The following error from globus-makefile-header lists the missing dependencies."
!         print ex.args
          FAILED_LIST.append("security")
          return
      
--- 532,552 ----
      pyModList.append("pyGlobus.test.testTcpClient")
      pyModList.append("pyGlobus.test.testTcpServer") 
      BUILT_LIST.append("io")
!     #print "The io module will be built"
      return
  
  def check_security(pyModList, eModList, swigList):
!     print "Checking the security module...",
      dep = "globus_gss_assist"
      try:
          libList, incList, cFlagsList, ldFlagsList = get_makefile_output(dep)
+         print "yes"
      except DependencyException, ex:
!         print "no"
!         #print "Missing dependency to build the security package."
!         #print "Will skip this package"
!         #print "The following error from globus-makefile-header lists the missing dependencies."
!         #print ex.args
          FAILED_LIST.append("security")
          return
      
***************
*** 529,535 ****
      pyModList.append("pyGlobus.test.testGridProxyInit")
      pyModList.append("pyGlobus.test.test_SecurityFunctions")
      BUILT_LIST.append("security")
!     print "The security module will be built"
      return
  
  
--- 564,570 ----
      pyModList.append("pyGlobus.test.testGridProxyInit")
      pyModList.append("pyGlobus.test.test_SecurityFunctions")
      BUILT_LIST.append("security")
!     #print "The security module will be built"
      return
  
  
***************
*** 553,559 ****
              raise ex
          [libList, incList, cFlagsList, ldFlagsList] = picklein
          return libList, incList, cFlagsList, ldFlagsList
!     
      inStrm, outStrm = popen4("%s %s" % (MAKEFILE_HEADER, dep))
      for line in outStrm.readlines():
          m = ERR_PATTERN.match(line)
--- 588,594 ----
              raise ex
          [libList, incList, cFlagsList, ldFlagsList] = picklein
          return libList, incList, cFlagsList, ldFlagsList
! 
      inStrm, outStrm = popen4("%s %s" % (MAKEFILE_HEADER, dep))
      for line in outStrm.readlines():
          m = ERR_PATTERN.match(line)
***************
*** 669,675 ****
      flist = glob.glob('pyGlobus/tmp/*.py')
      try:
          flist.remove(glob.glob('pyGlobus/gasscache.py')) 
-         print flist
      except: print 'problem removing gasscache preformatted file'
      runstr.extend(flist)
      spawn(runstr,verbose=1)
--- 704,709 ----
***************
*** 709,718 ****
  #Remove flags from the compile line that through lots
  # of warnings.
  cv = get_config_vars()
! opts = cv["OPT"]
! opts = opts.replace("-Wall", "")
! opts = opts.replace("-Wstrict-prototypes", "")
! cv["OPT"] = opts
  
  if sys.platform[:6] == 'darwin':
      ld = cv['LDSHARED']
--- 743,756 ----
  #Remove flags from the compile line that through lots
  # of warnings.
  cv = get_config_vars()
! try:
!     opts = cv["OPT"]
!     opts = opts.replace("-Wall", "")
!     opts = opts.replace("-Wstrict-prototypes", "")
!     cv["OPT"] = opts
! except:
!     print "No OPT environment variable set."
!     pass
  
  if sys.platform[:6] == 'darwin':
      ld = cv['LDSHARED']
cvs server: Diffing examples
cvs server: Diffing pyGlobus
cvs server: Diffing pyGlobus/test
cvs server: Diffing pyGlobusApps
cvs server: Diffing pyGlobusApps/ftpClientGui
cvs server: Diffing pyGlobusApps/ftpClientGui/doc
cvs server: Diffing pyGlobusApps/ftpClientGui/images
cvs server: Diffing scripts
cvs server: Diffing src
Index: src/gsi.i
===================================================================
RCS file: /home/portnoy/u5/repository/pyGlobus/src/gsi.i,v
retrieving revision 1.36
diff -c -r1.36 gsi.i
*** src/gsi.i	2 Feb 2004 19:17:24 -0000	1.36
--- src/gsi.i	5 Mar 2004 21:59:48 -0000
***************
*** 7,12 ****
--- 7,15 ----
  ###########################################################################*/
  %module gsic
  %{
+ #undef SIZEOF_OFF_T
+ #undef HAVE_LIMITS_H
+ #undef socklen_t
  #include "globus_common.h"
  #include "globus_gss_assist.h"
  #include "gssapi.h"
Index: src/io.i
===================================================================
RCS file: /home/portnoy/u5/repository/pyGlobus/src/io.i,v
retrieving revision 1.10
diff -c -r1.10 io.i
*** src/io.i	4 Mar 2004 23:43:59 -0000	1.10
--- src/io.i	5 Mar 2004 21:59:49 -0000
***************
*** 7,12 ****
--- 7,15 ----
  ###########################################################################*/
  %module ioc
  %{
+ #undef SIZEOF_OFF_T
+ #undef HAVE_LIMITS_H
+ #undef socklen_t
  #include "globus_common.h"
  #include "globus_io.h"
  #include "pyGlobus-threading.h"
***************
*** 476,481 ****
--- 479,485 ----
   
  PyObject*
  attr_set_udp_restrict_port(globus_io_attr_t* attr, globus_bool_t restrct) {
+ #ifndef WIN32
      globus_result_t ret;
      PyObject* tuple;
      char* tmpstr;
***************
*** 500,509 ****
--- 504,520 ----
          PyTuple_SET_ITEM(tuple, 1, Py_None);
      }
      return tuple; 
+ #else
+     /* This isn't available on Win32. */ 
+     PyErr_SetString(PyExc_NotImplementedError, 
+ 	"io_attr_get_udp_restrict_port not implemented on Windows"); 
+     return NULL; 
+ #endif
  }
  
  PyObject*
  attr_get_udp_restrict_port(globus_io_attr_t* attr, globus_bool_t* boolRet) {
+ #ifndef WIN32
      globus_result_t ret;
      PyObject* list;
      char* tmpstr;
***************
*** 523,532 ****
--- 534,550 ----
          PyList_Append(list, Py_None);
      }
      return list;
+ #else
+     /* This isn't available on Win32. */ 
+     PyErr_SetString(PyExc_NotImplementedError, 
+ 	"io_attr_get_udp_restrict_port not implemented on Windows"); 
+     return NULL; 
+ #endif
  }
  
  PyObject*
  attr_set_udp_multicast_loop(globus_io_attr_t* attr, globus_bool_t enable) {
+ #ifndef WIN32
      globus_result_t ret;
      PyObject* tuple;
      char* tmpstr;
***************
*** 551,560 ****
--- 569,585 ----
          PyTuple_SET_ITEM(tuple, 1, Py_None);
      }
      return tuple; 
+ #else
+     /* This isn't available on Win32. */ 
+     PyErr_SetString(PyExc_NotImplementedError, 
+ 	"io_attr_set_udp_multicast not implemented on Windows"); 
+     return NULL; 
+ #endif
  }
  
  PyObject*
  attr_get_udp_multicast_loop(globus_io_attr_t* attr, globus_bool_t* boolRet) {
+ #ifndef WIN32
      globus_result_t ret;
      PyObject* list;
      char* tmpstr;
***************
*** 574,579 ****
--- 599,610 ----
          PyList_Append(list, Py_None);
      }
      return list;
+ #else
+     /* This isn't available on Win32. */ 
+     PyErr_SetString(PyExc_NotImplementedError, 
+ 	"io_attr_get_udp_multicast not implemented on Windows"); 
+     return NULL; 
+ #endif
  }
  
  PyObject*
***************
*** 606,611 ****
--- 637,643 ----
  
  PyObject*
  udpattr_init() {
+ #ifndef WIN32
      globus_result_t ret;
      PyObject* tuple, *ptr;
      char* tmpstr;
***************
*** 632,641 ****
--- 664,680 ----
          PyTuple_SET_ITEM(tuple, 1, ptr);
      }
      return tuple;
+ #else
+     /* This isn't available on Win32. */ 
+     PyErr_SetString(PyExc_NotImplementedError, 
+ 	"udpattr_init not implemented on Windows"); 
+     return NULL; 
+ #endif
  }
  
  PyObject*
  udpattr_destroy(globus_io_attr_t* attr) {
+ #ifndef WIN32
      globus_result_t ret;
      PyObject* tuple;
      char* tmpstr;
***************
*** 660,666 ****
--- 699,712 ----
      }
      globus_libc_free(attr);
      return tuple;
+ #else
+     /* This isn't available on Win32. */ 
+     PyErr_SetString(PyExc_NotImplementedError, 
+ 	"udpattr_destroy not implemented on Windows"); 
+     return NULL; 
+ #endif
  }
+ 
  
  PyObject*
  attr_set_socket_reuseaddr(globus_io_attr_t* attr, globus_bool_t reuse) {
Index: src/pyGlobus-threading.h
===================================================================
RCS file: /home/portnoy/u5/repository/pyGlobus/src/pyGlobus-threading.h,v
retrieving revision 1.2
diff -c -r1.2 pyGlobus-threading.h
*** src/pyGlobus-threading.h	7 Feb 2004 23:47:11 -0000	1.2
--- src/pyGlobus-threading.h	5 Mar 2004 21:59:49 -0000
***************
*** 7,14 ****
  ###########################################################################*/
  #include "globus_common.h"
  
  #define pyGlobus_dprintf(format, ...) fprintf (stderr, format, ## __VA_ARGS__)
! 
  static void python_thread_state_destroy_cb(void *val);
  
  static void init_globus_thread_state_key(globus_thread_key_t *python_thread_state_key)
--- 7,17 ----
  ###########################################################################*/
  #include "globus_common.h"
  
+ #ifdef WIN32
+ #define pyGlobus_dprintf printf
+ #else
  #define pyGlobus_dprintf(format, ...) fprintf (stderr, format, ## __VA_ARGS__)
! #endif
  static void python_thread_state_destroy_cb(void *val);
  
  static void init_globus_thread_state_key(globus_thread_key_t *python_thread_state_key)
Index: src/util.i
===================================================================
RCS file: /home/portnoy/u5/repository/pyGlobus/src/util.i,v
retrieving revision 1.3
diff -c -r1.3 util.i
*** src/util.i	13 Jan 2004 22:16:34 -0000	1.3
--- src/util.i	5 Mar 2004 21:59:49 -0000
***************
*** 7,12 ****
--- 7,15 ----
  ###########################################################################*/
  %module utilc
  %{
+ #undef SIZEOF_OFF_T
+ #undef HAVE_LIMITS_H
+ #undef socklen_t
  #include "globus_common.h"
  #include "globus_module.h"
  #include "globus_time.h"
cvs server: Diffing test
Index: test/test_pyGlobus.py
===================================================================
RCS file: /home/portnoy/u5/repository/pyGlobus/test/test_pyGlobus.py,v
retrieving revision 1.10
diff -c -r1.10 test_pyGlobus.py
*** test/test_pyGlobus.py	9 Oct 2003 22:17:16 -0000	1.10
--- test/test_pyGlobus.py	5 Mar 2004 21:59:49 -0000
***************
*** 6,20 ****
  #All rights reserved. 
  ###########################################################################
  import unittest, ConfigParser
! from pyGlobus.test import test_gramClient
! from pyGlobus.test import test_gassServerEZ
  from pyGlobus.test import test_util
  from pyGlobus.test import test_security
! from pyGlobus.test import test_ftpClient
! from pyGlobus.test import test_ftpControl
! from pyGlobus.test import test_gassCopy
! from pyGlobus.test import test_gassCache
! from pyGlobus.test import test_gassTransfer
  from pyGlobus.test import test_io 
  
  TESTRLS = 1
--- 6,20 ----
  #All rights reserved. 
  ###########################################################################
  import unittest, ConfigParser
! from pyGlobus.test import test_GramClient
! from pyGlobus.test import test_GassServerEZ
  from pyGlobus.test import test_util
  from pyGlobus.test import test_security
! from pyGlobus.test import test_FtpClient
! from pyGlobus.test import test_FtpControl
! from pyGlobus.test import test_GassCopy
! #from pyGlobus.test import test_GassCache
! from pyGlobus.test import test_GassTransfer
  from pyGlobus.test import test_io 
  
  TESTRLS = 1
***************
*** 25,38 ****
  def makeTestSuite():
      suite = unittest.TestSuite()
      suite.addTest(test_util.makeTestSuite())
!     suite.addTest(test_ftpControl.makeTestSuite())
!     suite.addTest(test_gramClient.makeTestSuite())
!     suite.addTest(test_gassServerEZ.makeTestSuite())
      suite.addTest(test_security.makeTestSuite())
!     suite.addTest(test_ftpClient.makeTestSuite())
!     suite.addTest(test_gassCopy.makeTestSuite())
!     suite.addTest(test_gassCache.makeTestSuite())
!     suite.addTest(test_gassTransfer.makeTestSuite())
      suite.addTest(test_io.makeTestSuite()) 
      if TESTRLS:
          suite.addTest(test_rlsClient.makeTestSuite())  
--- 25,38 ----
  def makeTestSuite():
      suite = unittest.TestSuite()
      suite.addTest(test_util.makeTestSuite())
!     suite.addTest(test_FtpControl.makeTestSuite())
!     suite.addTest(test_GramClient.makeTestSuite())
!     suite.addTest(test_GassServerEZ.makeTestSuite())
      suite.addTest(test_security.makeTestSuite())
!     suite.addTest(test_FtpClient.makeTestSuite())
!     suite.addTest(test_GassCopy.makeTestSuite())
! #    suite.addTest(test_GassCache.makeTestSuite())
!     suite.addTest(test_GassTransfer.makeTestSuite())
      suite.addTest(test_io.makeTestSuite()) 
      if TESTRLS:
          suite.addTest(test_rlsClient.makeTestSuite())  
***************
*** 41,54 ****
  def main():
      cp = ConfigParser.ConfigParser()
      cp.read("config.py")
!     test_gramClient.config = cp
!     test_ftpControl.config = cp
!     test_gassServerEZ.config = cp
      test_security.config = cp
!     test_ftpClient.config = cp
!     test_gassCopy.config = cp
!     test_gassCache.config = cp
!     test_gassTransfer.config = cp
      test_io.config = cp 
      if TESTRLS:
          test_rlsClient.config = cp
--- 41,54 ----
  def main():
      cp = ConfigParser.ConfigParser()
      cp.read("config.py")
!     test_GramClient.config = cp
!     test_FtpControl.config = cp
!     test_GassServerEZ.config = cp
      test_security.config = cp
!     test_FtpClient.config = cp
!     test_GassCopy.config = cp
! #    test_GassCache.config = cp
!     test_GassTransfer.config = cp
      test_io.config = cp 
      if TESTRLS:
          test_rlsClient.config = cp

***** CVS exited normally with code 1 *****