#97001# simple locking to avoid ldump database corruption

2 files changed, 68 insertions, 46 deletions

diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk
index c6ee9db975af..7aadbc51aa77 100644
--- a/solenv/inc/_tg_def.mk
+++ b/solenv/inc/_tg_def.mk
@@ -40,9 +40,10 @@ $(DEF1TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl update $(DEFSTAG)
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl update $(DEFSTAG)
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -77,9 +78,10 @@ $(DEF1TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl commit
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl commit
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -214,9 +216,10 @@ $(DEF2TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl update $(DEFSTAG)
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl update $(DEFSTAG)
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -251,9 +254,10 @@ $(DEF2TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl commit
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl commit
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -388,9 +392,10 @@ $(DEF3TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl update $(DEFSTAG)
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl update $(DEFSTAG)
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -425,9 +430,10 @@ $(DEF3TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl commit
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl commit
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -562,9 +568,10 @@ $(DEF4TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl update $(DEFSTAG)
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl update $(DEFSTAG)
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -599,9 +606,10 @@ $(DEF4TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl commit
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl commit
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -736,9 +744,10 @@ $(DEF5TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl update $(DEFSTAG)
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl update $(DEFSTAG)
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -773,9 +782,10 @@ $(DEF5TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl commit
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl commit
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -910,9 +920,10 @@ $(DEF6TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl update $(DEFSTAG)
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl update $(DEFSTAG)
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -947,9 +958,10 @@ $(DEF6TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl commit
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl commit
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -1084,9 +1096,10 @@ $(DEF7TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl update $(DEFSTAG)
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl update $(DEFSTAG)
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -1121,9 +1134,10 @@ $(DEF7TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl commit
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl commit
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -1258,9 +1272,10 @@ $(DEF8TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl update $(DEFSTAG)
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl update $(DEFSTAG)
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -1295,9 +1310,10 @@ $(DEF8TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl commit
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl commit
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -1432,9 +1448,10 @@ $(DEF9TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl update $(DEFSTAG)
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl update $(DEFSTAG)
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -1469,9 +1486,10 @@ $(DEF9TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl commit
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl commit
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -1606,9 +1624,10 @@ $(DEF10TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl update $(DEFSTAG)
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl update $(DEFSTAG)
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -1643,9 +1662,10 @@ $(DEF10TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl commit
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl commit
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk
index 3b0c4e83616d..438b2a89ff1c 100644
--- a/solenv/inc/tg_def.mk
+++ b/solenv/inc/tg_def.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: tg_def.mk,v $
 #
-#   $Revision: 1.13 $
+#   $Revision: 1.14 $
 #
-#   last change: $Author: hjs $ $Date: 2001-10-26 15:36:31 $
+#   last change: $Author: hjs $ $Date: 2002-01-30 14:27:05 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -143,9 +143,10 @@ $(DEF$(TNR)TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl update $(DEFSTAG)
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl update $(DEFSTAG)
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""
@@ -180,9 +181,10 @@ $(DEF$(TNR)TARGETN) .PHONY : \
 .IF "$(UPDATER)"!=""
 .IF "$(shell +echo %_disk)"=="O"
 #
-# don't forget to hav the right DEFSTAG set!
+# don't forget to have the right DEFSTAG set!
 #
-    +$(PERL) $(COMMON_ENV_TOOLS)$/cidef.pl commit
+    +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl commit
+    ok.bat && $(RM) ok.bat
 .ENDIF			# "$(shell +echo %_disk)"=="O"
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(BUILD_SOSL)"==""