linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 341
committer: Steven Sheehy <steven.sheehy@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2009-11-02 21:13:47 -0600
message:
  Bumped minimum scons version to 0.98.1 to resolve multiple building issues
modified:
  Changelog.txt
  SConstruct
  dcpp/SConscript
  linux/SConscript


--
lp:linuxdcpp
https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk

Your team LinuxDC++ Team is subscribed to branch lp:linuxdcpp.
To unsubscribe from this branch go to https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk/+edit-subscription.

=== modified file 'Changelog.txt'
--- Changelog.txt	2009-11-02 06:01:55 +0000
+++ Changelog.txt	2009-11-03 03:13:47 +0000
@@ -37,6 +37,7 @@
 [2009-10-21] Added a debian folder, man page and desktop file. (Steven)
 [2009-11-02] lp#442475: Fixed crash when adding a search results from user who has left the hub. (Razzloss)
 [2009-11-02] lp#339700: Fixed a rare crash when switching tabs. (Steven)
+[2009-11-02] Bumped minimum scons version to 0.98.1 to resolve multiple building issues. (Steven)
 
 *** 1.0.3 2009-02-01 ***
 [2008-08-10] lp#256236: Fixed a crash on startup when using auto-open options.

=== modified file 'SConstruct'
--- SConstruct	2009-10-21 04:33:29 +0000
+++ SConstruct	2009-11-03 03:13:47 +0000
@@ -4,9 +4,8 @@
 import os
 import commands
 import string
-import glob
 
-EnsureSConsVersion(0, 96)
+EnsureSConsVersion(0, 98, 1)
 
 APP_NAME = 'linuxdcpp'
 BUILD_PATH = '#/build/'
@@ -65,16 +64,16 @@
 
 # Parameters are only sticky from scons -> scons install, otherwise they're cleared.
 if 'install' in COMMAND_LINE_TARGETS:
-	opts = Options('build/sconf/scache.conf')
+	vars = Variables('build/sconf/scache.conf')
 else:
-	opts = Options()
+	vars = Variables()
 
