linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 364
committer: Razzloss <razzloss@xxxxxxxxx>
branch nick: master
timestamp: Wed 2010-03-24 04:00:27 +0200
message:
  meh, do it properly
added:
  linux/version.cc
modified:
  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 'linux/SConscript'
--- linux/SConscript	2010-03-24 00:41:52 +0000
+++ linux/SConscript	2010-03-24 02:00:27 +0000
@@ -9,16 +9,13 @@
 gui_files = env.Glob('*.cc')
 obj_files = []
 
+# Build the gui_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):
+	#define LDCPP_BZRREV for linux/version.cc
+	if env['LDCPP_BZRREV'] != 0 and str(source).find("version.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)
-
-
 Return('obj_files')

=== added file 'linux/version.cc'
--- linux/version.cc	1970-01-01 00:00:00 +0000
+++ linux/version.cc	2010-03-24 02:00:27 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2010 Jens Oknelid, paskharen@xxxxxxxxx
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * In addition, as a special exception, compiling, linking, and/or
+ * using OpenSSL with this program is allowed.
+ */
+
+#include "version.hh"
+
+#ifndef LDCPP_BZRREV
+	const char* LINUXDCPP_VERSION_STRING = "1.0.3+bzr";
+#else
+	const char* LINUXDCPP_VERSION_STRING = "1.0.3-r" LDCPP_BZRREV;
+#endif
+
+
+

=== modified file 'linux/version.hh'
--- linux/version.hh	2010-03-24 00:41:52 +0000
+++ linux/version.hh	2010-03-24 02:00:27 +0000
@@ -20,10 +20,6 @@
  */
 
 
-#ifndef LDCPP_BZRREV
-	#define LINUXDCPP_VERSION_STRING	"1.1.0"
-#else
-	#define LINUXDCPP_VERSION_STRING	"1.1.0-r" LDCPP_BZRREV
-#endif
+extern const char* LINUXDCPP_VERSION_STRING;