Make 2.0 branch parallel installable with 1.x.

diff --git a/icons/128x128/dcpomatic.png b/icons/128x128/dcpomatic.png
deleted file mode 100644 (file)
index 9936b39..0000000
Binary files a/icons/128x128/dcpomatic.png and /dev/null differ

diff --git a/icons/128x128/dcpomatic2.png b/icons/128x128/dcpomatic2.png
new file mode 100644 (file)
index 0000000..9936b39
Binary files /dev/null and b/icons/128x128/dcpomatic2.png differ

diff --git a/icons/16x16/dcpomatic.png b/icons/16x16/dcpomatic.png
deleted file mode 100644 (file)
index 3c5a10f..0000000
Binary files a/icons/16x16/dcpomatic.png and /dev/null differ

diff --git a/icons/16x16/dcpomatic2.png b/icons/16x16/dcpomatic2.png
new file mode 100644 (file)
index 0000000..3c5a10f
Binary files /dev/null and b/icons/16x16/dcpomatic2.png differ

diff --git a/icons/22x22/dcpomatic.png b/icons/22x22/dcpomatic.png
deleted file mode 100644 (file)
index dddb862..0000000
Binary files a/icons/22x22/dcpomatic.png and /dev/null differ

diff --git a/icons/22x22/dcpomatic2.png b/icons/22x22/dcpomatic2.png
new file mode 100644 (file)
index 0000000..dddb862
Binary files /dev/null and b/icons/22x22/dcpomatic2.png differ

diff --git a/icons/32x32/dcpomatic.png b/icons/32x32/dcpomatic.png
deleted file mode 100644 (file)
index 8cecf08..0000000
Binary files a/icons/32x32/dcpomatic.png and /dev/null differ

diff --git a/icons/32x32/dcpomatic2.png b/icons/32x32/dcpomatic2.png
new file mode 100644 (file)
index 0000000..8cecf08
Binary files /dev/null and b/icons/32x32/dcpomatic2.png differ

diff --git a/icons/48x48/dcpomatic.png b/icons/48x48/dcpomatic.png
deleted file mode 100644 (file)
index 07bf2d1..0000000
Binary files a/icons/48x48/dcpomatic.png and /dev/null differ

diff --git a/icons/48x48/dcpomatic2.png b/icons/48x48/dcpomatic2.png
new file mode 100644 (file)
index 0000000..07bf2d1
Binary files /dev/null and b/icons/48x48/dcpomatic2.png differ

diff --git a/icons/64x64/dcpomatic.png b/icons/64x64/dcpomatic.png
deleted file mode 100644 (file)
index 35564a8..0000000
Binary files a/icons/64x64/dcpomatic.png and /dev/null differ

diff --git a/icons/64x64/dcpomatic2.png b/icons/64x64/dcpomatic2.png
new file mode 100644 (file)
index 0000000..35564a8
Binary files /dev/null and b/icons/64x64/dcpomatic2.png differ

diff --git a/src/lib/wscript b/src/lib/wscript
index 7d74d462ce90719b7c839525aeed9c19c1c88208..f26529b8423b7763a6ab237c2feafe6e07dadf51 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -98,7 +98,7 @@ def build(bld):
     else:
         obj = bld(features = 'cxx cxxshlib')
 
