# HG changeset patch
# User friseb123
# Date 1065516066 0
# Node ID 14900b5bf88c537100bd80182f1456e898db790c
# Parent  f165ac85394a457c99c5a03ab486a3048f5d40f9
Placing the version into a separate include: version.h
version.c extract the version number

diff -r f165ac85394a -r 14900b5bf88c kdiff3/src/kdiff3.pro
--- a/kdiff3/src/kdiff3.pro	Mon Oct 06 19:29:19 2003 +0000
+++ b/kdiff3/src/kdiff3.pro	Tue Oct 07 08:41:06 2003 +0000
@@ -1,6 +1,6 @@
 TEMPLATE = app
 CONFIG  += qt warn_on thread release
-HEADERS  = diff.h kdiff3.h merger.h optiondialog.h kreplacements/kreplacements.h \
+HEADERS  = version.h diff.h kdiff3.h merger.h optiondialog.h kreplacements/kreplacements.h \
                   directorymergewindow.h fileaccess.h kdiff3_shell.h kdiff3_part.h
 SOURCES  = diff.cpp difftextwindow.cpp kdiff3.cpp main.cpp merger.cpp mergeresultwindow.cpp \
                   optiondialog.cpp pdiff.cpp directorymergewindow.cpp fileaccess.cpp \
diff -r f165ac85394a -r 14900b5bf88c kdiff3/src/main.cpp
--- a/kdiff3/src/main.cpp	Mon Oct 06 19:29:19 2003 +0000
+++ b/kdiff3/src/main.cpp	Tue Oct 07 08:41:06 2003 +0000
@@ -17,6 +17,10 @@
 
 /***************************************************************************
  * $Log$
+ * Revision 1.2  2003/10/07 08:41:06  friseb123
+ * Placing the version into a separate include: version.h
+ * version.c extract the version number
+ *
  * Revision 1.1  2003/10/06 18:38:48  joachim99
  * KDiff3 version 0.9.70
  *                                                                   *
@@ -25,7 +29,7 @@
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <klocale.h>
-
+#include "version.h"
 #include "kdiff3_shell.h"
 
 
@@ -53,8 +57,6 @@
   { 0, 0, 0 }
 };
 
-#undef VERSION
-#define VERSION "0.9.70"
 
 #ifdef _WIN32
 #include <process.h>
diff -r f165ac85394a -r 14900b5bf88c kdiff3/src/version.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kdiff3/src/version.c	Tue Oct 07 08:41:06 2003 +0000
@@ -0,0 +1,21 @@
+#include <stdio.h>
+#include "version.h"
+main(int argv,char** argc)
+{
+  if (argv<=1)
+  {
+    printf("%s\n",VERSION);
+  }
+  else if (strcmp(argc[1],"dos")==0)
+  {
+    printf("set MUI_VERSION=\"%s\"\n",VERSION);
+  }
+  else if (strcmp(argc[1],"nsis")==0)
+  {
+    printf("!define MUI_VERSION=\"%s\"\n",VERSION);
+  }
+  else if (strcmp(argc[1],"unix")==0)
+  {
+    printf("#define MUI_VERSION=\"%s\"\n",VERSION);
+  }
+}
diff -r f165ac85394a -r 14900b5bf88c kdiff3/src/version.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kdiff3/src/version.h	Tue Oct 07 08:41:06 2003 +0000
@@ -0,0 +1,2 @@
+#undef VERSION
+#define VERSION "0.9.70"