Try to move Linux desktop files into platform/

diff --git a/dvdomatic.desktop.in b/dvdomatic.desktop.in
deleted file mode 100644 (file)
index 65067eb..0000000
--- a/dvdomatic.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=@PREFIX@/bin/dvdomatic
-Name=DVD-o-matic
-Icon=dvdomatic
-Comment=DCP generator
-Categories=AudioVideo;Video

diff --git a/dvdomatic_batch.desktop.in b/dvdomatic_batch.desktop.in
deleted file mode 100644 (file)
index 8150fe8..0000000
--- a/dvdomatic_batch.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=@PREFIX@/bin/dvdomatic_batch
-Name=DVD-o-matic Batch Converter
-Icon=dvdomatic
-Comment=Batch DCP generator
-Categories=AudioVideo;Video

diff --git a/platform/linux/dvdomatic.desktop.in b/platform/linux/dvdomatic.desktop.in
new file mode 100644 (file)
index 0000000..65067eb
--- /dev/null
+++ b/platform/linux/dvdomatic.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Exec=@PREFIX@/bin/dvdomatic
+Name=DVD-o-matic
+Icon=dvdomatic
+Comment=DCP generator
+Categories=AudioVideo;Video

diff --git a/platform/linux/dvdomatic_batch.desktop.in b/platform/linux/dvdomatic_batch.desktop.in
new file mode 100644 (file)
index 0000000..8150fe8
--- /dev/null
+++ b/platform/linux/dvdomatic_batch.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Exec=@PREFIX@/bin/dvdomatic_batch
+Name=DVD-o-matic Batch Converter
+Icon=dvdomatic
+Comment=Batch DCP generator
+Categories=AudioVideo;Video

diff --git a/platform/linux/servomatic.desktop.in b/platform/linux/servomatic.desktop.in
new file mode 100644 (file)
index 0000000..572b4c6
--- /dev/null
+++ b/platform/linux/servomatic.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Exec=@PREFIX@/bin/servomatic_gui
+Name=DVD-o-matic Encode Server
+Icon=dvdomatic
+Comment=DCP generator
+Categories=AudioVideo;Video

diff --git a/platform/linux/wscript b/platform/linux/wscript
new file mode 100644 (file)
index 0000000..1d9054b
--- /dev/null
+++ b/platform/linux/wscript
@@ -0,0 +1,19 @@
+def build(bld):
+    d = { 'PREFIX' : '${PREFIX' }
+
+    obj = bld(features = 'subst')
+    obj.source = 'dvdomatic.desktop.in'
+    obj.target = 'dvdomatic.desktop'
+    obj.dict = d
+
+    obj = bld(features = 'subst')
+    obj.source = 'dvdomatic_batch.desktop.in'
+    obj.target = 'dvdomatic_batch.desktop'
+    obj.dict = d
+
+    obj = bld(features = 'subst')
+    obj.source = 'servomatic.desktop.in'
+    obj.target = 'servomatic.desktop'
+    obj.dict = d
+
+    bld.install_files('${PREFIX}/share/applications', ['dvdomatic.desktop', 'dvdomatic_batch.desktop', 'servomatic.desktop'])

diff --git a/servomatic.desktop.in b/servomatic.desktop.in
deleted file mode 100644 (file)
index 572b4c6..0000000
--- a/servomatic.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=@PREFIX@/bin/servomatic_gui
-Name=DVD-o-matic Encode Server
-Icon=dvdomatic
-Comment=DCP generator
-Categories=AudioVideo;Video

diff --git a/wscript b/wscript
index 9a7cedab93b34070c050c0655ce5fe1c46ec0a8b..fb2a838dfe401021c8e7e8e5b119d0f5357de1ee 100644 (file)
--- a/wscript
+++ b/wscript
@@ -9,12 +9,13 @@ def options(opt):
     opt.load('compiler_cxx')
     opt.load('winres')
 
     opt.load('compiler_cxx')
     opt.load('winres')
 

-    opt.add_option('--enable-debug', action='store_true', default = False, help = 'build with debugging information and without optimisation')
-    opt.add_option('--disable-gui', action='store_true', default = False, help = 'disable building of GUI tools')
-    opt.add_option('--target-windows', action='store_true', default = False, help = 'set up to do a cross-compile to Windows')
-    opt.add_option('--static', action='store_true', default = False, help = 'build statically, and link statically to libdcp and FFmpeg')
-    opt.add_option('--magickpp-config', action='store', default='Magick++-config', help = 'path to Magick++-config')
-    opt.add_option('--wx-config', action='store', default='wx-config', help = 'path to wx-config')
+    opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation')
+    opt.add_option('--disable-gui', action='store_true', default=False, help='disable building of GUI tools')
+    opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to Windows')
+    opt.add_option('--static', action='store_true', default=False, help='build statically, and link statically to libdcp and FFmpeg')
+    opt.add_option('--magickpp-config', action='store', default='Magick++-config', help='path to Magick++-config')
+    opt.add_option('--wx-config', action='store', default='wx-config', help='path to wx-config')
+    opt.add_option('--osx', action='store_true', default=False, help='build on OS X')

 
 def configure(conf):
     conf.load('compiler_cxx')
 
 def configure(conf):
     conf.load('compiler_cxx')


@@ -51,6 +52,8 @@ def configure(conf):
     conf.env.DISABLE_GUI = conf.options.disable_gui
     conf.env.STATIC = conf.options.static
     conf.env.VERSION = VERSION
     conf.env.DISABLE_GUI = conf.options.disable_gui
     conf.env.STATIC = conf.options.static
     conf.env.VERSION = VERSION

+    conf.env.TARGET_OSX = conf.options.osx
+    conf.env.TARGET_LINUX = not conf.options.target_windows and not conf.options.osx

 
     if conf.options.enable_debug:
         conf.env.append_value('CXXFLAGS', ['-g', '-DDVDOMATIC_DEBUG'])
 
     if conf.options.enable_debug:
         conf.env.append_value('CXXFLAGS', ['-g', '-DDVDOMATIC_DEBUG'])


@@ -193,25 +196,9 @@ def build(bld):
     bld.recurse('test')
     if bld.env.TARGET_WINDOWS:
         bld.recurse('platform/windows')
     bld.recurse('test')
     if bld.env.TARGET_WINDOWS:
         bld.recurse('platform/windows')

+    if bld.env.TARGET_LINUX:
+        bld.recurse('platform/linux')

 
 

-    d = { 'PREFIX' : '${PREFIX' }
-
-    obj = bld(features = 'subst')
-    obj.source = 'dvdomatic.desktop.in'
-    obj.target = 'dvdomatic.desktop'
-    obj.dict = d
-
-    obj = bld(features = 'subst')
-    obj.source = 'dvdomatic_batch.desktop.in'
-    obj.target = 'dvdomatic_batch.desktop'
-    obj.dict = d
-
-    obj = bld(features = 'subst')
-    obj.source = 'servomatic.desktop.in'
-    obj.target = 'servomatic.desktop'
-    obj.dict = d
-
-    bld.install_files('${PREFIX}/share/applications', ['dvdomatic.desktop', 'dvdomatic_batch.desktop', 'servomatic.desktop'])

     for r in ['22x22', '32x32', '48x48', '64x64', '128x128']:
         bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r)
 
     for r in ['22x22', '32x32', '48x48', '64x64', '128x128']:
         bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r)