diff options
| -rw-r--r-- | cerbero/build/filesprovider.py | 15 | ||||
| -rw-r--r-- | cerbero/tests/test_build_common.py | 15 | ||||
| -rw-r--r-- | cerbero/tests/test_cerbero_build_filesprovider.py | 26 | ||||
| -rw-r--r-- | recipes/atk.recipe | 2 | ||||
| -rw-r--r-- | recipes/gdk-pixbuf.recipe | 2 | ||||
| -rw-r--r-- | recipes/gst-plugins-bad.recipe | 10 | ||||
| -rw-r--r-- | recipes/gst-plugins-base.recipe | 1 | ||||
| -rw-r--r-- | recipes/libxml2.recipe | 2 | ||||
| -rw-r--r-- | recipes/orc.recipe | 2 | ||||
| -rw-r--r-- | recipes/pango.recipe | 7 |
10 files changed, 49 insertions, 33 deletions
diff --git a/cerbero/build/filesprovider.py b/cerbero/build/filesprovider.py index b64dd12..66c10c2 100644 --- a/cerbero/build/filesprovider.py +++ b/cerbero/build/filesprovider.py @@ -42,6 +42,7 @@ class FilesProvider(object): 'mext': '.so'}} def __init__(self, config): + self.config = config self.platform = config.target_platform self.prefix = config.prefix self.extensions = self.EXTENSIONS[self.platform] @@ -165,10 +166,16 @@ class FilesProvider(object): if len(files) == 0: return [] - pattern = '%(sdir)s/%(file)s*%(sext)s' - if self.platform in [Platform.LINUX, Platform.DARWIN]: + if self.platform == Platform.LINUX: # libfoo.so.X, libfoo.so.X.Y.Z - pattern += '.*' + pattern = '%(sdir)s/%(file)s%(sext)s.*' + elif self.platform == Platform.DARWIN: + # libfoo.X.dylib + pattern = '%(sdir)s/%(file)s.*%(sext)s' + elif self.platform == Platform.WINDOWS: + # libfoo.X.dll, libfoo.dll + # FIXME: this will include libfoo-bar.dll too + pattern = '%(sdir)s/%(file)s*%(sext)s' libsmatch = [] for f in files: @@ -196,7 +203,7 @@ class FilesProvider(object): if self.platform == Platform.LINUX: pattern += 'lib/%(f)s.so' elif self.platform == Platform.WINDOWS: - pattern += 'lib/%(f)s*.dll.a' + pattern += 'lib/%(f)s.dll.a' elif self.platform == Platform.DARWIN: pattern += 'lib/%(f)s.dylib' diff --git a/cerbero/tests/test_build_common.py b/cerbero/tests/test_build_common.py index 504cc44..2402674 100644 --- a/cerbero/tests/test_build_common.py +++ b/cerbero/tests/test_build_common.py @@ -40,7 +40,7 @@ class Recipe1(recipe.Recipe): Platform.WINDOWS: ['windows'], Platform.LINUX: ['linux']} - files_libs = ['libgstreamer'] + files_libs = ['libgstreamer-0.10'] platform_files_libs = { Platform.WINDOWS: ['libgstreamer-win32'], Platform.LINUX: ['libgstreamer-x11']} @@ -85,20 +85,23 @@ def add_files(tmp): os.makedirs(bindir) os.makedirs(libdir) shell.call('touch ' - '%(bindir)s/libgstreamer.dll ' + '%(bindir)s/libgstreamer-0.10.dll ' '%(bindir)s/libgstreamer-win32.dll ' '%(bindir)s/libtest.dll ' '%(libdir)s/libtest.so.1 ' '%(libdir)s/libtest.la ' '%(libdir)s/libtest.a ' '%(libdir)s/libtest.so ' - '%(libdir)s/libgstreamer.so.1 ' - '%(libdir)s/libgstreamer.la ' - '%(libdir)s/libgstreamer.a ' - '%(libdir)s/libgstreamer.so ' + '%(libdir)s/libtest.dll.a ' + '%(libdir)s/libgstreamer-0.10.so.1 ' + '%(libdir)s/libgstreamer-0.10.la ' + '%(libdir)s/libgstreamer-0.10.a ' + '%(libdir)s/libgstreamer-0.10.so ' + '%(libdir)s/libgstreamer-0.10.dll.a ' '%(libdir)s/libgstreamer-win32.la ' '%(libdir)s/libgstreamer-win32.a ' '%(libdir)s/libgstreamer-win32.so ' + '%(libdir)s/libgstreamer-win32.dll.a ' '%(libdir)s/libgstreamer-x11.so.1 ' '%(libdir)s/libgstreamer-x11.so ' '%(libdir)s/libgstreamer-x11.a ' diff --git a/cerbero/tests/test_cerbero_build_filesprovider.py b/cerbero/tests/test_cerbero_build_filesprovider.py index e5266cf..87f73eb 100644 --- a/cerbero/tests/test_cerbero_build_filesprovider.py +++ b/cerbero/tests/test_cerbero_build_filesprovider.py @@ -36,7 +36,7 @@ class Config(DummyConfig): class FilesProvider(filesprovider.FilesProvider): files_misc = ['README', 'libexec/gstreamer-0.10/pluginsloader%(bext)s'] - files_libs = ['libgstreamer'] + files_libs = ['libgstreamer-0.10'] files_bins = ['gst-launch'] files_devel = ['include/gstreamer.h'] platform_files_bins = { @@ -58,15 +58,19 @@ class PackageTest(unittest.TestCase): self.winbin = ['bin/gst-launch.exe', 'bin/windows.exe'] self.linuxbin = ['bin/gst-launch', 'bin/linux'] - self.winlib = ['bin/libgstreamer.dll', 'bin/libgstreamer-win32.dll'] - self.linuxlib = ['lib/libgstreamer.so.1', 'lib/libgstreamer-x11.so.1'] + self.winlib = ['bin/libgstreamer-0.10.dll', 'bin/libgstreamer-win32.dll'] + self.linuxlib = ['lib/libgstreamer-0.10.so.1', 'lib/libgstreamer-x11.so.1'] self.winmisc = ['README', 'libexec/gstreamer-0.10/pluginsloader.exe'] self.linuxmisc = ['README', 'libexec/gstreamer-0.10/pluginsloader'] - self.devfiles = ['include/gstreamer.h', 'lib/libgstreamer.a', - 'lib/libgstreamer-win32.a', 'lib/libgstreamer-win32.so', - 'lib/libgstreamer-win32.la', 'lib/libgstreamer.la', + devfiles = ['include/gstreamer.h', 'lib/libgstreamer-0.10.a', + 'lib/libgstreamer-0.10.la'] + + self.windevfiles = devfiles + ['lib/libgstreamer-win32.a', + 'lib/libgstreamer-win32.la', 'lib/libgstreamer-win32.dll.a', + 'lib/libgstreamer-0.10.dll.a'] + self.lindevfiles = devfiles + ['lib/libgstreamer-0.10.so', 'lib/libgstreamer-x11.a', 'lib/libgstreamer-x11.la', - 'lib/libgstreamer-x11.so', 'lib/libgstreamer.so'] + 'lib/libgstreamer-x11.so', 'lib/libgstreamer-0.10.dll.a'] def tearDown(self): shutil.rmtree(self.tmp) @@ -91,7 +95,9 @@ class PackageTest(unittest.TestCase): def testDevelFiles(self): add_files(self.tmp) self.assertEquals(self.win32recipe.devel_files_list(), - sorted(self.devfiles)) + sorted(self.windevfiles)) + self.assertEquals(self.linuxrecipe.devel_files_list(), + sorted(self.lindevfiles)) def testDistFiles(self): win32files = self.winlib + self.winbin + self.winmisc @@ -101,8 +107,8 @@ class PackageTest(unittest.TestCase): self.assertEquals(self.linuxrecipe.dist_files_list(), sorted(linuxfiles)) def testGetAllFiles(self): - win32files = self.winlib + self.winbin + self.winmisc + self.devfiles - linuxfiles = self.linuxlib + self.linuxbin + self.linuxmisc + self.devfiles + win32files = self.winlib + self.winbin + self.winmisc + self.windevfiles + linuxfiles = self.linuxlib + self.linuxbin + self.linuxmisc + self.lindevfiles add_files(self.tmp) self.assertEquals(self.win32recipe.files_list(), sorted(win32files)) self.assertEquals(self.linuxrecipe.files_list(), sorted(linuxfiles)) diff --git a/recipes/atk.recipe b/recipes/atk.recipe index 35b08b9..71429c6 100644 --- a/recipes/atk.recipe +++ b/recipes/atk.recipe @@ -7,5 +7,5 @@ class Recipe(recipe.Recipe): deps = ['glib'] license = 'LGPLv2' - files_libs = ['libatk'] + files_libs = ['libatk-1.0'] files_devel = ['lib/pkgconfig/atk.pc', 'include/atk-1.0'] diff --git a/recipes/gdk-pixbuf.recipe b/recipes/gdk-pixbuf.recipe index 2ff0ecd..198396d 100644 --- a/recipes/gdk-pixbuf.recipe +++ b/recipes/gdk-pixbuf.recipe @@ -7,7 +7,7 @@ class Recipe(recipe.Recipe): license = 'LGPLv2.1' deps = ['jpeg', 'glib', 'libpng', 'tiff', 'zlib' ] - files_libs = ['libgdk_pixbuf'] + files_libs = ['libgdk_pixbuf-2.0'] files_bin = ['gdk-pixbuf-query-loaders', 'gdk-pixbuf-csource'] files_devel = [ 'lib/gdk-pixbuf-2.0', diff --git a/recipes/gst-plugins-bad.recipe b/recipes/gst-plugins-bad.recipe index f529627..da4b3b1 100644 --- a/recipes/gst-plugins-bad.recipe +++ b/recipes/gst-plugins-bad.recipe @@ -12,11 +12,11 @@ class Recipe(recipe.Recipe): 'schroedinger', 'libdca', 'jasper', 'libmms', 'libdvdnav' ] files_libs = [ - 'libgstbasevideo', - 'libgstbasecamerabinsrc', - 'libgstcodecparsers', - 'libgstphotography', - 'libgstsignalprocessor', + 'libgstbasevideo-0.10', + 'libgstbasecamerabinsrc-0.10', + 'libgstcodecparsers-0.10', + 'libgstphotography-0.10', + 'libgstsignalprocessor-0.10', ] files_effects = [ diff --git a/recipes/gst-plugins-base.recipe b/recipes/gst-plugins-base.recipe index 8866811..57355fd 100644 --- a/recipes/gst-plugins-base.recipe +++ b/recipes/gst-plugins-base.recipe @@ -38,7 +38,6 @@ class Recipe(recipe.Recipe): files_playback = [ 'lib/gstreamer-0.10/libgstcdparanoia%(mext)s', 'lib/gstreamer-0.10/libgstdecodebin2%(mext)s', - 'lib/gstreamer-0.10/libgstlibvisual%(mext)s', ] files_net = [ diff --git a/recipes/libxml2.recipe b/recipes/libxml2.recipe index 9f1b9f3..2c6c436 100644 --- a/recipes/libxml2.recipe +++ b/recipes/libxml2.recipe @@ -8,7 +8,7 @@ class Recipe(recipe.Recipe): deps = [ 'zlib' ] platform_deps = { Platform.WINDOWS: ['libiconv'] } - files_libs = ['libxml'] + files_libs = ['libxml2'] files_devel = ['include/libxml2', 'lib/xml2Conf.sh', 'bin/xml2-config', 'lib/pkgconfig/libxml-2.0.pc'] diff --git a/recipes/orc.recipe b/recipes/orc.recipe index 4dd11ab..8615cb6 100644 --- a/recipes/orc.recipe +++ b/recipes/orc.recipe @@ -6,7 +6,7 @@ class Recipe(recipe.Recipe): version = '0.4.16' license = 'BSD-like' - files_libs = ['liborc'] + files_libs = ['liborc-0.4'] files_bins = ['orcc'] files_devel = ['include/orc-0.4', 'lib/pkgconfig/orc-0.4.pc', 'bin/orc-bugreport%(bext)s'] diff --git a/recipes/pango.recipe b/recipes/pango.recipe index bc4fade..044c27a 100644 --- a/recipes/pango.recipe +++ b/recipes/pango.recipe @@ -8,14 +8,15 @@ class Recipe(recipe.Recipe): license = 'LGPLv2.1' deps = ['cairo', 'fontconfig', 'freetype'] - files_libs = ['libpangocairo', 'libpango', 'libpangoft2'] + files_libs = ['libpangocairo-1.0', 'libpango-1.0', 'libpangoft2-1.0'] files_bins = ['pango-querymodules', 'pango-view'] files_devel = ['include/pango-1.0', 'lib/pango', 'lib/pkgconfig/pangoft2.pc', 'lib/pkgconfig/pango.pc', 'lib/pkgconfig/pangocairo.pc'] platform_files_libs = { - Platform.WINDOWS: ['libpangowin32'], - Platform.LINUX: ['libpangox'], + Platform.WINDOWS: ['libpangowin32-1.0'], + Platform.LINUX: ['libpangox-1.0'], + Platform.DARWIN: ['libpangox-1.0'], } platform_files_devel = { Platform.WINDOWS: ['lib/pkgconfig/pangowin32.pc'], |