[openrtm-commit:00545] r2263 - branches/RELENG_1_0/OpenRTM-aist/win32/OpenRTM-aist/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2012-01-05 17:11:53 +0900 (Thu, 05 Jan 2012)
New Revision: 2263

Modified:
   branches/RELENG_1_0/OpenRTM-aist/win32/OpenRTM-aist/rtm/Makefile.am
   branches/RELENG_1_0/OpenRTM-aist/win32/OpenRTM-aist/rtm/config_rtc.h.in
Log:
config_rtc.h version number is now fetched from autoconf.

Modified: branches/RELENG_1_0/OpenRTM-aist/win32/OpenRTM-aist/rtm/Makefile.am
===================================================================
--- branches/RELENG_1_0/OpenRTM-aist/win32/OpenRTM-aist/rtm/Makefile.am	2012-01-04 15:08:16 UTC (rev 2262)
+++ branches/RELENG_1_0/OpenRTM-aist/win32/OpenRTM-aist/rtm/Makefile.am	2012-01-05 08:11:53 UTC (rev 2263)
@@ -14,13 +14,18 @@
 	rm -f *~ *.cpp *.h *.cc *.hh
 	rm -f *.sln *.suo *.ncb *.user *.vcproj *.def
 
+config_rtc.h:
+	sed -e 's/__RTM_VERSION__/$(RTM_VERSION)/g' config_rtc.h.in > temp.1
+	sed -e 's/__RTM_SHORT_VERSION__/$(RTM_SHORT_VERSION)/g' temp.1 > temp.2
+	mv temp.2 config_rtc.h
+	rm -f temp.1
+
 src:
 	cp -p $(top_srcdir)/src/lib/rtm/*.cpp .
 	cp -p $(top_srcdir)/src/lib/rtm/*.h .
-	cp -p config_rtc.h.in config_rtc.h
 	qkc -ms *.cpp
 	qkc -ms *.h
 
-dist-hook: src
+dist-hook: src config_rtc.h
 
 EXTRA_DIST = config_rtc.h.in
\ No newline at end of file

Modified: branches/RELENG_1_0/OpenRTM-aist/win32/OpenRTM-aist/rtm/config_rtc.h.in
===================================================================
--- branches/RELENG_1_0/OpenRTM-aist/win32/OpenRTM-aist/rtm/config_rtc.h.in	2012-01-04 15:08:16 UTC (rev 2262)
+++ branches/RELENG_1_0/OpenRTM-aist/win32/OpenRTM-aist/rtm/config_rtc.h.in	2012-01-05 08:11:53 UTC (rev 2263)
@@ -128,16 +128,16 @@
 /* #undef RTM_RTDSC */
 
 /* RTM short version */
-#define RTM_SHORT_VERSION "100"
+#define RTM_SHORT_VERSION "__RTM_SHORT_VERSION__"
 
 /* RTM version */
-#define RTM_VERSION "1.0.0"
+#define RTM_VERSION "__RTM_VERSION__"
 
 /* Define to 1 if you have the ANSI C header files. */
 /* #undef STDC_HEADERS 1 */
 
 /* Version number of package */
-#define VERSION "1.0.0"
+#define VERSION "__RTM_VERSION__"
 
 /* Define if using the dmalloc debugging malloc package */
 /* #undef WITH_DMALLOC */