[asterisk-commits] kpfleming: branch kpfleming/libasteriskssl r352630 - in /team/kpfleming/libas...

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Wed Jan 25 16:17:58 2012
New Revision: 352630

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=352630
Log:
Blocked revisions 352616

........
Avoid unnecessary rebuilds of main/test.c.

main/test.c includes "asterisk/version.h", when it should include
"asterisk/ast_version.h" instead (and it should use the ast_get_version()
and ast_get_version_num() functions). This commit modifies it to extract
the Asterisk version information using the proper APIs, and as a result means
that main/test.c no longer needs to be rebuilt when a Subversion checkout
is updated or modified.
........

Merged revisions 352612 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Removed:
    team/kpfleming/libasteriskssl/build_tools/make_version_h
Modified:
    team/kpfleming/libasteriskssl/   (props changed)
    team/kpfleming/libasteriskssl/Makefile
    team/kpfleming/libasteriskssl/include/asterisk/   (props changed)
    team/kpfleming/libasteriskssl/main/test.c

Propchange: team/kpfleming/libasteriskssl/
------------------------------------------------------------------------------
--- branch-10-blocked (original)
+++ branch-10-blocked Wed Jan 25 16:17:58 2012
@@ -1,1 +1,1 @@
-/branches/10:330492,330514,337433,337640,338493,352288
+/branches/10:330492,330514,337433,337640,338493,352288,352616

Propchange: team/kpfleming/libasteriskssl/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan 25 16:17:58 2012
@@ -1,1 +1,1 @@
-/trunk:1-352585
+/trunk:1-352628

Modified: team/kpfleming/libasteriskssl/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/kpfleming/libasteriskssl/Makefile?view=diff&rev=352630&r1=352629&r2=352630
==============================================================================
--- team/kpfleming/libasteriskssl/Makefile (original)
+++ team/kpfleming/libasteriskssl/Makefile Wed Jan 25 16:17:58 2012
@@ -400,7 +400,7 @@
 	+@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDFLAGS)
 	+@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LIBS)
 
-$(SUBDIRS): main/version.c include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
+$(SUBDIRS): main/version.c include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
 
 ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
     # Non-windows:
@@ -436,11 +436,6 @@
 	@cmp -s $@.tmp $@ || mv $@.tmp $@
 	@rm -f $@.tmp
 
-include/asterisk/version.h: FORCE
-	@build_tools/make_version_h > $@.tmp
-	@cmp -s $@.tmp $@ || mv $@.tmp $@
-	@rm -f $@.tmp
-
 include/asterisk/buildopts.h: menuselect.makeopts
 	@build_tools/make_buildopts_h > $@.tmp
 	@cmp -s $@.tmp $@ || mv $@.tmp $@
@@ -463,7 +458,6 @@
 	rm -f defaults.h
 	rm -f include/asterisk/build.h
 	rm -f main/version.c
-	rm -f include/asterisk/version.h
 	@$(MAKE) -C menuselect clean
 	cp -f .cleancount .lastclean
 

Propchange: team/kpfleming/libasteriskssl/include/asterisk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jan 25 16:17:58 2012
@@ -1,4 +1,3 @@
 build.h
 buildopts.h
 autoconfig.h
-version.h

Modified: team/kpfleming/libasteriskssl/main/test.c
URL: http://svnview.digium.com/svn/asterisk/team/kpfleming/libasteriskssl/main/test.c?view=diff&rev=352630&r1=352629&r2=352630
==============================================================================
--- team/kpfleming/libasteriskssl/main/test.c (original)
+++ team/kpfleming/libasteriskssl/main/test.c Wed Jan 25 16:17:58 2012
@@ -38,7 +38,7 @@
 #include "asterisk/utils.h"
 #include "asterisk/cli.h"
 #include "asterisk/term.h"
-#include "asterisk/version.h"
+#include "asterisk/ast_version.h"
 #include "asterisk/paths.h"
 #include "asterisk/time.h"
 #include "asterisk/manager.h"
@@ -386,14 +386,14 @@
 				last_results.total_time / 1000, last_results.total_time % 1000,
 				last_results.total_tests);
 		fprintf(f_xml, "\t<properties>\n");
-		fprintf(f_xml, "\t\t<property name=\"version\" value=\"%s\"/>\n", ASTERISK_VERSION);
+		fprintf(f_xml, "\t\t<property name=\"version\" value=\"%s\"/>\n", ast_get_version());
 		fprintf(f_xml, "\t</properties>\n");
 	}
 
 	/* txt header information */
 	if (f_txt) {
-		fprintf(f_txt, "Asterisk Version:         %s\n", ASTERISK_VERSION);
-		fprintf(f_txt, "Asterisk Version Number:  %d\n", ASTERISK_VERSION_NUM);
+		fprintf(f_txt, "Asterisk Version:         %s\n", ast_get_version());
+		fprintf(f_txt, "Asterisk Version Number:  %s\n", ast_get_version_num());
 		fprintf(f_txt, "Number of Tests:          %d\n", last_results.total_tests);
 		fprintf(f_txt, "Number of Tests Executed: %d\n", (last_results.total_passed + last_results.total_failed));
 		fprintf(f_txt, "Passed Tests:             %d\n", last_results.total_passed);