linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 363
committer: Razzloss <razzloss@xxxxxxxxx>
branch nick: master
timestamp: Wed 2010-03-24 02:41:52 +0200
message:
  Drop config.h
removed:
  config.h.in
modified:
  .bzrignore
  SConstruct
  linux/SConscript
  linux/version.hh


--
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 '.bzrignore'
--- .bzrignore	2010-03-22 16:53:52 +0000
+++ .bzrignore	2010-03-24 00:41:52 +0000
@@ -2,4 +2,3 @@
 tags
 core
 linuxdcpp
-config.h

=== modified file 'SConstruct'
--- SConstruct	2010-03-16 09:57:54 +0000
+++ SConstruct	2010-03-24 00:41:52 +0000
@@ -54,17 +54,6 @@
 
 	return retval
 
-def config_h_build(target, source, env):
-	config_h_defines = env.Dictionary()
-
-	for a_target, a_source in zip(target, source):
-		config_h = file(str(a_target), "w")
-		config_h_in = file(str(a_source), "r")
-		config_h.write(config_h_in.read() % config_h_defines)
-		config_h_in.close()
-		config_h.close()
-
-
 # Install app icons to share/icons and all others to share/linuxdcpp/icons
 def install_icons(icons_dir, env):
 	prefix = env['FAKE_ROOT'] + os.path.join(env['PREFIX'], 'share')
@@ -294,7 +283,6 @@
 
 
 	Export('env')
-	config_h = env.AlwaysBuild(env.Command('config.h','config.h.in', config_h_build))
 
 	# Build the dcpp library
 	libdcpp = SConscript(dirs = 'dcpp', variant_dir = BUILD_PATH + 'dcpp', duplicate = 0)

=== removed file 'config.h.in'
--- config.h.in	2010-03-16 09:46:02 +0000
+++ config.h.in	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-/**
- *
- * Config.h will be re-generated by build script. Do not modify it.
- * Make all modifications to config.h.in.
- *
- **/
-
-#if %(LDCPP_BZRREV)d != 0
-	#define LDCPP_BZRREV "%(LDCPP_BZRREV)d"
-#endif
-
-
-
-

=== modified file 'linux/SConscript'
--- linux/SConscript	2010-03-15 15:04:35 +0000
+++ linux/SConscript	2010-03-24 00:41:52 +0000
@@ -7,8 +7,18 @@
 env.ParseConfig('pkg-config --cflags libglade-2.0')
 
 gui_files = env.Glob('*.cc')
+obj_files = []
+
+for i, source in enumerate(gui_files):
+	#define LDCPP_BZRREV for files that include linux/version.hh
+	if env['LDCPP_BZRREV'] != 0 and (str(source).find("wulfor.cc") != -1 or str(source).find("mainwindow.cc") != -1):
+		obj_files.append(env.Object(source, CXXFLAGS=env['CXXFLAGS'] + str('-DLDCPP_BZRREV=\\"'+str(env['LDCPP_BZRREV'])+'\\"'))) 
+	else:
+		obj_files.append(env.Object(source))
+
 
 # Build the gui_files
-obj_files = env.Object(gui_files)
+#obj_files = env.Object(gui_files)
+
 
 Return('obj_files')

=== modified file 'linux/version.hh'
--- linux/version.hh	2010-03-15 15:10:36 +0000
+++ linux/version.hh	2010-03-24 00:41:52 +0000
@@ -19,7 +19,6 @@
  * using OpenSSL with this program is allowed.
  */
 
-#include "../config.h"
 
 #ifndef LDCPP_BZRREV
 	#define LINUXDCPP_VERSION_STRING	"1.1.0"