diff options
| author | Stu Tomlinson <nosnilmot@pidgin.im> | 2009-07-27 19:11:49 +0000 |
|---|---|---|
| committer | Stu Tomlinson <nosnilmot@pidgin.im> | 2009-07-27 19:11:49 +0000 |
| commit | b479d09f0823c2060487f74f0c5a026c06554029 (patch) | |
| tree | 1f143e9714857b1d43d50e55f54793d7f4722e79 /libpurple/win32 | |
| parent | a627721629297e23e033735767bdcf4b49f17935 (diff) | |
| download | pidgin-b479d09f0823c2060487f74f0c5a026c06554029.tar.gz | |
Fix windows build by adding the necessary bits to define the MTN revision
for the About dialog
Diffstat (limited to 'libpurple/win32')
| -rw-r--r-- | libpurple/win32/global.mak | 2 | ||||
| -rw-r--r-- | libpurple/win32/targets.mak | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak index af84b5159b..16171dc8b9 100644 --- a/libpurple/win32/global.mak +++ b/libpurple/win32/global.mak @@ -47,6 +47,8 @@ PURPLE_PROTOS_TOP := $(PURPLE_TOP)/protocols # Locations of important (in-tree) build targets PIDGIN_CONFIG_H := $(PIDGIN_TREE_TOP)/config.h PURPLE_CONFIG_H := $(PIDGIN_TREE_TOP)/config.h +PIDGIN_REVISION_H := $(PIDGIN_TREE_TOP)/package_revision.h +PIDGIN_REVISION_RAW_TXT := $(PIDGIN_TREE_TOP)/package_revision_raw.txt PIDGIN_IDLETRACK_DLL := $(PIDGIN_IDLETRACK_TOP)/idletrack.dll PURPLE_PURPLE_H := $(PURPLE_TOP)/purple.h PURPLE_VERSION_H := $(PURPLE_TOP)/version.h diff --git a/libpurple/win32/targets.mak b/libpurple/win32/targets.mak index dd9822f896..67b402f819 100644 --- a/libpurple/win32/targets.mak +++ b/libpurple/win32/targets.mak @@ -17,6 +17,16 @@ $(PURPLE_VERSION_H): $(PURPLE_VERSION_H).in $(PIDGIN_TREE_TOP)/configure.ac /^m4_define..purple_minor_version/ {system("sed -e s/@PURPLE_MINOR_VERSION@/"$$5"/ $@ > $@.tmp && mv $@.tmp $@");} \ /^m4_define..purple_micro_version/ {system("sed -e s/@PURPLE_MICRO_VERSION@/"$$5"/ $@ > $@.tmp && mv $@.tmp $@"); exit}' $(PIDGIN_TREE_TOP)/configure.ac +$(PIDGIN_REVISION_RAW_TXT): + (cd $(PIDGIN_TREE_TOP) && mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \ + || rm -f $@ + +$(PIDGIN_REVISION_H): $(PIDGIN_REVISION_RAW_TXT) + if [ -f $< ]; then \ + sed 's/^\(.\+\)$$/#define REVISION "\1"/' $< > $@; \ + fi + [ -f $@ ] || echo "#define REVISION \"unknown\"" > $@ + $(PURPLE_DLL) $(PURPLE_DLL).a: $(PURPLE_VERSION_H) $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) libpurple.dll |