Try to put all platform stuff in platform/

14 files changed, 9 insertions, 9 deletions

diff --git a/cscript b/cscript
index 521bc54f9..d004edac0 100644
--- a/cscript
+++ b/cscript
@@ -26,20 +26,20 @@ def build(env, target):
 
 def package(env, target, version):
     if target.platform == 'windows':
-        shutil.copyfile('build/windows/installer.%s.nsi' % target.bits, 'build/windows/installer2.%s.nsi' % target.bits)
-        env.command('sed -i "s~%%resources%%~%s/windows~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
-        env.command('sed -i "s~%%deps%%~%s~g" build/windows/installer2.%s.nsi' % (env.windows_prefix, target.bits))
-        env.command('sed -i "s~%%binaries%%~%s/build~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
-        env.command('sed -i "s~%%bits%%~32~g" build/windows/installer2.%s.nsi' % target.bits)
-        env.command('makensis build/windows/installer2.%s.nsi' % target.bits)
-        return os.path.abspath(glob.glob('build/windows/*%s*.exe' % target.bits)[0])
+        shutil.copyfile('build/platform/windows/installer.%s.nsi' % target.bits, 'build/platform/windows/installer2.%s.nsi' % target.bits)
+        env.command('sed -i "s~%%resources%%~%s/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
+        env.command('sed -i "s~%%deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (env.windows_prefix, target.bits))
+        env.command('sed -i "s~%%binaries%%~%s/build~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
+        env.command('sed -i "s~%%bits%%~32~g" build/platform/windows/installer2.%s.nsi' % target.bits)
+        env.command('makensis build/platform/windows/installer2.%s.nsi' % target.bits)
+        return os.path.abspath(glob.glob('build/platform/windows/*%s*.exe' % target.bits)[0])
     elif target.platform == 'linux':
         if target.bits == 32:
             cpu = 'i386'
         else:
             cpu = 'amd64'
 
-        shutil.copyfile('builds/control-%s-%d' % (target.version, target.bits), 'debian/control')
+        shutil.copyfile('platform/linux/control-%s-%d' % (target.version, target.bits), 'debian/control')
         env.command('./waf dist')
         f = open('debian/files', 'w')
         print >>f,'dvdomatic_%s-1_%s.deb video extra' % (version, cpu)
diff --git a/builds/control-12.04-32 b/platform/linux/control-12.04-32
index 0f52d03ae..0f52d03ae 100644
--- a/builds/control-12.04-32
+++ b/platform/linux/control-12.04-32
diff --git a/builds/control-12.04-64 b/platform/linux/control-12.04-64
index fa4b4476e..fa4b4476e 100644
--- a/builds/control-12.04-64
+++ b/platform/linux/control-12.04-64
diff --git a/builds/control-12.10-32 b/platform/linux/control-12.10-32
index 0e5fc1f46..0e5fc1f46 100644
--- a/builds/control-12.10-32
+++ b/platform/linux/control-12.10-32
diff --git a/builds/control-12.10-64 b/platform/linux/control-12.10-64
index 24e16b4b5..24e16b4b5 100644
--- a/builds/control-12.10-64
+++ b/platform/linux/control-12.10-64
diff --git a/windows/.gtkrc-2.0 b/platform/windows/.gtkrc-2.0
index 0ea1d69c9..0ea1d69c9 100755
--- a/windows/.gtkrc-2.0
+++ b/platform/windows/.gtkrc-2.0
diff --git a/windows/dvdomatic.bmp b/platform/windows/dvdomatic.bmp
index 0a196f7a0..0a196f7a0 100644
--- a/windows/dvdomatic.bmp
+++ b/platform/windows/dvdomatic.bmp
diff --git a/windows/dvdomatic.ico b/platform/windows/dvdomatic.ico
index 225008cfe..225008cfe 100644
--- a/windows/dvdomatic.ico
+++ b/platform/windows/dvdomatic.ico
diff --git a/windows/dvdomatic.rc b/platform/windows/dvdomatic.rc
index 17790cf0d..17790cf0d 100644
--- a/windows/dvdomatic.rc
+++ b/platform/windows/dvdomatic.rc
diff --git a/windows/dvdomatic_taskbar.ico b/platform/windows/dvdomatic_taskbar.ico
index f4489fa14..f4489fa14 100644
--- a/windows/dvdomatic_taskbar.ico
+++ b/platform/windows/dvdomatic_taskbar.ico
diff --git a/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in
index b73e4f345..b73e4f345 100644
--- a/windows/installer.nsi.32.in
+++ b/platform/windows/installer.nsi.32.in
diff --git a/windows/installer.nsi.64.in b/platform/windows/installer.nsi.64.in
index f499c46c2..f499c46c2 100644
--- a/windows/installer.nsi.64.in
+++ b/platform/windows/installer.nsi.64.in
diff --git a/windows/wscript b/platform/windows/wscript
index 585cebef1..585cebef1 100644
--- a/windows/wscript
+++ b/platform/windows/wscript
diff --git a/wscript b/wscript
index b5676ba5b..86ed07b1b 100644
--- a/wscript
+++ b/wscript
@@ -192,7 +192,7 @@ def build(bld):
     bld.recurse('src')
     bld.recurse('test')
     if bld.env.TARGET_WINDOWS:
-        bld.recurse('windows')
+        bld.recurse('platform/windows')
 
     d = { 'PREFIX' : '${PREFIX' }