Makefile updates to support internal source control versioning

diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
index 87d49ac..b6c1610 100644 (file)
--- a/engines/2way/src/pv_2way_sdkinfo.h
+++ b/engines/2way/src/pv_2way_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PV2WAY_ENGINE_SDKINFO_LABEL "912032"
+#define PV2WAY_ENGINE_SDKINFO_LABEL "912333"
 #define PV2WAY_ENGINE_SDKINFO_DATE 0x20090813
 
 #endif //PV_2WAY_SDKINFO_H_INCLUDED

diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h
index 3d65478..eb69889 100644 (file)
--- a/engines/author/src/pv_author_sdkinfo.h
+++ b/engines/author/src/pv_author_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVAUTHOR_ENGINE_SDKINFO_LABEL "912032"
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "912333"
 #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20090813
 
 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED

diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h
index 3f179ff..80c4455 100644 (file)
--- a/engines/player/src/pv_player_sdkinfo.h
+++ b/engines/player/src/pv_player_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVPLAYER_ENGINE_SDKINFO_LABEL "912032"
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "912333"
 #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20090813
 
 #endif //PV_PLAYER_SDKINFO_H_INCLUDED

diff --git a/tools_v2/build/make/sdkinfo.mk b/tools_v2/build/make/sdkinfo.mk
index 9d1a7d1..1ccd4e4 100644 (file)
--- a/tools_v2/build/make/sdkinfo.mk
+++ b/tools_v2/build/make/sdkinfo.mk
@@ -26,10 +26,12 @@ endif
 ifeq ($(strip $(AWK)),)
   ifeq ($(HOST_ARCH),win32)
     AWK := gawk
-    AWKCMD := "{print $$(NF-2)}"
+    WS_LAST_XID_AWKCMD := "{print $$(NF-2)}"
+    TIMED_STREAM_AWKCMD := "{print $$(NF-1),$$NF}"
   else
     AWK := awk
-    AWKCMD := '{print $$(NF-2)}'
+    WS_LAST_XID_AWKCMD := '{print $$(NF-2)}'
+    TIMED_STREAM_AWKCMD := '{print $$(NF-1),$$NF}'
   endif
 endif
 
@@ -120,10 +122,16 @@ header_time:= $(shell $(DATE) -u +"$(header_date_format)")
 basis_stream := $(strip $(shell $(ACCUREV) info 2>&1 | $(GREP) "Basis:" | $(CUT) -f2 -d":"))
 ifneq ($(strip $(basis_stream)),)
   basis_stream_type := $(shell $(ACCUREV) show -fx -s $(basis_stream) streams | $(GREP) "type=" | $(CUT) -f2 -d"\"")
+  basis_stream_time := $(shell $(ACCUREV) show -fx -s $(basis_stream) streams | $(GREP) "time=" | $(CUT) -f2 -d"\"")
+  ifneq ($(strip $(basis_stream_time)),)
+      basis_stream_type := timed
+  endif
+
+
   ws := $(shell $(ACCUREV) info | $(GREP) -i workspace | $(CUT) -f2)
-  xid_last_ws_update := $(shell $(ACCUREV) show wspaces | $(GREP) -i "^$(ws) " | $(AWK) $(AWKCMD))
+  xid_last_ws_update := $(shell $(ACCUREV) show wspaces | $(GREP) -i "^$(ws) " | $(AWK) $(WS_LAST_XID_AWKCMD))
   ifeq ($(strip $(xid_last_ws_update)),)
-    xid_last_ws_update := $(shell $(ACCUREV) show refs | $(GREP) -i "^$(ws) " | $(AWK) $(AWKCMD))
+    xid_last_ws_update := $(shell $(ACCUREV) show refs | $(GREP) -i "^$(ws) " | $(AWK) $(WS_LAST_XID_AWKCMD))
   endif
   ifeq ($(strip $(basis_stream_type)),passthrough)
     parent_basis_stream := $(shell $(ACCUREV) show -fx -s $(basis_stream) streams | $(GREP) "basis=" | $(CUT) -f2 -d"\"")
@@ -132,9 +140,16 @@ ifneq ($(strip $(basis_stream)),)
   else 
     ifeq ($(strip $(basis_stream_type)),snapshot)
       transaction_id := $(shell $(ACCUREV) show -fx -s $(basis_stream) streams | $(GREP) "name=" | $(CUT) -f2 -d"\"")
-    else ## basis is normal stream type
-      stream_name := $(basis_stream)
-      transaction_id := $(shell $(ACCUREV) hist -ft -t $(xid_last_ws_update).1 -s $(basis_stream) | $(GREP) "transaction" | $(CUT) -f1 -d";" | $(CUT) -f2 -d" " )
+    else 
+      ifeq ($(strip $(basis_stream_type)),timed)
+        timestamp := $(shell $(ACCUREV) show streams | $(GREP) -i "^$(basis_stream) " | $(AWK) $(TIMED_STREAM_AWKCMD))
+        parent_basis_stream := $(shell $(ACCUREV) show -fx -s $(basis_stream) streams | $(GREP) "basis=" | $(CUT) -f2 -d"\"")
+        transaction_id := $(shell $(ACCUREV) hist -ft -t "$(timestamp)" -s $(parent_basis_stream) | $(GREP) "transaction" | $(CUT) -f1 -d";" | $(CUT) -f2 -d" " )
+        stream_name := $(parent_basis_stream)
+      else ## basis is normal stream type
+        stream_name := $(basis_stream)
+        transaction_id := $(shell $(ACCUREV) hist -ft -t $(xid_last_ws_update).1 -s $(basis_stream) | $(GREP) "transaction" | $(CUT) -f1 -d";" | $(CUT) -f2 -d" " )
+      endif
     endif
   endif
 endif