Make 1.0 parallel-installable with 0.x.

diff --git a/asdcplib/src/wscript b/asdcplib/src/wscript
index 661971ac20189d7c1155c86da889755e33850873..62f3a00955ed9d6d1f0d05628c8d887f95381c62 100644 (file)
--- a/asdcplib/src/wscript
+++ b/asdcplib/src/wscript
@@ -13,8 +13,8 @@ def build(bld):
     else:
         obj = bld(features = 'cxx cxxshlib')
 
-    obj.name = 'libkumu-libdcp'
-    obj.target = 'kumu-libdcp'
+    obj.name = 'libkumu-libdcp%s' % bld.env.API_VERSION
+    obj.target = 'kumu-libdcp%s' % bld.env.API_VERSION
     obj.uselib = 'OPENSSL BOOST_FILESYSTEM'
     obj.includes = ['.']
     obj.export_includes = ['.']
@@ -32,10 +32,10 @@ def build(bld):
     else:
         obj = bld(features = 'cxx cxxshlib')
 
-    obj.name = 'libasdcp-libdcp'
-    obj.target = 'asdcp-libdcp'
+    obj.name = 'libasdcp-libdcp%s' % bld.env.API_VERSION
+    obj.target = 'asdcp-libdcp%s' % bld.env.API_VERSION
     obj.uselib = 'OPENSSL'
-    obj.use = 'libkumu-libdcp'
+    obj.use = 'libkumu-libdcp%s' % bld.env.API_VERSION
     obj.includes = ['.']
     obj.export_includes = ['.']
     obj.source = """
@@ -67,5 +67,5 @@ def build(bld):
                  """
 
     if bld.env.STATIC:
-        bld.install_files('${PREFIX}/lib', 'libkumu-libdcp.a')
-        bld.install_files('${PREFIX}/lib', 'libasdcp-libdcp.a')
+        bld.install_files('${PREFIX}/lib', 'libkumu-libdcp%s.a' % bld.env.API_VERSION)
+        bld.install_files('${PREFIX}/lib', 'libasdcp-libdcp%s.a' % bld.env.API_VERSION)

diff --git a/examples/wscript b/examples/wscript
index ce94bfa281db1847340e422cd7e5af8edfe214b0..abb0885c4159141695043146cdbaebc590da5850 100644 (file)
--- a/examples/wscript
+++ b/examples/wscript
@@ -1,7 +1,7 @@
 def build(bld):
     obj = bld(features = 'cxx cxxprogram')
     obj.name   = 'make_dcp'
-    obj.use    = 'libdcp'
+    obj.use    = 'libdcp%s' % bld.env.API_VERSION
     obj.uselib = 'OPENJPEG CXML'
     obj.source = 'make_dcp.cc'
     obj.target = 'make_dcp'
@@ -9,7 +9,7 @@ def build(bld):
 
     obj = bld(features = 'cxx cxxprogram')
     obj.name   = 'read_dcp'
-    obj.use    = 'libdcp'
+    obj.use    = 'libdcp%s' % bld.env.API_VERSION
     obj.uselib = 'OPENJPEG CXML MAGICK'
     obj.source = 'read_dcp.cc'
     obj.target = 'read_dcp'

diff --git a/libdcp.pc.in b/libdcp.pc.in
deleted file mode 100644 (file)
index 0f3239b..0000000
--- a/libdcp.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libdcp
-Description: DCP reading and writing library
-Version: @version@
-Requires: sigc++-2.0 openssl libxml++-2.6 xmlsec1
-Libs: @libs@
-Cflags: -I${includedir}

diff --git a/src/wscript b/src/wscript
index 1f40197734d9d3f1168af9748b062137b76d7013..c06ca1bd4795d34fae0762910a6717d40e7ec4a1 100644 (file)
--- a/src/wscript
+++ b/src/wscript
@@ -6,11 +6,11 @@ def build(bld):
     else:
         obj = bld(features = 'cxx cxxshlib')
 
-    obj.name = 'libdcp'
-    obj.target = 'dcp'
+    obj.name = 'libdcp%s' % bld.env.API_VERSION
+    obj.target = 'dcp%s' % bld.env.API_VERSION
     obj.export_includes = ['.']
     obj.uselib = 'BOOST_FILESYSTEM BOOST_SIGNALS2 BOOST_DATETIME OPENSSL SIGC++ LIBXML++ OPENJPEG CXML XMLSEC1'