-    obj.name = 'libdcpomatic'
+    obj.name = 'libdcpomatic2'
     obj.export_includes = ['..']
     obj.uselib = """
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE 
@@ -118,9 +118,9 @@ def build(bld):
     if bld.env.BUILD_STATIC:
         obj.uselib += ' XMLPP'
 
-    obj.target = 'dcpomatic'
+    obj.target = 'dcpomatic2'
 
-    i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic', bld)
+    i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic2', bld)
 
 def pot(bld):
     i18n.pot(os.path.join('src', 'lib'), sources, 'libdcpomatic')

diff --git a/src/tools/wscript b/src/tools/wscript
index c4ea1530fa831d0ff583ead168d29011cb6a9a16..f23eafd8bca74e75bd72c8c0fbb89cc85f253e8c 100644 (file)
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -13,9 +13,9 @@ def build(bld):
         obj = bld(features = 'cxx cxxprogram')
         obj.uselib = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS QUICKMAIL'
         obj.includes = ['..']
-        obj.use    = ['libdcpomatic']
+        obj.use    = ['libdcpomatic2']
         obj.source = '%s.cc' % t
-        obj.target = t
+        obj.target = t.replace('dcpomatic', 'dcpomatic2')
         if t == 'server_test':
             obj.install_path = None
 
@@ -26,13 +26,13 @@ def build(bld):
             if bld.env.BUILD_STATIC:
                 obj.uselib += ' GTK'
             obj.includes = ['..']
-            obj.use    = ['libdcpomatic', 'libdcpomatic-wx']
+            obj.use    = ['libdcpomatic2', 'libdcpomatic2-wx']
             obj.source = '%s.cc' % t
             if bld.env.TARGET_WINDOWS:
-                obj.source += ' ../../platform/windows/dcpomatic.rc'
-            obj.target = t
+                obj.source += ' ../../platform/windows/dcpomatic2.rc'
+            obj.target = t.replace('dcpomatic', 'dcpomatic2')
 
-        i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic', bld)
+        i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic2', bld)
 
 def pot(bld):
     i18n.pot(os.path.join('src', 'tools'), 'dcpomatic.cc dcpomatic_batch.cc', 'dcpomatic')

diff --git a/src/wx/wscript b/src/wx/wscript
index 719496ae702a9d190aaea309a5d76e912ca8443a..bb1a1b76fa39d99d5a0a8b14c9f9ec212726985a 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -85,16 +85,16 @@ def build(bld):
     else:
         obj = bld(features = 'cxx cxxshlib')
 
-    obj.name   = 'libdcpomatic-wx'
+    obj.name   = 'libdcpomatic2-wx'
     obj.export_includes = ['..']
     obj.uselib = 'WXWIDGETS DCP'
     if bld.env.TARGET_LINUX:
         obj.uselib += ' GTK'
-    obj.use = 'libdcpomatic'
+    obj.use = 'libdcpomatic2'
     obj.source = sources
-    obj.target = 'dcpomatic-wx'
+    obj.target = 'dcpomatic2-wx'
 
-    i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic-wx', bld)
+    i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic2-wx', bld)
 
 def pot(bld):
     i18n.pot(os.path.join('src', 'wx'), sources + " editable_list.h", 'libdcpomatic-wx')

diff --git a/test/wscript b/test/wscript
index 59e003ac225a5dcc8583c1fbbb281e2248b4ab51..3345d9eb83bf5c72eabc33684c555048bfd18372 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -12,8 +12,8 @@ def configure(conf):
 def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'unit-tests'
-    obj.uselib = 'BOOST_TEST BOOST_THREAD DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML'
-    obj.use    = 'libdcpomatic'
+    obj.uselib = 'BOOST_TEST BOOST_THREAD DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML MAGICK'
+    obj.use    = 'libdcpomatic2'
     obj.source = """
                  4k_test.cc
                  audio_analysis_test.cc
@@ -65,7 +65,7 @@ def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'long-unit-tests'
     obj.uselib = 'BOOST_TEST DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML'
-    obj.use    = 'libdcpomatic'
+    obj.use    = 'libdcpomatic2'
     obj.source = """
                  test.cc
                  """

diff --git a/wscript b/wscript
index c2bbac562b01ccd7c32f3d7674e4ea82a7f80a0f..fd1487a3fdd4dae8886afa6fb2165c5853e05c94 100644 (file)
--- a/wscript
+++ b/wscript
@@ -223,7 +223,7 @@ def configure(conf):
     if conf.env.TARGET_LINUX or conf.env.TARGET_OSX:
         conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_POSIX')
         conf.env.append_value('CXXFLAGS', '-DPOSIX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX'])
-        conf.env.append_value('CXXFLAGS', '-DPOSIX_ICON_PREFIX="%s/share/dcpomatic"' % conf.env['INSTALL_PREFIX'])
+        conf.env.append_value('CXXFLAGS', '-DPOSIX_ICON_PREFIX="%s/share/dcpomatic2"' % conf.env['INSTALL_PREFIX'])
         boost_lib_suffix = ''
         boost_thread = 'boost_thread'
         conf.env.append_value('LINKFLAGS', '-pthread')
@@ -361,10 +361,10 @@ def build(bld):
         bld.recurse('platform/osx')
 
     for r in ['22x22', '32x32', '48x48', '64x64', '128x128']:
-        bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dcpomatic.png' % r)
+        bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dcpomatic2.png' % r)
 
     if not bld.env.TARGET_WINDOWS:
-        bld.install_files('${PREFIX}/share/dcpomatic', 'icons/taskbar_icon.png')
+        bld.install_files('${PREFIX}/share/dcpomatic2', 'icons/taskbar_icon.png')
 
     bld.add_post_fun(post)