Commits

Lenard Lindstrom committed 8a716cb

disable building of modules altered in fsencoding branch to try and discover where the Mac GCC build error is.

  • Participants
  • Parent commits 9d4e31c

Comments (0)

Files changed (11)

 #everything you can, but you can ignore ones you don't have
 #dependencies for, just comment them out
 
-imageext src/imageext.c $(SDL) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)
-font src/font.c $(SDL) $(FONT) $(DEBUG)
-mixer src/mixer.c $(SDL) $(MIXER) $(DEBUG)
-mixer_music src/music.c $(SDL) $(MIXER) $(DEBUG)
+#imageext src/imageext.c $(SDL) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)
+#font src/font.c $(SDL) $(FONT) $(DEBUG)
+#mixer src/mixer.c $(SDL) $(MIXER) $(DEBUG)
+#mixer_music src/music.c $(SDL) $(MIXER) $(DEBUG)
 _numericsurfarray src/_numericsurfarray.c $(SDL) $(DEBUG)
 _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
-movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
+#movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
 #_movie src/_gsound.c src/_gmovie.c src/_gcommand.c src/gmovie.c $(SDL) $(AVFORMAT) $(SWSCALE) $(MIXER) $(DEBUG)
 scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
 #_camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
 time src/time.c $(SDL) $(DEBUG)
 joystick src/joystick.c $(SDL) $(DEBUG)
 draw src/draw.c $(SDL) $(DEBUG)
-image src/image.c $(SDL) $(DEBUG)
+#image src/image.c $(SDL) $(DEBUG)
 overlay src/overlay.c $(SDL) $(DEBUG)
 transform src/transform.c src/rotozoom.c src/scale2x.c src/scale_mmx.c $(SDL) $(DEBUG) -D_NO_MMX_FOR_X86_64
 mask src/mask.c src/bitmask.c $(SDL) $(DEBUG)

File lib/__init__.py

 except (ImportError,IOError):event=MissingModule("event", geterror(), 1)
 
 try: import pygame.image
-except (ImportError,IOError):image=MissingModule("image", geterror(), 1)
+##except (ImportError,IOError):image=MissingModule("image", geterror(), 1)
+except (ImportError,IOError):image=MissingModule("image", geterror(), 0) # remove when Mac debugging finished.
 
 try: import pygame.joystick
 except (ImportError,IOError):joystick=MissingModule("joystick", geterror(), 1)

File test/base_test.py

 else:
     from test.test_utils import test_not_implemented, unittest
 import pygame
+import sys
 
 init_called = quit_called = 0
 def __PYGAMEinit__(): #called automatically by pygame.init()
     def not_init_assertions(self):
         self.assert_(not pygame.display.get_init(),
                      "display shouldn't be initialized" )
-        self.assert_(not pygame.mixer.get_init(),
-                     "mixer shouldn't be initialized" )
-        self.assert_(not pygame.font.get_init(),
-                     "init shouldn't be initialized" )
+        if 'pygame.mixer' in sys.modules:
+            self.assert_(not pygame.mixer.get_init(),
+                         "mixer shouldn't be initialized" )
+        if 'pygame.font' in sys.modules:
+            self.assert_(not pygame.font.get_init(),
+                         "init shouldn't be initialized" )
 
         ## !!! TODO : Remove when scrap works for OS X
         import platform
 
     def init_assertions(self):
         self.assert_(pygame.display.get_init())
-        self.assert_(pygame.mixer.get_init())
-        self.assert_(pygame.font.get_init())
+        if 'pygame.mixer' in sys.modules:
+            self.assert_(pygame.mixer.get_init())
+        if 'pygame.font' in sys.modules:
+            self.assert_(pygame.font.get_init())
 
     def test_quit__and_init(self):
         # __doc__ (as of 2008-06-25) for pygame.base.quit:

File test/font_tags.py

 __tags__ = []
+__tags__ = ['ignore', 'subprocess_ignore']  #temporary to find Mac build error
 
 import sys
 # Font support not fully implemented for Python 3.x.
 if sys.version_info >= (3, 0, 0) and sys.platform.startswith('Win'):
     __tags__.extend(['ignore', 'subprocess_ignore'])
+

File test/image__save_gl_surface_tags.py

+__tags__ = ['ignore', 'subprocess_ignore']  #temporary to find Mac build error
+

File test/image_tags.py

+__tags__ = []
+
+import pygame
+import sys
+if 'pygame.image' not in sys.modules:
+    __tags__.extend(('ignore', 'subprocess_ignore'))
+

File test/mixer_music_tags.py

+__tags__ = []
+
+import pygame
+import sys
+if 'pygame.mixer_music' not in sys.modules:
+    __tags__.extend(('ignore', 'subprocess_ignore'))
+

File test/mixer_tags.py

+__tags__ = []
+
+import pygame
+import sys
+if 'pygame.mixer' not in sys.modules:
+    __tags__.extend(('ignore', 'subprocess_ignore'))
+

File test/movie_tags.py

 __tags__ = []
 
 import pygame
-try:
-    pygame.movie._NOT_IMPLEMENTED_
-except AttributeError:
-    pass
-else:
+import pygame
+import sys
+if 'pygame.movie' not in sys.modules:
     __tags__.extend(('ignore', 'subprocess_ignore'))
+

File test/scrap_test.py

          import test_not_implemented, trunk_relative_path, unittest
 import pygame
 from pygame import scrap
+import sys
 
 class ScrapModuleTest(unittest.TestCase):
     not_initialized = True
         self.assertEquals (scrap.get (pygame.SCRAP_TEXT), "Another String")
 
     def test_scrap_put_image (self):
+        if 'pygame.image' not in sys.modules:
+            return
         sf = pygame.image.load (
             trunk_relative_path("examples/data/asprite.bmp")
         )

File test/sndarray_tags.py

 exclude = False
 
 try:
+    import pygame.mixer
     import numpy
 except ImportError:
     try: