kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 07:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-add the automatically generated version.h, so that modules can include for

Browse Source 
making build time decisions for cross asterisk version compatibility


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@104245 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-02-26 20:19:03 +00:00
parent 0036cde5f3
commit 8d90438b42
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -373,7 +373,7 @@ makeopts.embed_rules: menuselect.makeopts
@$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDFLAGS) @$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDFLAGS)
@$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LIBS) @$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LIBS)
$(SUBDIRS): main/version.c include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules $(SUBDIRS): main/version.c include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
ifeq ($(findstring $(OSARCH), mingw32 cygwin ),) ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
# Non-windows: # Non-windows:
@@ -409,6 +409,11 @@ main/version.c:
@cmp -s $@.tmp $@ || mv $@.tmp $@ @cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp @rm -f $@.tmp
include/asterisk/version.h:
@build_tools/make_version_h > $@.tmp
@cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
include/asterisk/buildopts.h: menuselect.makeopts include/asterisk/buildopts.h: menuselect.makeopts
@build_tools/make_buildopts_h > $@.tmp @build_tools/make_buildopts_h > $@.tmp
@cmp -s $@.tmp $@ || mv $@.tmp $@ @cmp -s $@.tmp $@ || mv $@.tmp $@
@@ -429,6 +434,7 @@ clean: $(SUBDIRS_CLEAN)
rm -f defaults.h rm -f defaults.h
rm -f include/asterisk/build.h rm -f include/asterisk/build.h
rm -f main/version.c rm -f main/version.c
rm -f include/asterisk/version.h
@$(MAKE) -C menuselect clean @$(MAKE) -C menuselect clean
cp -f .cleancount .lastclean cp -f .cleancount .lastclean
@@ -716,7 +722,7 @@ spec:
rpm: __rpm rpm: __rpm
__rpm: main/version.c include/asterisk/buildopts.h spec __rpm: main/version.c include/asterisk/version.h include/asterisk/buildopts.h spec
rm -rf /tmp/asterisk ; \ rm -rf /tmp/asterisk ; \
mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \ mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
$(MAKE) DESTDIR=/tmp/asterisk install ; \ $(MAKE) DESTDIR=/tmp/asterisk install ; \
@@ -841,4 +847,4 @@ pdf: asterisk.pdf
asterisk.pdf: asterisk.pdf:
$(MAKE) -C doc/tex asterisk.pdf $(MAKE) -C doc/tex asterisk.pdf
.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell main/version.c .PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell main/version.c include/asterisk/version.h

25
build_tools/make_version_h Executable file
View File

@@ -0,0 +1,25 @@
#!/bin/sh
if [ ! -f ../.flavor ]; then
cat << END
/*
* version.h
* Automatically generated
*/
#define ASTERISK_VERSION "${ASTERISKVERSION}"
#define ASTERISK_VERSION_NUM ${ASTERISKVERSIONNUM}
END
else
aadkver=`cat ../.version`
aadkflavor=`cat ../.flavor`
cat << END
/*
* version.h
* Automatically generated
*/
#define ASTERISK_VERSION "${ASTERISKVERSION} (${aadkflavor} ${aadkver})"
#define ASTERISK_VERSION_NUM ${ASTERISKVERSIONNUM}
END
fi