From: <dat...@us...> - 2006-09-05 16:14:03
|
Revision: 17169 http://svn.sourceforge.net/gaim/?rev=17169&view=rev Author: datallah Date: 2006-09-05 09:13:57 -0700 (Tue, 05 Sep 2006) Log Message: ----------- Remove VERSION file from svn, it was only needed there for wingaim and was causing problems elsewhere when it was not overwritten. Parse the version number from the configure.ac file for the wingaim build instead. Modified Paths: -------------- trunk/Makefile.am trunk/libgaim/win32/global.mak Removed Paths: ------------- trunk/VERSION Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: svn:ignore - ABOUT-NLS aclocal.m4 autom4te.cache compile confdefs.h config.cache config.guess config.h config.h.in config.h.in~ config.log config.status config.sub configure configure.2.1x depcomp Doxyfile gaim.apspec gaim.desktop gaim.pc gaim.service gaim.spec install-sh intl intltool-extract intltool-extract.in intltool-merge intltool-merge.in intltool-update intltool-update.in libtool ltconfig ltmain.sh Makefile Makefile.in missing mkinstalldirs stamp-h stamp-h1 stamp-h.in *.swp .temp-gettextize win32-install-dir gaim-*.exe + ABOUT-NLS aclocal.m4 autom4te.cache compile confdefs.h config.cache config.guess config.h config.h.in config.h.in~ config.log config.status config.sub configure configure.2.1x depcomp Doxyfile gaim.apspec gaim.desktop gaim.pc gaim.service gaim.spec install-sh intl intltool-extract intltool-extract.in intltool-merge intltool-merge.in intltool-update intltool-update.in libtool ltconfig ltmain.sh Makefile Makefile.in missing mkinstalldirs stamp-h stamp-h1 stamp-h.in *.swp .temp-gettextize win32-install-dir gaim-*.exe VERSION Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2006-09-05 15:40:24 UTC (rev 17168) +++ trunk/Makefile.am 2006-09-05 16:13:57 UTC (rev 17169) @@ -16,7 +16,6 @@ config.h.mingw \ Makefile.mingw \ README.mingw \ - VERSION \ VERSION.in \ gtk/plugins/win32/transparency/Makefile.mingw \ gtk/plugins/win32/transparency/win2ktrans.c \ Deleted: trunk/VERSION =================================================================== --- trunk/VERSION 2006-09-05 15:40:24 UTC (rev 17168) +++ trunk/VERSION 2006-09-05 16:13:57 UTC (rev 17169) @@ -1 +0,0 @@ -2.0.0dev Modified: trunk/libgaim/win32/global.mak =================================================================== --- trunk/libgaim/win32/global.mak 2006-09-05 15:40:24 UTC (rev 17168) +++ trunk/libgaim/win32/global.mak 2006-09-05 16:13:57 UTC (rev 17169) @@ -50,7 +50,17 @@ GAIM_PORTABLE_EXE := $(GAIM_GTK_TOP)/gaim-portable.exe GCCWARNINGS := -Waggregate-return -Wcast-align -Wdeclaration-after-statement -Werror-implicit-function-declaration -Wextra -Wno-sign-compare -Wno-unused-parameter -Winit-self -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wundef -GAIM_VERSION := $(shell cat $(GAIM_TOP)/VERSION) + +# parse the version number from the configure.ac file if it is newer +#AC_INIT([gaim], [2.0.0dev], [gai...@li...]) +GAIM_VERSION := $(shell \ + if [ ! $(GAIM_TOP)/VERSION -nt $(GAIM_TOP)/configure.ac ]; then \ + awk 'BEGIN {FS="\\] *, *\\["} /^AC_INIT\(.+\)/ {printf("%s",$$2); exit}' \ + $(GAIM_TOP)/configure.ac > $(GAIM_TOP)/VERSION; \ + fi; \ + cat $(GAIM_TOP)/VERSION \ +) + DEFINES += -DVERSION=\"$(GAIM_VERSION)\" \ -DHAVE_CONFIG_H This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |