No more Binary in svn + scons clean up

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1158 8ced0084-cf51-0410-be5f-012b33b47a6e

Binary/linux/Sys

@@ -1 +0,0 @@
-../../Data/Sys

Binary/linux/User

@@ -1 +0,0 @@
-../../Data/User

SConstruct

@@ -2,6 +2,7 @@
 
 import os
 import sys
+import platform
 
 # Home made tests
 sys.path.append('SconsTests')
@@ -213,13 +214,19 @@ if not env['osx64']:
 # add methods from utils to env
 env.AddMethod(utils.filterWarnings)
 
-# output
+# Where do we run from
-if sys.platform == 'darwin':
+env['base_dir'] = os.getcwd()+ '/';
-	platform = 'mac'
+
-else:
+# install paths
-	platform = 'linux'
+# TODO: support global install
+env['prefix'] = os.path.join(env['base_dir'] + 'Binary', platform.system() + '-' + platform.machine() + '/')
+#TODO add lib
+env['plugin_dir'] = env['prefix'] + 'Plugins/' 
+#TODO add bin
+env['binary_dir'] = env['prefix']
+#TODO where should this go?
+env['data_dir'] = env['prefix']
 
-env['plugin_dir'] = 'Binary/%s/Plugins/' % platform
 Export('env')
 
 utils.GenerateRevFile(env['flavor'], "Source/Core/Common/Src/svnrev_template.h",
@@ -241,3 +248,11 @@ for subdir in dirs:
         subdir + os.sep + 'SConscript',
         duplicate = 0
         )
+
+# Data install
+env.Install(env['data_dir'], 'Data/Sys')
+env.Install(env['data_dir'], 'Data/User')
+
+if sys.platform == 'darwin':
+    env.Install(env['binary_dir'] + 'Dolphin.app/Contents/Resources/', 
+                Source/Core/DolphinWX/resources/Dolphin.icns)

Source/Core/DolphinWX/Src/SConscript

@@ -56,13 +56,13 @@ else:
 		)
 
 if sys.platform == 'darwin':
-	exeGUI = '../../../../Binary/mac/Dolphin.app/Contents/MacOS/Dolphin'
+	exeGUI = env['binary_dir'] + 'Dolphin.app/Contents/MacOS/Dolphin'
-	exeNoGUI = '../../../../Binary/mac/DolphinNoGUI'
+	exeNoGUI = env['binary_dir'] + 'DolphinNoGUI'
 
 	icon = 'Dolphin'
 	version = 'svn'
 	wxenv.Plist(
-		'../../../../Binary/mac/Dolphin.app/Contents/Info.plist',
+		env['binary_dir'] + 'Dolphin.app/Contents/Info.plist',
 		Value(dict(
 			CFAppleHelpAnchor = 'index',
 			CFBundleExecutable = 'Dolphin',
@@ -80,8 +80,8 @@ if sys.platform == 'darwin':
 			))
 		)
 else:
-	exeGUI = '../../../../Binary/linux/Dolphin'
+	exeGUI = env['binary_dir'] + 'Dolphin'
-	exeNoGUI = '../../../../Binary/linux/DolphinNoGUI'
+	exeNoGUI = env['binary_dir'] + 'DolphinNoGUI'
 
 objects = [ wxenv.Object(srcFile) for srcFile in files ]
 if not wxenv['osx64']:

Source/Plugins/Plugin_DSP_HLE/Src/SConscript

@@ -3,7 +3,7 @@
 Import('env')
 import sys
 
-name = "Plugin_DSP_HLE.so"
+name = "Plugin_DSP_HLE"
 
 files = [
 	'DSPHandler.cpp',
@@ -32,5 +32,5 @@ dspenv.Append(
 	CXXFLAGS = [ '-fPIC' ],
 	LIBS = [ 'common' ],
 	)
-if not env['osx64']:
+
-    dspenv.SharedLibrary('../../../../'+env['plugin_dir']+name, files)
+dspenv.SharedLibrary(env['plugin_dir']+name, files)

Source/Plugins/Plugin_DSP_LLE/Src/SConscript

@@ -3,7 +3,7 @@
 Import('env')
 import sys
 
-name = "Plugin_DSP_LLE.so"
+name = "Plugin_DSP_LLE"
 
 files = [
 	"AOSoundStream.cpp",
@@ -31,5 +31,5 @@ lleenv.Append(
 	CXXFLAGS = [ '-fPIC' ],
 	LIBS = [ 'common' ],
 	)
-if not env['osx64']:
+
-    lleenv.SharedLibrary('../../../../'+env['plugin_dir']+name, files)
+lleenv.SharedLibrary(env['plugin_dir']+name, files)

Source/Plugins/Plugin_DSP_NULL/Src/SConscript

@@ -3,7 +3,7 @@
 Import('env')
 import sys
 
-name = "Plugin_DSP_NULL.so"
+name = "Plugin_DSP_NULL"
 
 files = [
         "DSPHandler.cpp",
@@ -32,4 +32,4 @@ else:
         LIBS = [ 'common' ],
 	)
 
-dspenv.SharedLibrary('../../../../'+env['plugin_dir']+name, files)
+dspenv.SharedLibrary(env['plugin_dir']+name, files)

Source/Plugins/Plugin_PadSimple/Src/SConscript

@@ -3,7 +3,7 @@
 Import('env')
 import sys
 
-name = "Plugin_PadSimple.so"
+name = "Plugin_PadSimple"
 
 files = [
 	"PadSimple.cpp",
@@ -24,4 +24,4 @@ if padenv['osx64']:
 		LINKFLAGS = [ '-arch', 'x86_64' ],
 		)
 
-padenv.SharedLibrary('../../../../'+env['plugin_dir']+name, files)
+padenv.SharedLibrary(env['plugin_dir']+name, files)

Source/Plugins/Plugin_VideoOGL/Src/SConscript

@@ -3,10 +3,10 @@
 Import('env')
 # can we import path in one place?
 import sys
-sys.path.append('../../../SconsTests')
+sys.path.append(env['base_dir']+'SconsTests')
 import utils
 
-name = "Plugin_VideoOGL.so"
+name = "Plugin_VideoOGL"
 
 files = [
 	'BPStructs.cpp',
@@ -111,7 +111,7 @@ gfxenv.Append(
 	)
 
 gfxenv.SharedLibrary(
-	'../../../../'+env['plugin_dir']+name,
+	env['plugin_dir']+name,
 	files,
 	LIBS =  libs + gfxenv['LIBS']
 	)

Source/Plugins/Plugin_Wiimote_Test/Src/SConscript

@@ -3,7 +3,7 @@
 Import('env')
 import sys
 
-name = "Plugin_Wiimote.so"
+name = "Plugin_Wiimote"
 
 files = [
 	"Wiimote.cpp",
@@ -23,4 +23,4 @@ else:
         LIBS = [ 'common' ],
         )
 
-padenv.SharedLibrary('../../../../'+env['plugin_dir']+name, files)
+padenv.SharedLibrary(env['plugin_dir']+name, files)

Source/Plugins/Plugin_nJoy_SDL/Src/SConscript

@@ -3,7 +3,7 @@
 Import('env')
 import sys
 
-name = "Plugin_nJoy_SDL.so"
+name = "Plugin_nJoy_SDL"
 
 files = [
 	'nJoy.cpp',
@@ -17,4 +17,4 @@ padenv.Append(
 	LIBS = [ 'common' ],
 	)
 if not env['osx64']:
-    padenv.SharedLibrary('../../../../'+env['plugin_dir']+name, files)
+    padenv.SharedLibrary(env['plugin_dir']+name, files)