-    obj.use = 'libkumu-libdcp libasdcp-libdcp'
+    obj.use = 'libkumu-libdcp%s libasdcp-libdcp%s' % (bld.env.API_VERSION, bld.env.API_VERSION)
     obj.source = """
                  argb_frame.cc
                  asset.cc
@@ -110,6 +110,6 @@ def build(bld):
               xyz_frame.h
               """
 
-    bld.install_files('${PREFIX}/include/libdcp', headers)
+    bld.install_files('${PREFIX}/include/libdcp%s/dcp' % bld.env.API_VERSION, headers)
     if bld.env.STATIC:
-        bld.install_files('${PREFIX}/lib', 'libdcp.a')
+        bld.install_files('${PREFIX}/lib', 'libdcp%s.a' % bld.env.API_VERSION)

diff --git a/test/wscript b/test/wscript
index 83253f2bb5ffa204a0b294f190a83e39dd6e98d0..407765afff3eab742ee7fe27dbdb19fa627286ba 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -19,7 +19,7 @@ def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'tests'
     obj.uselib = 'BOOST_TEST OPENJPEG CXML XMLSEC1 SNDFILE'
-    obj.use    = 'libdcp'
+    obj.use    = 'libdcp%s' % bld.env.API_VERSION
     obj.source = """
                  certificates_test.cc
                  color_test.cc
@@ -45,7 +45,7 @@ def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'subs_in_out'
     obj.uselib = 'BOOST_TEST OPENJPEG CXML'
-    obj.use    = 'libdcp'
+    obj.use    = 'libdcp%s' % bld.env.API_VERSION
     obj.source = 'subs_in_out.cc'
     obj.target = 'subs_in_out'
     obj.install_path = ''
@@ -53,7 +53,7 @@ def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'rewrite_subs'
     obj.uselib = 'BOOST_TEST OPENJPEG CXML'
-    obj.use    = 'libdcp'
+    obj.use    = 'libdcp%s' % bld.env.API_VERSION
     obj.source = 'rewrite_subs.cc'
     obj.target = 'rewrite_subs'
     obj.install_path = ''

diff --git a/tools/wscript b/tools/wscript
index e4a32534efbeb07ce30065d1bf4bd8dc2605c9b6..518f00261b493923e42f78bb2d0666aca56c05f8 100644 (file)
--- a/tools/wscript
+++ b/tools/wscript
@@ -1,12 +1,12 @@
 def build(bld):
     obj = bld(features = 'cxx cxxprogram')
-    obj.use = ['libdcp']
+    obj.use = ['libdcp%s' % bld.env.API_VERSION]
     obj.uselib = 'OPENJPEG CXML'
     obj.source = 'dcpdiff.cc'
     obj.target = 'dcpdiff'
 
     obj = bld(features = 'cxx cxxprogram')
-    obj.use = ['libdcp']
+    obj.use = ['libdcp%s' % bld.env.API_VERSION]
     obj.uselib = 'OPENJPEG CXML'
     obj.source = 'dcpinfo.cc'
     obj.target = 'dcpinfo'

diff --git a/wscript b/wscript
index 2b1ae84344e8a1d5263f0c7e34e019659b9be7fa..dc78f8cae1e7c20de71f4728e0e7ae2d383f63c0 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,6 +3,7 @@ import os
 
 APPNAME = 'libdcp'
 VERSION = '1.00.0devel'
+API_VERSION = '-1.0'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -20,6 +21,7 @@ def configure(conf):
     conf.env.TARGET_OSX = conf.options.target_osx
     conf.env.ENABLE_DEBUG = conf.options.enable_debug
     conf.env.STATIC = conf.options.static
+    conf.env.API_VERSION = API_VERSION
 
     if conf.options.target_windows:
         conf.env.append_value('CXXFLAGS', '-DLIBDCP_WINDOWS')
@@ -114,10 +116,10 @@ def build(bld):
     else:
         boost_lib_suffix = ''
 
-    bld(source='libdcp.pc.in',
+    bld(source='libdcp%s.pc.in' % bld.env.API_VERSION,
         version=VERSION,
-        includedir='%s/include' % bld.env.PREFIX,
-        libs="-L${libdir} -ldcp -lasdcp-libdcp -lkumu-libdcp -lboost_system%s" % boost_lib_suffix,
+        includedir='%s/include/libdcp%s' % (bld.env.PREFIX, bld.env.API_VERSION),
+        libs="-L${libdir} -ldcp%s -lasdcp-libdcp%s -lkumu-libdcp%s -lboost_system%s" % (API_VERSION, API_VERSION, API_VERSION, boost_lib_suffix),
         install_path='${LIBDIR}/pkgconfig')
 
     bld.recurse('src')