@@ -4,24 +4,24 @@ import SCons; # OPTIONS ###################################################################### -opts = Options ('diva.conf'); +opts = Variables ('diva.conf'); -opts.Add (BoolOption ('GDVDEBUG', 'Enable extra Gdv debug messages', 0)); -opts.Add (BoolOption ('MCSDEBUG', 'Enable debugging information generated by mcs', 0)); +opts.Add (BoolVariable ('GDVDEBUG', 'Enable extra Gdv debug messages', 0)); +opts.Add (BoolVariable ('MCSDEBUG', 'Enable debugging information generated by mcs', 0)); -opts.Add (PathOption ('PREFIX', 'System base prefix path', '/usr')); -opts.Add (PathOption ('LIBDIR', 'System library path', '$PREFIX/lib')); -opts.Add (PathOption ('BINDIR', 'System executable path', '$PREFIX/bin')); -opts.Add (PathOption ('SHAREDIR', 'System shared data path', '$PREFIX/share')); -opts.Add (PathOption ('DESTDIR', 'System base installation path', '/')); -opts.Add (PathOption ('LOCALEDIR', 'System locale installation path', '$SHAREDIR/locale')); +opts.Add (PathVariable ('PREFIX', 'System base prefix path', '/usr')); +opts.Add (PathVariable ('LIBDIR', 'System library path', '$PREFIX/lib')); +opts.Add (PathVariable ('BINDIR', 'System executable path', '$PREFIX/bin')); +opts.Add (PathVariable ('SHAREDIR', 'System shared data path', '$PREFIX/share')); +opts.Add (PathVariable ('DESTDIR', 'System base installation path', '/')); +opts.Add (PathVariable ('LOCALEDIR', 'System locale installation path', '$SHAREDIR/locale')); -#opts.Add (PathOption ('PREFIX', 'System base prefix path', '/usr', PathOption.PathIsDirCreate)); -#opts.Add (PathOption ('LIBDIR', 'System library path', '$PREFIX/lib', PathOption.PathIsDirCreate)); -#opts.Add (PathOption ('BINDIR', 'System executable path', '$PREFIX/bin', PathOption.PathIsDirCreate)); -#opts.Add (PathOption ('SHAREDIR', 'System shared data path', '$PREFIX/share', PathOption.PathIsDirCreate)); -#opts.Add (PathOption ('DESTDIR', 'System base installation path', '/', PathOption.PathIsDirCreate)); -#opts.Add (PathOption ('LOCALEDIR', 'System locale installation path', '$SHAREDIR/locale', PathOption.PathIsDirCreate)); +#opts.Add (PathVariable ('PREFIX', 'System base prefix path', '/usr', PathOption.PathIsDirCreate)); +#opts.Add (PathVariable ('LIBDIR', 'System library path', '$PREFIX/lib', PathOption.PathIsDirCreate)); +#opts.Add (PathVariable ('BINDIR', 'System executable path', '$PREFIX/bin', PathOption.PathIsDirCreate)); +#opts.Add (PathVariable ('SHAREDIR', 'System shared data path', '$PREFIX/share', PathOption.PathIsDirCreate)); +#opts.Add (PathVariable ('DESTDIR', 'System base installation path', '/', PathOption.PathIsDirCreate)); +#opts.Add (PathVariable ('LOCALEDIR', 'System locale installation path', '$SHAREDIR/locale', PathOption.PathIsDirCreate)); # The above code fixes the problem with the error about non-existing paths. # Unfortunately, it doesn't work with the older (more popular) SCons versions, @@ -236,7 +236,8 @@ monoEnv = Environment (options = opts, CEnv = Environment (options = opts, LIBPATH = Split ('#src/Gdv/ #src/Gdv.Base/ #src/Diva.Cairo/'), - CPPDEFINES = {'GDV_ENABLE_MESSAGES' : '${GDVDEBUG}'}); + CPPDEFINES = {}#{'GDV_ENABLE_MESSAGES' : '${GDVDEBUG}'} + ); CEnv.Append (CCFLAGS = Split ('-Wall')); SConstruct @@ -2,7 +2,7 @@ import os; Import ('divaEnv'); Import ('shellEnv'); -env = divaEnv.Copy (); +env = divaEnv.Clone (); sources = Split ('AssemblyInfo.cs \ Diva.Basics.DataElement.cs \ src/Diva.Basics/SConscript @@ -5,7 +5,7 @@ Import ('shellEnv'); # C ############################################################################ -localEnvC = CEnv.Copy (); +localEnvC = CEnv.Clone (); sourcesC = Split ('DivaCairoGraphics.c \ DivaCairoSketch.c \ @@ -20,7 +20,7 @@ cairo = localEnvC.SharedLibrary('libdivacairo', sourcesC); # MONO ######################################################################### -localEnvMono = divaEnv.Copy (); +localEnvMono = divaEnv.Clone (); sourcesMono = Split ('AssemblyInfo.cs \ Diva.Cairo.Graphics.cs \ src/Diva.Cairo/SConscript @@ -2,7 +2,7 @@ import os; Import ('divaEnv'); Import ('shellEnv'); -env = divaEnv.Copy (); +env = divaEnv.Clone (); env.Append (REF = Split ('#src/Diva.Core/core.dll \ #src/Diva.Util/util.dll \ src/Diva.Commands/SConscript @@ -2,7 +2,7 @@ import os; Import ('divaEnv'); Import ('shellEnv'); -env = divaEnv.Copy (); +env = divaEnv.Clone (); env.Append (REF = Split ('#src/Diva.Util/util.dll'), PKG = Split ('gconf-sharp-2.0')); src/Diva.Config/SConscript @@ -2,7 +2,7 @@ import os; Import ('divaEnv'); Import ('shellEnv'); -env = divaEnv.Copy (); +env = divaEnv.Clone (); env.Append (REF = Split ('#src/Diva.Util/util.dll \ #src/Diva.Config/config.dll \ src/Diva.Core/SConscript @@ -2,7 +2,7 @@ import os; Import ('divaEnv'); Import ('shellEnv'); -env = divaEnv.Copy (); +env = divaEnv.Clone (); env.Append (REF = Split ('#src/Diva.Util/util.dll \ #src/Diva.Widgets/widgets.dll \ src/Diva.Editor.Gui/SConscript @@ -2,7 +2,7 @@ import os; Import ('divaEnv'); Import ('shellEnv'); -env = divaEnv.Copy (); +env = divaEnv.Clone (); env.Append (REF = Split ('#src/Diva.Util/util.dll \ #src/Diva.Core/core.dll \ src/Diva.Editor.Model/SConscript @@ -2,7 +2,7 @@ import os; Import ('divaEnv'); Import ('shellEnv'); -env = divaEnv.Copy (); +env = divaEnv.Clone (); env.Append (REF = Split ('#src/Diva.Util/util.dll \ #src/Diva.Widgets/widgets.dll \ src/Diva.Editor.Timeline/SConscript @@ -2,7 +2,7 @@ import os; Import ('divaEnv'); Import ('shellEnv'); -env = divaEnv.Copy (); +env = divaEnv.Clone (); env.Append (REF = Split ('#src/Diva.Util/util.dll \ #src/Diva.MainMenu/mainmenu.dll \ src/Diva.Exe/SConscript @@ -2,7 +2,7 @@ Import ('divaEnv'); Import ('shellEnv'); import os; -env = divaEnv.Copy (); +env = divaEnv.Clone (); env.Append (REF = Split ('#src/Diva.Util/util.dll')); sources = Split ('AssemblyInfo.cs \ src/Diva.Inspector/SConscript @@ -2,7 +2,7 @@ import os; Import ('divaEnv'); Import ('shellEnv'); -env = divaEnv.Copy (); +env = divaEnv.Clone (); env.Append (REF = Split ('#src/Diva.Util/util.dll \ #src/Diva.Widgets/widgets.dll \ src/Diva.MainMenu/SConscript @@ -2,7 +2,7 @@ import os; Import ('divaEnv'); Import ('shellEnv'); -env = divaEnv.Copy (); +env = divaEnv.Clone (); env.Append (REF = Split ('#src/Diva.Util/util.dll \ #src/Diva.Widgets/widgets.dll \ src/Diva.PluginLib/SConscript @@ -5,7 +5,7 @@ Import ('shellEnv'); # C ############################################################################ -localEnvC = CEnv.Copy (); +localEnvC = CEnv.Clone (); sourcesC = Split ('DivaPluginsTheoraExporter.c'); @@ -16,7 +16,7 @@ theora = localEnvC.SharedLibrary ('../libtheoraexporter', sourcesC); # Mono ######################################################################### -localEnvMono = divaEnv.Copy (); +localEnvMono = divaEnv.Clone (); localEnvMono.Append (REF = Split ('#src/Diva.PluginLib/pluginlib.dll \ #src/Diva.Widgets/widgets.dll \ src/Diva.Plugins/Theora/SConscript @@ -5,7 +5,7 @@ Import ('shellEnv'); # C ############################################################################ -localEnvC = CEnv.Copy (); +localEnvC = CEnv.Clone (); sourcesC = Split ('DivaPluginsWavExporter.c'); @@ -16,7 +16,7 @@ wav = localEnvC.SharedLibrary ('../libwavexporter', sourcesC); # Mono ######################################################################### -localEnvMono = divaEnv.Copy (); +localEnvMono = divaEnv.Clone (); localEnvMono.Append (REF = Split ('#src/Diva.PluginLib/pluginlib.dll \ #src/Diva.Widgets/widgets.dll \ src/Diva.Plugins/Wav/SConscript @@ -2,7 +2,7 @@ import os; Import ('divaEnv'); Import ('shellEnv'); -env = divaEnv.Copy (); +env = divaEnv.Clone (); env.Append (RESOURCE = Split ('Resources/diva96.png \ Resources/diva48.png \ src/Diva.Util/SConscript @@ -5,7 +5,7 @@ Import ('shellEnv'); # C ############################################################################ -localEnvC = CEnv.Copy (); +localEnvC = CEnv.Clone (); sourcesC = Split ('DivaWidgetsAspectFrame.c \ DivaWidgetsThmbRenderer.c \ @@ -20,7 +20,7 @@ widgets = localEnvC.SharedLibrary('libdivawidgets', sourcesC); # Mono ######################################################################### -localEnvMono = divaEnv.Copy (); +localEnvMono = divaEnv.Clone (); localEnvMono.Append (REF = Split ('#src/Diva.Util/util.dll \ #src/Diva.Cairo/cairo.dll')); src/Diva.Widgets/SConscript @@ -17,7 +17,7 @@ sources = Split ('AssemblyInfo.cs \ Gdv.Boilers.Pipeline.cs \ Gdv.Boilers.Common.cs'); -env = divaEnv.Copy (); +env = divaEnv.Clone (); env.Append (REF = Split ('#src/Diva.Basics/basics.dll')); src/Gdv.Boilers/SConscript @@ -5,7 +5,7 @@ Import ('shellEnv'); # C ############################################################################ -localEnvC = CEnv.Copy (); +localEnvC = CEnv.Clone (); localEnvC.Append (CPPPATH='.', CCFLAGS = Split ('-DG_LOG_DOMAIN=\\\"Gdv\\\"'), LIBS = Split ('gstinterfaces-0.10')); @@ -108,7 +108,7 @@ sourcesMono = Split ('AssemblyInfo.cs \ Gdv.ClipStore.cs \ Gdv.Handlers.cs'); -localEnvMono = monoEnv.Copy (PKG = Split ('gtk-sharp-2.0')); +localEnvMono = monoEnv.Clone (PKG = Split ('gtk-sharp-2.0')); gdvdll = localEnvMono.Dll ('gdv.dll', sourcesMono); localEnvMono.Depends (gdvdll, gdv); src/Gdv/SConscript @@ -1,8 +1,8 @@ Import ('monoEnv'); -divaEnv = monoEnv.Copy (PKG = Split ('gtk-sharp-2.0 gnome-sharp-2.0'), - REF = Split ('#src/Gdv/gdv.dll'), - GREF = Split ('Mono.Posix.dll')); +divaEnv = monoEnv.Clone (PKG = Split ('gtk-sharp-2.0 gnome-sharp-2.0'), + REF = Split ('#src/Gdv/gdv.dll'), + GREF = Split ('Mono.Posix.dll')); Export ('divaEnv'); src/SConscript @@ -3,7 +3,7 @@ Import ('CEnv'); # C ############################################################################ -localEnvC = CEnv.Copy (); +localEnvC = CEnv.Clone (); localEnvC.Append (CPPPATH = Split ('. #src/Gdv/'), CPPFLAGS = Split ('-g'), LIBS = Split ('gdv')); test/ClipPlayer/SConscript @@ -10,7 +10,7 @@ sources = Split ('Diva.Basics.Test.Parameters.cs \ Diva.Basics.Test.UnBoiling.cs \ Diva.Basics.Test.Read.cs'); -env = testEnv.Copy (); +env = testEnv.Clone (); env.Append (REF = Split ('#src/Diva.Basics/basics.dll')); test/Diva.Basics.Test/SConscript @@ -1,6 +1,6 @@ Import ('testEnv'); -env = testEnv.Copy (); +env = testEnv.Clone (); env.Append (REF = Split ('#src/Diva.Cairo/cairo.dll'), RESOURCE = Split ('Resources/thmb1.png \ test/Diva.Cairo.Test/SConscript @@ -5,7 +5,7 @@ sources = Split ('Diva.Util.NUnit.FromSMPTETest.cs \ Diva.Util.NUnit.DirTest.cs \ Diva.Util.NUnit.ToSMPTETest.cs'); -env = monoEnv.Copy (REF = Split ('#src/Gdv/gdv.dll #src/Diva.Util/util.dll'), +env = monoEnv.Clone (REF = Split ('#src/Gdv/gdv.dll #src/Diva.Util/util.dll'), PKG = Split ('mono-nunit \ gtk-sharp-2.0')); test/Diva.Util.NUnit/SConscript @@ -1,6 +1,6 @@ Import ('testEnv'); -env = testEnv.Copy (); +env = testEnv.Clone (); env.Append (REF = Split ('#src/Diva.Widgets/widgets.dll')); test/Diva.Widgets.Test/SConscript @@ -8,7 +8,7 @@ sources = Split ('Gdv.NUnit.TimeTest.cs \ Gdv.NUnit.InspectorTest.cs \ Gdv.NUnit.FormatTest.cs'); -env = monoEnv.Copy (REF = Split ('#src/Gdv/gdv.dll'), +env = monoEnv.Clone (REF = Split ('#src/Gdv/gdv.dll'), PKG = Split ('mono-nunit \ gtk-sharp-2.0')); test/Gdv.NUnit/SConscript @@ -1,7 +1,7 @@ Import ('monoEnv'); Import ('CheckPkg'); -testEnv = monoEnv.Copy (PKG = Split ('gtk-sharp-2.0 gnome-sharp-2.0'), +testEnv = monoEnv.Clone (PKG = Split ('gtk-sharp-2.0 gnome-sharp-2.0'), REF = Split ('#src/Gdv/gdv.dll'), GREF = Split ('Mono.Posix.dll')); test/SConscript @@ -3,7 +3,7 @@ Import ('CEnv'); # C ############################################################################ -localEnvC = CEnv.Copy (); +localEnvC = CEnv.Clone (); localEnvC.Append (CPPPATH = Split ('.'), CPPFLAGS = Split ('-g')); test/SeekPlayer/SConscript @@ -3,7 +3,7 @@ Import ('CEnv'); # C ############################################################################ -localEnvC = CEnv.Copy (); +localEnvC = CEnv.Clone (); localEnvC.Append (CPPPATH = Split ('. #src/Gdv/'), CPPFLAGS = Split ('-g'), LIBS = Split ('gdv')); test/SourcePlayer/SConscript @@ -3,7 +3,7 @@ Import ('CEnv'); # C ############################################################################ -localEnvC = CEnv.Copy (); +localEnvC = CEnv.Clone (); localEnvC.Append (CPPPATH = Split ('. #src/Gdv/'), CPPFLAGS = Split ('-g'), LIBS = Split ('gdv')); test/TrackPlayer/SConscript 852ff21b0a47d2055afc057609cd3a4882f45cf5 Martin Olsson martin@minimum.se http://github.com/mdk/diva/commit/c3d734d85471d92b8a8d4e3fe7f03991bb5c1e73 c3d734d85471d92b8a8d4e3fe7f03991bb5c1e73 2009-06-30T00:26:14-07:00 2009-05-15T07:15:57-07:00 Fix deprecated entities in SCons build scripts. s/.Copy/.Clone/, s/BoolOption/BoolVariable/ and s/PathOption/PathVariable/ etc. 385389b10e32b28a270beb700661863b9f50e5cd Michael Dominic K mdk@me.com