[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 813
Date       : Thu Apr 13 16:42:01 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/Makefile.am
   M /Trunk/XaraLX/wxOil/camelot.cpp

Add build date to about and -v


Diff:
Index: Trunk/XaraLX/wxOil/Makefile.am
===================================================================
--- Trunk/XaraLX/wxOil/Makefile.am	(revision 812)
+++ Trunk/XaraLX/wxOil/Makefile.am	(revision 813)
@@ -19,6 +19,7 @@
 	@echo "#define	CAMELOT_VERSION_MINOR	`echo $(VERSION) | $(AWK) 'BEGIN { FS = "."; } { printf $$2;}'`" >> svnversion.h
 	@echo "#define	CAMELOT_VERSION			$(VERSION)" >> svnversion.h
 	@echo "#define	CAMELOT_VERSION_STRING	wxT(\"$(VERSION) ($(USER))\")" >> svnversion.h
+	@echo "#define  CAMELOT_BUILD_DATE _T(\"`date +"%d-%b-%y %H:%M"`\")" >> svnversion.h	
 
 # the application source, library search path, and link libraries
 libwxOil_a_SOURCES = \
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp	(revision 812)
+++ Trunk/XaraLX/wxOil/camelot.cpp	(revision 813)
@@ -302,7 +302,7 @@
 		wxString			strMessage;
 
 #if defined(__WXMSW__) || defined(__WXMAC__)
-		strMessage = wxString::Format( wxT("Xara LX
Version: %s
CDraw Version: %d.%d
"), 
+		strMessage = wxString::Format( wxT("Xara LX
Version: %s
CDraw Version: %d.%03d
"), 
 			g_pszAppVersion, HIWORD(GDraw_GetVersion()), LOWORD(GDraw_GetVersion()) );
 #else
 #if FALSE == wxUSE_UNICODE
@@ -311,9 +311,9 @@
 		TCHAR			pszCDrawVer[32];
 		mbstowcs( pszCDrawVer, GDraw_GetSvnVersion(), 31 );
 #endif
-		strMessage = wxString::Format( wxT("Xara LX
Version: " PERCENT_S " (" PERCENT_S ")
CDraw Version: %d.%d (" PERCENT_S 
-			")
"), 
-			g_pszAppVersion, g_pszSvnVersion, HIWORD(GDraw_GetVersion()), LOWORD(GDraw_GetVersion()), pszCDrawVer );
+		strMessage = wxString::Format( wxT("Xara LX
Version: " PERCENT_S " (" PERCENT_S ")
CDraw Version: %d.%03d (" PERCENT_S 
+			")
Build date: " PERCENT_S "
"), 
+			g_pszAppVersion, g_pszSvnVersion, HIWORD(GDraw_GetVersion()), LOWORD(GDraw_GetVersion()), pszCDrawVer, CAMELOT_BUILD_DATE );
 #endif
 
 		tprintf( strMessage.c_str() );
@@ -800,7 +800,7 @@
 	wxString			strMessage;
 
 #if defined(__WXMSW__) || defined(__WXMAC__)
-	strMessage = wxString::Format( wxT("Xara LX
Version: %s
CDraw Version: %d.%d
Usage: XaraLX.exe [xar-file...]"), 
+	strMessage = wxString::Format( wxT("Xara LX
Version: %s
CDraw Version: %d.%03d
Usage: XaraLX.exe [xar-file...]"), 
 		g_pszAppVersion, HIWORD(GDraw_GetVersion()), LOWORD(GDraw_GetVersion()) );
 #else
 #if FALSE == wxUSE_UNICODE
@@ -809,9 +809,10 @@
 	TCHAR			pszCDrawVer[32];
 	mbstowcs( pszCDrawVer, GDraw_GetSvnVersion(), 31 );
 #endif
-	strMessage = wxString::Format( wxT("Xara LX
Version: " PERCENT_S " (" PERCENT_S ")
CDraw Version: %d.%d (" PERCENT_S 
-		")
Usage: XaraLX [xar-file...]"), 
-		g_pszAppVersion, g_pszSvnVersion, HIWORD(GDraw_GetVersion()), LOWORD(GDraw_GetVersion()), pszCDrawVer );
+	strMessage = wxString::Format( wxT("Xara LX
Version: " PERCENT_S " (" PERCENT_S ")
CDraw Version: %d.%03d (" PERCENT_S 
+		")
Build date: " PERCENT_S "
Usage: XaraLX [xar-file...]"), 
+		g_pszAppVersion, g_pszSvnVersion, HIWORD(GDraw_GetVersion()), LOWORD(GDraw_GetVersion()), pszCDrawVer, 
+		CAMELOT_BUILD_DATE );
 #endif
 
 	(void)wxMessageBox( strMessage, wxT("About Xara LX") );


Xara