-opts.AddOptions(
-	BoolOption('debug', 'Compile the program with debug information', 0),
-	BoolOption('release', 'Compile the program with optimizations', 0),
-	BoolOption('profile', 'Compile the program with profiling information', 0),
-	PathOption('PREFIX', 'Compile the program with PREFIX as the root for installation', '/usr/local'),
-	('FAKE_ROOT', 'Make scons install the program under a fake root (for gentoo ebuilds)', '')
+vars.AddVariables(
+	BoolVariable('debug', 'Compile the program with debug information', 0),
+	BoolVariable('release', 'Compile the program with optimizations', 0),
+	BoolVariable('profile', 'Compile the program with profiling information', 0),
+	PathVariable('PREFIX', 'Compile the program with PREFIX as the root for installation', '/usr/local', PathVariable.PathIsDir),
+	('FAKE_ROOT', 'Make scons install the program under a fake root', '')
 )
 
 
@@ -82,7 +81,7 @@
 # Initialization
 # ----------------------------------------------------------------------
 
-env = Environment(ENV = os.environ, options = opts)
+env = Environment(ENV = os.environ, options = vars)
 
 conf = Configure(env,
 	custom_tests =
@@ -110,8 +109,8 @@
 	conf.env['CFLAGS'] = os.environ['CFLAGS'].split()
 
 env.SConsignFile('build/sconf/.sconsign')
-opts.Save('build/sconf/scache.conf', env)
-Help(opts.GenerateHelpText(env))
+vars.Save('build/sconf/scache.conf', env)
+Help(vars.GenerateHelpText(env))
 
 # ----------------------------------------------------------------------
 # Dependencies
@@ -257,14 +256,11 @@
 
 	Export('env')
 
-	# @todo: Change build_dir to variant_dir when required SCons version is >=1.0.0
-	# 	(variant_dir doesn't seem to work with 0.97 and everything is built in ./dcpp/ and ./linux/
-	#	 -> libdcpp.a is not found when linking, as it is in ./dcpp/libdcpp.a instead of build/dcpp..)
 	# Build the dcpp library
-	libdcpp = SConscript(dirs = 'dcpp', build_dir = BUILD_PATH + 'dcpp', duplicate = 0)
+	libdcpp = SConscript(dirs = 'dcpp', variant_dir = BUILD_PATH + 'dcpp', duplicate = 0)
 
 	# Build the GUI
-	obj_files = SConscript(dirs = 'linux', build_dir = BUILD_PATH + 'gui', duplicate = 0)
+	obj_files = SConscript(dirs = 'linux', variant_dir = BUILD_PATH + 'gui', duplicate = 0)
 
 	# Create the executable
 	env.Program(target = APP_NAME, source = [libdcpp, obj_files])
@@ -277,8 +273,8 @@
 
 else:
 
-	glade_files = glob.glob('glade/*.glade')
-	text_files = glob.glob('*.txt')
+	glade_files = env.Glob('glade/*.glade')
+	text_files = env.Glob('*.txt')
 	prefix = env['FAKE_ROOT'] + env['PREFIX']
 
 	install_icons('icons/hicolor/', env)

=== modified file 'dcpp/SConscript'
--- dcpp/SConscript	2009-02-23 01:47:25 +0000
+++ dcpp/SConscript	2009-11-03 03:13:47 +0000
@@ -1,65 +1,13 @@
 # -*- coding: utf-8 -*-
 
-# todo: Replace this with env.Glob('*.cpp') when Scons 0.98 is widespread enough 
-# (glob.glob() doesn't work here due to the use of a variant dir).
-dcpp_files = [
-	'AdcCommand.cpp',
-	'AdcHub.cpp',
-	'ADLSearch.cpp',
-	'BufferedSocket.cpp',
-	'BZUtils.cpp',
-	'Client.cpp',
-	'ClientManager.cpp',
-	'ConnectionManager.cpp',
-	'CryptoManager.cpp',
-	'DCPlusPlus.cpp',
-	'DirectoryListing.cpp',
-	'Download.cpp',
-	'DownloadManager.cpp',
-	'Encoder.cpp',
-	'Exception.cpp',
-	'FavoriteManager.cpp',
-	'File.cpp',
-	'FinishedItem.cpp',
-	'FinishedManager.cpp',
-	'HashBloom.cpp',
-	'HashManager.cpp',
-	'HttpConnection.cpp',
-	'LogManager.cpp',
-	'NmdcHub.cpp',
-	'QueueItem.cpp',
-	'QueueManager.cpp',
-	'ResourceManager.cpp',
-	'SearchManager.cpp',
-	'SearchResult.cpp',
-	'ServerSocket.cpp',
-	'SettingsManager.cpp',
-	'SFVReader.cpp',
-	'ShareManager.cpp',
-	'SimpleXML.cpp',
-	'Socket.cpp',
-	'SSL.cpp',
-	'SSLSocket.cpp',
-	'stdinc.cpp',
-	'StringTokenizer.cpp',
-	'Text.cpp',
-	'Thread.cpp',
-	'TigerHash.cpp',
-	'TimerManager.cpp',
-	'Transfer.cpp',
-	'Upload.cpp',
-	'UploadManager.cpp',
-	'UserConnection.cpp',
-	'User.cpp',
-	'Util.cpp',
-	'ZUtils.cpp']
-
 Import('env')
 
 # We don't want to add this CXXFLAG globally so we copy the env
 env = env.Clone()
 env.Append(CXXFLAGS = ['-DBUILDING_DCPP'])
 
+dcpp_files = env.Glob('*.cpp')
+
 # Build the dcpp files and create the library
 libdcpp  = env.StaticLibrary(target = 'dcpp', source = dcpp_files)
 

=== modified file 'linux/SConscript'
--- linux/SConscript	2009-05-15 03:16:33 +0000
+++ linux/SConscript	2009-11-03 03:13:47 +0000
@@ -1,37 +1,13 @@
 # -*- coding: utf-8 -*-
 
-# todo: Replace this with env.Glob('*.cpp') when Scons 0.98 is widespread enough 
-# (glob.glob() doesn't work here due to the use of a variant dir).
-gui_files = [
-	'bookentry.cc',
-	'dialogentry.cc',
-	'downloadqueue.cc',
-	'entry.cc',
-	'favoritehubs.cc',
-	'finishedtransfers.cc',
-	'hashdialog.cc',
-	'hub.cc',
-	'mainwindow.cc',
-	'privatemessage.cc',
-	'publichubs.cc',
-	'search.cc',
-	'settingsdialog.cc',
-	'settingsmanager.cc',
-	'sharebrowser.cc',
-	'transfers.cc',
-	'treeview.cc',
-	'UserCommandMenu.cc',
-	'wulfor.cc',
-	'wulformanager.cc',
-	'WulforUtil.cc'
-]
-
 Import('env')
 
 # We don't want to add these CFLAGS globally so we copy the env
 env = env.Clone()
 env.ParseConfig('pkg-config --cflags libglade-2.0')
 
+gui_files = env.Glob('*.cc')
+
 # Build the gui_files
 obj_files = env.Object(gui_files)