[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 725
Date       : Tue Mar 28 17:21:20 BST 2006

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

Add some cversion.h like version info.


Diff:
Index: Trunk/XaraLX/wxOil/Makefile.am
===================================================================
--- Trunk/XaraLX/wxOil/Makefile.am	(revision 724)
+++ Trunk/XaraLX/wxOil/Makefile.am	(revision 725)
@@ -15,6 +15,10 @@
 version svnversion.h:
 	@echo "const TCHAR g_pszSvnVersion[] = wxT(\"`svnversion $(TOPDIR)`\");" > svnversion.h
 	@echo "const TCHAR g_pszAppVersion[] = wxT(\"$(VERSION)\");" >> svnversion.h
+	@echo "#define	CAMELOT_VERSION_MAJOR	`echo $(VERSION) | $(AWK) 'BEGIN { FS = "."; } { printf $$1;}'`" >> svnversion.h
+	@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	\"$(VERSION) ($(USER))\"" >> svnversion.h
 
 # the application source, library search path, and link libraries
 libwxOil_a_SOURCES = \
@@ -35,7 +39,7 @@
 	dlgevt.cpp cartprov.cpp cartctl.cpp colourmat.cpp menucmds.cpp menupref.cpp \
 	rendwnd.cpp scroller.cpp helpuser.cpp oilprefs.cpp dragtrgt.cpp \
 	ctrllist.cpp dlgcol.cpp thumb.cpp dragmgr.cpp ccolbar.cpp dragcol.cpp \
-	drawctl.cpp \
+	drawctl.cpp filedlgs.cpp \
 	resources.cpp
 
 # Keep resources.cpp (the autogenerated resource file) on a separate line.
@@ -57,7 +61,7 @@
 	perl -e 'while(<>) {chomp; s/
//; push @F, $$_}; printf "xrc/dialogs.xrc xrc/strings.xrc xrc/strings.lst xrc/xaralx.po: xrc/xrc.stamp %s
",join (" ",sort @F);' > xrc/xrc.d.$$$$ ; \
 	if ( ! ( cmp -s xrc/xrc.d.$$$$ xrc/xrc.d) ) ; then touch xrc/xrc.stamp ; mv xrc/xrc.d.$$$$ xrc/xrc.d ; echo Found new resources 1>&2 ; \
 	else rm -f xrc/xrc.d.$$$$; fi ; \
-	if [[ ! ( -a xrc/xrc.stamp ) ]] ; then touch xrc/xrc.stamp ; fi }
+	if ! [ -e xrc/xrc.stamp ] ; then touch xrc/xrc.stamp ; fi }
 
 # This gives us a target for the dialogs
 @XRCINCLUDE@ xrc/xrc.d


Xara