linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 395
fixes bug(s): https://launchpad.net/bugs/655808
committer: Steven Sheehy <steven.sheehy@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-10-11 23:50:18 -0500
message:
  Update version in about menu to 1.1.0 pre-release
modified:
  SConstruct
  debian/changelog
  linux/SConscript
  linux/version.cc


--
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 'SConstruct'
--- SConstruct	2010-10-12 03:15:21 +0000
+++ SConstruct	2010-10-12 04:50:18 +0000
@@ -56,7 +56,7 @@
 	except:
 		print "failed"
 
-	context.env['LDCPP_BZRREV'] = revision
+	context.env['BZR_REVISION'] = revision
 	context.Result(revision)
 	return revision
 

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-22 03:11:11 +0000
+++ debian/changelog	2010-10-12 04:50:18 +0000
@@ -1,4 +1,4 @@
-linuxdcpp (1.1.0-1) unstable; urgency=low
+linuxdcpp (1.1.0~pre1-1) unstable; urgency=low
 
   * Initial creation of debian package
 

=== modified file 'linux/SConscript'
--- linux/SConscript	2010-10-07 04:32:15 +0000
+++ linux/SConscript	2010-10-12 04:50:18 +0000
@@ -2,21 +2,20 @@
 
 Import('env')
 
+VERSION_SOURCE = 'version.cc'
+
 # 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')
+gui_files.remove(File(VERSION_SOURCE))
 obj_files = []
 
 # Build the gui_files
-for i, source in enumerate(gui_files):
-	#define LDCPP_BZRREV for linux/version.cc
-	if str(source).find("version.cc") != -1:
-		ldcpp_bzrrev = 'LDCPP_BZRREV=\\"%s\\"' % env['LDCPP_BZRREV']
-		obj_files.append(env.Object(source, CPPDEFINES = ldcpp_bzrrev)) 
-	else:
-		obj_files.append(env.Object(source))
+obj_files = env.Object(gui_files)
+obj_file = env.Object(VERSION_SOURCE, CPPDEFINES = 'BZR_REVISION=\\"%s\\"' % env['BZR_REVISION'])
 
+obj_files.append(obj_file)
 
 Return('obj_files')

=== modified file 'linux/version.cc'
--- linux/version.cc	2010-03-24 06:29:10 +0000
+++ linux/version.cc	2010-10-12 04:50:18 +0000
@@ -21,5 +21,5 @@
 
 #include "version.hh"
 
-const char* LINUXDCPP_VERSION_STRING = "1.0.3-bzr" LDCPP_BZRREV;
+const char* LINUXDCPP_VERSION_STRING = "1.1.0~pre1~bzr" BZR_REVISION;