diff options
Diffstat (limited to 'cpp')
56 files changed, 123 insertions, 62 deletions
diff --git a/cpp/demo/Freeze/backup/Makefile b/cpp/demo/Freeze/backup/Makefile index e9e86c97a62..f54ac51593e 100644 --- a/cpp/demo/Freeze/backup/Makefile +++ b/cpp/demo/Freeze/backup/Makefile @@ -36,7 +36,7 @@ IntLongMap.cpp: $(SLICE2FREEZE) $(SLICEPARSERLIB) clean:: -rm -f IntLongMap.h IntLongMap.cpp - -rm -f db/__* db/data/* db/logs/* + -rm -rf db/__* db/data/* db/logs/* db/__Freeze -rm -rf hotbackup hotbackup.1 include .depend diff --git a/cpp/demo/Freeze/backup/Makefile.mak b/cpp/demo/Freeze/backup/Makefile.mak index 8291ada0793..81557a2f5d8 100644 --- a/cpp/demo/Freeze/backup/Makefile.mak +++ b/cpp/demo/Freeze/backup/Makefile.mak @@ -39,6 +39,7 @@ clean:: -del /q oldlogs.txt
if exist hotbackup rmdir /q /s hotbackup
if exist hotbackup.1 rmdir /q /s hotbackup.1
+ -if exist db\__Freeze rmdir /q /s db\__Freeze
-del /q db\__*.*
-for %f in (db\data\*) do if not %f == db\data\.gitignore del /q %f
-for %f in (db\logs\*) do if not %f == db\logs\.gitignore del /q %f
diff --git a/cpp/demo/Freeze/backup/expect.py b/cpp/demo/Freeze/backup/expect.py index a9fb31abb59..1b623047051 100755 --- a/cpp/demo/Freeze/backup/expect.py +++ b/cpp/demo/Freeze/backup/expect.py @@ -27,7 +27,7 @@ def cleandb(): shutil.rmtree("db.save", True) Util.cleanDbDir("db/data") Util.cleanDbDir("db/logs") - for filename in [ os.path.join("db", f) for f in os.listdir("db") if f.startswith("__") ]: + for filename in [ os.path.join("db", f) for f in os.listdir("db") if f.startswith("__db") ]: os.remove(filename) print "cleaning databases...", diff --git a/cpp/demo/Freeze/bench/Makefile b/cpp/demo/Freeze/bench/Makefile index 3ee48516a98..95c4860f9b2 100644 --- a/cpp/demo/Freeze/bench/Makefile +++ b/cpp/demo/Freeze/bench/Makefile @@ -44,7 +44,7 @@ BenchTypes.cpp: Test.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) BenchTypes Test.ice clean:: - -rm -f db/* + -rm -rf db/* -rm -f BenchTypes.h BenchTypes.cpp include .depend diff --git a/cpp/demo/Freeze/bench/Makefile.mak b/cpp/demo/Freeze/bench/Makefile.mak index 15d0cba7c0f..f04df814740 100644 --- a/cpp/demo/Freeze/bench/Makefile.mak +++ b/cpp/demo/Freeze/bench/Makefile.mak @@ -46,6 +46,7 @@ BenchTypes.h BenchTypes.cpp: Test.ice "$(SLICE2FREEZE)" "$(SLICEPARSERLIB)" clean::
-del /q BenchTypes.h BenchTypes.cpp
-del /q Test.cpp Test.h
+ -if exist db\__Freeze rmdir /q /s db\__Freeze
-for %f in (db\*) do if not %f == db\.gitignore del /q %f
!include .depend.mak
diff --git a/cpp/demo/Freeze/casino/Makefile b/cpp/demo/Freeze/casino/Makefile index c04ffbe6b3f..7a0893f7ff8 100644 --- a/cpp/demo/Freeze/casino/Makefile +++ b/cpp/demo/Freeze/casino/Makefile @@ -47,12 +47,7 @@ $(SERVER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) -cleandb:: - -rm -f db/__catalog db/__catalogIndexList db/bet db/bank db/player - -rm -f db/log.* - -clean:: cleandb - -rm -f db/__catalog db/bet db/bank db/player - -rm -f db/log.* +clean:: + -rm -rf db/__catalog db/__catalogIndexList db/bet db/bank db/player db/log.* db/__Freeze include .depend diff --git a/cpp/demo/Freeze/casino/Makefile.mak b/cpp/demo/Freeze/casino/Makefile.mak index b0430cd032c..60f7456e3a1 100644 --- a/cpp/demo/Freeze/casino/Makefile.mak +++ b/cpp/demo/Freeze/casino/Makefile.mak @@ -52,6 +52,7 @@ $(SERVER): $(OBJS) $(SOBJS) clean::
del /q Casino.cpp Casino.h
del /q CasinoStore.cpp CasinoStore.h
+ -if exist db\__Freeze rmdir /q /s db\__Freeze
-for %f in (db\*) do if not %f == db\DB_CONFIG del /q %f
!include .depend.mak
diff --git a/cpp/demo/Freeze/customEvictor/Makefile b/cpp/demo/Freeze/customEvictor/Makefile index 51225ecec3d..314af141fb6 100644 --- a/cpp/demo/Freeze/customEvictor/Makefile +++ b/cpp/demo/Freeze/customEvictor/Makefile @@ -53,7 +53,7 @@ Database.cpp: ItemInfo.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) $(SLICE2FREEZE) -I$(slicedir) --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice clean:: - -rm -rf db/__* db/items db/log* + -rm -rf db/__* db/items db/log* db/__Freeze -rm -f Database.h Database.cpp include .depend diff --git a/cpp/demo/Freeze/customEvictor/Makefile.mak b/cpp/demo/Freeze/customEvictor/Makefile.mak index 02d5aa8f7fe..244040661a5 100644 --- a/cpp/demo/Freeze/customEvictor/Makefile.mak +++ b/cpp/demo/Freeze/customEvictor/Makefile.mak @@ -61,6 +61,7 @@ clean:: del /q Item.h Item.cpp
del /q ItemInfo.h ItemInfo.cpp
del /q Database.h Database.cpp
+ if exist db\__Freeze rmdir /q /s db\__Freeze
for %f in (db\*) do if not %f == db\DB_CONFIG del /q %f
include .depend.mak
diff --git a/cpp/demo/Freeze/library/Makefile b/cpp/demo/Freeze/library/Makefile index 20b0e9789fe..89d32fad566 100644 --- a/cpp/demo/Freeze/library/Makefile +++ b/cpp/demo/Freeze/library/Makefile @@ -69,7 +69,7 @@ LibraryTypes.cpp: Library.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) $(SLICE2FREEZE) --ice -I$(slicedir) --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes $(slicedir)/Ice/BuiltinSequences.ice Library.ice clean:: - -rm -f db/* + -rm -rf db/* -rm -f LibraryTypes.h LibraryTypes.cpp include .depend diff --git a/cpp/demo/Freeze/library/Makefile.mak b/cpp/demo/Freeze/library/Makefile.mak index 8ef0b2de7c0..aec5dceebd4 100644 --- a/cpp/demo/Freeze/library/Makefile.mak +++ b/cpp/demo/Freeze/library/Makefile.mak @@ -91,6 +91,7 @@ clean:: clean::
-del /q LibraryTypes.h LibraryTypes.cpp
+ -if exist db\__Freeze rmdir /q /s db\__Freeze
-for %f in (db\*) do if not %f == db\.gitignore del /q %f
!include .depend.mak
diff --git a/cpp/demo/Freeze/phonebook/Makefile b/cpp/demo/Freeze/phonebook/Makefile index 248bb49bcb4..5ad8f6bdd86 100644 --- a/cpp/demo/Freeze/phonebook/Makefile +++ b/cpp/demo/Freeze/phonebook/Makefile @@ -70,6 +70,6 @@ NameIndex.cpp: PhoneBook.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) clean:: -rm -f NameIndex.h NameIndex.cpp - -rm -f db/* + -rm -rf db/* include .depend diff --git a/cpp/demo/Freeze/phonebook/Makefile.mak b/cpp/demo/Freeze/phonebook/Makefile.mak index 90494bf0536..5b14af8a7c0 100644 --- a/cpp/demo/Freeze/phonebook/Makefile.mak +++ b/cpp/demo/Freeze/phonebook/Makefile.mak @@ -90,6 +90,7 @@ clean:: clean::
-del /q NameIndex.h NameIndex.cpp
+ -if exist db\__Freeze rmdir /q /s db\__Freeze
-for %f in (db\*) do if not %f == db\.gitignore del /q %f
!include .depend.mak
diff --git a/cpp/demo/Freeze/transform/Makefile b/cpp/demo/Freeze/transform/Makefile index 053c13fb4a1..dc017c217d4 100644 --- a/cpp/demo/Freeze/transform/Makefile +++ b/cpp/demo/Freeze/transform/Makefile @@ -63,10 +63,10 @@ NewContacts.cpp: NewContactData.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice cleandb:: - -rm -f db/* dbnew/* + -rm -rf db/* dbnew/* clean:: - -rm -f db/* dbnew/* + -rm -rf db/* dbnew/* -rm -f Contacts.h Contacts.cpp NewContacts.h NewContacts.cpp include .depend diff --git a/cpp/demo/Freeze/transform/Makefile.mak b/cpp/demo/Freeze/transform/Makefile.mak index 6699582dcb0..19e71243aa0 100644 --- a/cpp/demo/Freeze/transform/Makefile.mak +++ b/cpp/demo/Freeze/transform/Makefile.mak @@ -66,7 +66,9 @@ NewContacts.h NewContacts.cpp: NewContactData.ice "$(SLICE2FREEZE)" "$(SLICEPARS --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
cleandb::
+ -if exist db\__Freeze rmdir /q /s db\__Freeze
-for %f in (db\*) do if not %f == db\.gitignore del /q %f
+ -if exist dbnew\__Freeze rmdir /q /s dbnew\__Freeze
-for %f in (dbnew\*) do if not %f == dbnew\.gitignore del /q %f
clean:: cleandb
diff --git a/cpp/demo/IceGrid/allocate/Makefile.mak b/cpp/demo/IceGrid/allocate/Makefile.mak index b62b7f359bb..82a047c1228 100644 --- a/cpp/demo/IceGrid/allocate/Makefile.mak +++ b/cpp/demo/IceGrid/allocate/Makefile.mak @@ -49,6 +49,7 @@ clean:: -del /q Hello.cpp Hello.h
clean::
+ -if exist db\registry\__Freeze rmdir /q /s db\registry\__Freeze
-for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f
-for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f
diff --git a/cpp/demo/IceGrid/icebox/Makefile.mak b/cpp/demo/IceGrid/icebox/Makefile.mak index da54f3e6bab..12cb673cbdc 100644 --- a/cpp/demo/IceGrid/icebox/Makefile.mak +++ b/cpp/demo/IceGrid/icebox/Makefile.mak @@ -55,4 +55,9 @@ $(CLIENT): $(OBJS) $(COBJS) clean::
del /q Hello.cpp Hello.h
+clean::
+ -if exist db\registry\__Freeze rmdir /q /s db\registry\__Freeze
+ -for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f
+ -for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f
+
!include .depend.mak
diff --git a/cpp/demo/IceGrid/replication/Makefile.mak b/cpp/demo/IceGrid/replication/Makefile.mak index 1c82d7617d8..f11f9fb39ff 100644 --- a/cpp/demo/IceGrid/replication/Makefile.mak +++ b/cpp/demo/IceGrid/replication/Makefile.mak @@ -50,6 +50,8 @@ clean:: clean::
-for %d in (master replica1 replica2) do \
+ if exist db\%d\__Freeze rmdir /q /s db\%d\__Freeze
+ -for %d in (master replica1 replica2) do \
for %f in (db\%d\*) do if not %f == db\%d\.gitignore del /q %f
-for %d in (node1 node2) do \
for %f in (db\%d\*) do if not %f == db\%d\.gitignore del /q %f
diff --git a/cpp/demo/IceGrid/secure/Makefile.mak b/cpp/demo/IceGrid/secure/Makefile.mak index e41cb0a3e6c..2a9692a5632 100644 --- a/cpp/demo/IceGrid/secure/Makefile.mak +++ b/cpp/demo/IceGrid/secure/Makefile.mak @@ -49,12 +49,8 @@ clean:: del /q Hello.cpp Hello.h
clean::
- -for %d in (master replica1 replica2) do \
- for %f in (db\%d\*) do if not %f == db\%d\.gitignore del /q %f
- -for %d in (node1 node2) do \
- for %f in (db\%d\*) do if not %f == db\%d\.gitignore del /q %f
- -for %f in (distrib servers tmp) do if exist db\%d\%f rmdir /s /q db\%d\%f
- -for %f in (certs\*) do if not %f == certs\.gitignore del /q %f
- -if exist certs\ca rmdir /s /q certs\ca
+ -if exist db\registry\__Freeze rmdir /q /s db\registry\__Freeze
+ -for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f
+ -for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f
!include .depend.mak
diff --git a/cpp/demo/IceGrid/sessionActivation/Makefile.mak b/cpp/demo/IceGrid/sessionActivation/Makefile.mak index ae6762c32eb..6ffda7124fd 100644 --- a/cpp/demo/IceGrid/sessionActivation/Makefile.mak +++ b/cpp/demo/IceGrid/sessionActivation/Makefile.mak @@ -49,6 +49,7 @@ clean:: -del /q Hello.cpp Hello.h
clean::
+ -if exist db\registry\__Freeze rmdir /q /s db\registry\__Freeze
-for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f
-for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f
diff --git a/cpp/demo/IceGrid/simple/Makefile.mak b/cpp/demo/IceGrid/simple/Makefile.mak index b62b7f359bb..82a047c1228 100644 --- a/cpp/demo/IceGrid/simple/Makefile.mak +++ b/cpp/demo/IceGrid/simple/Makefile.mak @@ -49,6 +49,7 @@ clean:: -del /q Hello.cpp Hello.h
clean::
+ -if exist db\registry\__Freeze rmdir /q /s db\registry\__Freeze
-for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f
-for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f
diff --git a/cpp/demo/IceStorm/clock/Makefile b/cpp/demo/IceStorm/clock/Makefile index 0230436c734..5b2bbe4ddad 100644 --- a/cpp/demo/IceStorm/clock/Makefile +++ b/cpp/demo/IceStorm/clock/Makefile @@ -40,6 +40,6 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) clean:: - -rm -f db/* + -rm -rf db/* include .depend diff --git a/cpp/demo/IceStorm/clock/Makefile.mak b/cpp/demo/IceStorm/clock/Makefile.mak index 18f502a66f6..cb8134cd45d 100644 --- a/cpp/demo/IceStorm/clock/Makefile.mak +++ b/cpp/demo/IceStorm/clock/Makefile.mak @@ -50,6 +50,7 @@ clean:: -del /q Clock.cpp Clock.h
clean::
+ -if exist db\__Freeze rmdir /q /s db\__Freeze
-for %f in (db\*) do if not %f == db\.gitignore del /q %f
!include .depend.mak
diff --git a/cpp/demo/IceStorm/counter/Makefile b/cpp/demo/IceStorm/counter/Makefile index 332930f99a3..6146d6651e5 100644 --- a/cpp/demo/IceStorm/counter/Makefile +++ b/cpp/demo/IceStorm/counter/Makefile @@ -42,6 +42,6 @@ $(SERVER): $(OBJS) $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(IS_LIBS) clean:: - -rm -f db/* + -rm -rf db/* include .depend diff --git a/cpp/demo/IceStorm/counter/Makefile.mak b/cpp/demo/IceStorm/counter/Makefile.mak index b5afe469af5..63e4d8b2131 100644 --- a/cpp/demo/IceStorm/counter/Makefile.mak +++ b/cpp/demo/IceStorm/counter/Makefile.mak @@ -51,6 +51,7 @@ clean:: -del /q Counter.cpp Counter.h
clean::
+ -if exist db\__Freeze rmdir /q /s db\__Freeze
-for %f in (db\*) do if not %f == db\.gitignore del /q %f
!include .depend.mak
diff --git a/cpp/demo/IceStorm/replicated/Makefile.mak b/cpp/demo/IceStorm/replicated/Makefile.mak index 798b51afe57..dde105f156d 100644 --- a/cpp/demo/IceStorm/replicated/Makefile.mak +++ b/cpp/demo/IceStorm/replicated/Makefile.mak @@ -50,6 +50,7 @@ clean:: del /q Clock.cpp Clock.h
clean::
+ -if exist db\registry\__Freeze rmdir /q /s db\registry\__Freeze
-for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f
-for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f
diff --git a/cpp/demo/IceStorm/replicated2/Makefile b/cpp/demo/IceStorm/replicated2/Makefile index 1442e24f482..7a1cab80bbf 100644 --- a/cpp/demo/IceStorm/replicated2/Makefile +++ b/cpp/demo/IceStorm/replicated2/Makefile @@ -40,8 +40,8 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) clean:: - -rm -f db1/* - -rm -f db2/* - -rm -f db3/* + -rm -rf db1/* + -rm -rf db2/* + -rm -rf db3/* include .depend diff --git a/cpp/demo/IceStorm/replicated2/Makefile.mak b/cpp/demo/IceStorm/replicated2/Makefile.mak index 18f502a66f6..d94c081424f 100644 --- a/cpp/demo/IceStorm/replicated2/Makefile.mak +++ b/cpp/demo/IceStorm/replicated2/Makefile.mak @@ -50,6 +50,11 @@ clean:: -del /q Clock.cpp Clock.h
clean::
- -for %f in (db\*) do if not %f == db\.gitignore del /q %f
+ -if exist db1\__Freeze rmdir /q /s db1\__Freeze
+ -for %f in (db1\*) do if not %f == db1\.gitignore del /q %f
+ -if exist db2\__Freeze rmdir /q /s db2\__Freeze
+ -for %f in (db2\*) do if not %f == db2\.gitignore del /q %f
+ -if exist db3\__Freeze rmdir /q /s db3\__Freeze
+ -for %f in (db3\*) do if not %f == db3\.gitignore del /q %f
!include .depend.mak
diff --git a/cpp/demo/book/evictor_filesystem/Makefile b/cpp/demo/book/evictor_filesystem/Makefile index ced3e82bc54..dfc1c2a9e85 100644 --- a/cpp/demo/book/evictor_filesystem/Makefile +++ b/cpp/demo/book/evictor_filesystem/Makefile @@ -46,6 +46,6 @@ $(SERVER): $(OBJS) $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) clean:: - -rm -f db/* + -rm -rf db/* include .depend diff --git a/cpp/demo/book/evictor_filesystem/Makefile.mak b/cpp/demo/book/evictor_filesystem/Makefile.mak index a99f5a51177..593ba779c63 100644 --- a/cpp/demo/book/evictor_filesystem/Makefile.mak +++ b/cpp/demo/book/evictor_filesystem/Makefile.mak @@ -68,6 +68,7 @@ clean:: -del /q PersistentFilesystem.cpp PersistentFilesystem.h
clean::
+ -if exist db\__Freeze rmdir /q /s db\__Freeze
-for %f in (db\*) do if not %f == db\.gitignore del /q %f
!include .depend.mak
diff --git a/cpp/demo/book/map_filesystem/Makefile b/cpp/demo/book/map_filesystem/Makefile index 9156e4359d2..e98cf070df8 100644 --- a/cpp/demo/book/map_filesystem/Makefile +++ b/cpp/demo/book/map_filesystem/Makefile @@ -65,6 +65,6 @@ clean:: -rm -f IdentityDirectoryEntryMap.h IdentityDirectoryEntryMap.cpp clean:: - -rm -f db/* + -rm -rf db/* include .depend diff --git a/cpp/demo/book/map_filesystem/Makefile.mak b/cpp/demo/book/map_filesystem/Makefile.mak index 83af6ef837d..daffeed1215 100644 --- a/cpp/demo/book/map_filesystem/Makefile.mak +++ b/cpp/demo/book/map_filesystem/Makefile.mak @@ -86,6 +86,7 @@ clean:: -del /q IdentityDirectoryEntryMap.cpp IdentityDirectoryEntryMap.h
clean::
+ -if exist db\__Freeze rmdir /q /s db\__Freeze
-for %f in (db\*) do if not %f == db\.gitignore del /q %f
!include .depend.mak
diff --git a/cpp/src/Freeze/SharedDbEnv.cpp b/cpp/src/Freeze/SharedDbEnv.cpp index 5156b52aa00..840aa25268d 100644 --- a/cpp/src/Freeze/SharedDbEnv.cpp +++ b/cpp/src/Freeze/SharedDbEnv.cpp @@ -486,9 +486,16 @@ Freeze::SharedDbEnv::SharedDbEnv(const std::string& envName, string dbHome = properties->getPropertyWithDefault(propertyPrefix + ".DbHome", envName); // - // File lock to prevent multiple process open the same db env. + // File lock to prevent multiple process open the same db env. We create the lock + // file in a sub-directory to ensure db_hotbackup won't try to copy the file when + // backing up the environment (this would fail on Windows where copying a locked + // file isn't possible). // - _fileLock = new ::IceUtilInternal::FileLock(dbHome + "/Freeze.lock"); + if(!::IceUtilInternal::directoryExists(dbHome + "/__Freeze")) + { + ::IceUtilInternal::mkdir(dbHome + "/__Freeze", 0777); + } + _fileLock = new ::IceUtilInternal::FileLock(dbHome + "/__Freeze/lock"); _trace = properties->getPropertyAsInt("Freeze.Trace.DbEnv"); diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index 120df689b6a..ef71281b185 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -1262,7 +1262,6 @@ NodeI::canRemoveServerDirectory(const string& name) Ice::StringSeq c = readDirectory(_serversDir + "/" + name); set<string> contents(c.begin(), c.end()); contents.erase("dbs"); - contents.erase("dbs"); contents.erase("config"); contents.erase("distrib"); contents.erase("revision"); @@ -1288,6 +1287,7 @@ NodeI::canRemoveServerDirectory(const string& name) { Ice::StringSeq files = readDirectory(_serversDir + "/" + name + "/dbs/" + *p); files.erase(remove(files.begin(), files.end(), "DB_CONFIG"), files.end()); + files.erase(remove(files.begin(), files.end(), "__Freeze"), files.end()); if(!files.empty()) { return false; diff --git a/cpp/test/Freeze/complex/Makefile b/cpp/test/Freeze/complex/Makefile index 0f6a4e7c95f..6f8d8574f9f 100644 --- a/cpp/test/Freeze/complex/Makefile +++ b/cpp/test/Freeze/complex/Makefile @@ -41,6 +41,6 @@ ComplexDict.cpp: Complex.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) clean:: -rm -f ComplexDict.h ComplexDict.cpp - -rm -f db/* + -rm -rf db/* include .depend diff --git a/cpp/test/Freeze/complex/Makefile.mak b/cpp/test/Freeze/complex/Makefile.mak index 37e5d952962..b3b5a094aa7 100644 --- a/cpp/test/Freeze/complex/Makefile.mak +++ b/cpp/test/Freeze/complex/Makefile.mak @@ -56,6 +56,7 @@ Grammar.cpp Grammar.h: Grammar.y clean::
del /q Complex.cpp Complex.h
del /q ComplexDict.h ComplexDict.cpp
+ -if exist db\__Freeze rmdir /q /s db\__Freeze
-for %f in (db\*) do if not %f == db\.gitignore del /q %f
!include .depend.mak
diff --git a/cpp/test/Freeze/dbmap/Makefile b/cpp/test/Freeze/dbmap/Makefile index 2e02300a1c3..87a803658c3 100644 --- a/cpp/test/Freeze/dbmap/Makefile +++ b/cpp/test/Freeze/dbmap/Makefile @@ -65,6 +65,6 @@ clean:: -rm -f IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp -rm -f SortedMap.h SortedMap.cpp -rm -f WstringWstringMap.h WstringWstringMap.cpp - -rm -f db/* + -rm -rf db/* include .depend diff --git a/cpp/test/Freeze/dbmap/Makefile.mak b/cpp/test/Freeze/dbmap/Makefile.mak index e3525901220..5b725fbf627 100644 --- a/cpp/test/Freeze/dbmap/Makefile.mak +++ b/cpp/test/Freeze/dbmap/Makefile.mak @@ -61,6 +61,7 @@ clean:: del /q IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp
del /q SortedMap.h SortedMap.cpp
del /q WstringWstringMap.h WstringWstringMap.cpp
+ -if exist db\__Freeze rmdir /q /s db\__Freeze
-for %f in (db\*) do if not %f == db\.gitignore del /q %f
!include .depend.mak
diff --git a/cpp/test/Freeze/evictor/Makefile b/cpp/test/Freeze/evictor/Makefile index 96010832250..27ce10d2555 100644 --- a/cpp/test/Freeze/evictor/Makefile +++ b/cpp/test/Freeze/evictor/Makefile @@ -40,7 +40,6 @@ $(SERVER): $(OBJS) $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) clean:: - -rm -f db/__catalog db/__catalogIndexList db/Test - -rm -f db/log.* + -rm -rf db/__catalog db/__catalogIndexList db/Test db/log.* db/__Freeze include .depend diff --git a/cpp/test/Freeze/evictor/Makefile.mak b/cpp/test/Freeze/evictor/Makefile.mak index 6a7502def1d..2485e851174 100644 --- a/cpp/test/Freeze/evictor/Makefile.mak +++ b/cpp/test/Freeze/evictor/Makefile.mak @@ -46,6 +46,7 @@ $(SERVER): $(OBJS) $(SOBJS) clean::
del /q Test.cpp Test.h
+ -if exist db\__Freeze rmdir /q /s db\__Freeze
-for %f in (db\*) do if not %f == db\DB_CONFIG del /q %f
!include .depend.mak
diff --git a/cpp/test/Freeze/fileLock/Makefile b/cpp/test/Freeze/fileLock/Makefile index d0b4e282dbc..490f648c9af 100644 --- a/cpp/test/Freeze/fileLock/Makefile +++ b/cpp/test/Freeze/fileLock/Makefile @@ -36,6 +36,6 @@ $(CLIENTF): $(OBJFS) clean:: - -rm -f db/* + -rm -rf db/* include .depend diff --git a/cpp/test/Freeze/fileLock/Makefile.mak b/cpp/test/Freeze/fileLock/Makefile.mak index 2890575a626..155e669dbcc 100644 --- a/cpp/test/Freeze/fileLock/Makefile.mak +++ b/cpp/test/Freeze/fileLock/Makefile.mak @@ -39,6 +39,7 @@ $(CLIENTF): $(OBJFS) clean::
+ -if exist db\__Freeze rmdir /q /s db\__Freeze
-for %f in (db\*) do if not %f == db\.gitignore del /q %f
!include .depend.mak
diff --git a/cpp/test/FreezeScript/dbmap/Makefile.mak b/cpp/test/FreezeScript/dbmap/Makefile.mak index d5316d628a8..a2a1173ddbf 100644 --- a/cpp/test/FreezeScript/dbmap/Makefile.mak +++ b/cpp/test/FreezeScript/dbmap/Makefile.mak @@ -45,7 +45,8 @@ clean:: del /q TestOld.cpp TestOld.h
clean::
- del /q db\*.db db\log.* db\__catalog
+ if exist db\__Freeze rmdir /s /q db\__Freeze
+ del /q db\*.db db\log.* db\__catalog db\__catalogIndexList
if exist db_init rmdir /s /q db_init
if exist db_check rmdir /s /q db_check
if exist db_tmp rmdir /s /q db_tmp
diff --git a/cpp/test/FreezeScript/evictor/Makefile.mak b/cpp/test/FreezeScript/evictor/Makefile.mak index 8d6cda0d30f..2e4c0cf650e 100644 --- a/cpp/test/FreezeScript/evictor/Makefile.mak +++ b/cpp/test/FreezeScript/evictor/Makefile.mak @@ -37,7 +37,8 @@ clean:: del /q TestOld.cpp TestOld.h
clean::
- del /q db\*.db db\log.* db\__catalog
+ if exist db\__Freeze rmdir /s /q db\__Freeze
+ del /q db\*.db db\log.* db\__catalog db\__catalogIndexList
if exist db_check rmdir /s /q db_check
if exist db_tmp rmdir /s /q db_tmp
diff --git a/cpp/test/IceStorm/federation/Makefile b/cpp/test/IceStorm/federation/Makefile index 3601dd18206..cdf1b402652 100644 --- a/cpp/test/IceStorm/federation/Makefile +++ b/cpp/test/IceStorm/federation/Makefile @@ -41,9 +41,9 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS) clean:: -rm -f build.txt - -rm -f db/* - -rm -f 0.db/* - -rm -f 1.db/* - -rm -f 2.db/* + -rm -rf db/* + -rm -rf 0.db/* + -rm -rf 1.db/* + -rm -rf 2.db/* include .depend diff --git a/cpp/test/IceStorm/federation/Makefile.mak b/cpp/test/IceStorm/federation/Makefile.mak index 09dbec61584..29b8a2eea44 100644 --- a/cpp/test/IceStorm/federation/Makefile.mak +++ b/cpp/test/IceStorm/federation/Makefile.mak @@ -60,9 +60,13 @@ clean:: del /q build.txt
del /q Event.cpp Event.h
del /q db\topicmanager db\log.*
+ -if exist db\__Freeze rmdir /q /s db\__Freeze
-for %f in (db\*) do if not %f == db\.gitignore del /q %f
+ -if exist 0.db\__Freeze rmdir /q /s 0.db\__Freeze
-for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
+ -if exist 1.db\__Freeze rmdir /q /s 1.db\__Freeze
-for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
+ -if exist 2.db\__Freeze rmdir /q /s 2.db\__Freeze
-for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
!include .depend.mak
diff --git a/cpp/test/IceStorm/federation2/Makefile b/cpp/test/IceStorm/federation2/Makefile index a08338a4b58..c76cd495d6b 100644 --- a/cpp/test/IceStorm/federation2/Makefile +++ b/cpp/test/IceStorm/federation2/Makefile @@ -41,9 +41,9 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS) clean:: -rm -f build.txt - -rm -f db/* db2/* - -rm -f 0.db/* 0.db2/* - -rm -f 1.db/* 1.db2/* - -rm -f 2.db/* 2.db2/* + -rm -rf db/* db2/* + -rm -rf 0.db/* 0.db2/* + -rm -rf 1.db/* 1.db2/* + -rm -rf 2.db/* 2.db2/* include .depend diff --git a/cpp/test/IceStorm/federation2/Makefile.mak b/cpp/test/IceStorm/federation2/Makefile.mak index a545dddf641..1239400bf65 100644 --- a/cpp/test/IceStorm/federation2/Makefile.mak +++ b/cpp/test/IceStorm/federation2/Makefile.mak @@ -59,13 +59,21 @@ all:: clean::
del /q build.txt
del /q Event.cpp Event.h
+ -if exist db\__Freeze rmdir /q /s db\__Freeze
-for %f in (db\*) do if not %f == db\.gitignore del /q %f
+ -if exist 0.db\__Freeze rmdir /q /s 0.db\__Freeze
-for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
+ -if exist 1.db\__Freeze rmdir /q /s 1.db\__Freeze
-for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
+ -if exist 2.db\__Freeze rmdir /q /s 2.db\__Freeze
-for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
+ -if exist db2\__Freeze rmdir /q /s db2\__Freeze
-for %f in (db2\*) do if not %f == db2\.gitignore del /q %f
+ -if exist 0.db2\__Freeze rmdir /q /s 0.db2\__Freeze
-for %f in (0.db2\*) do if not %f == 0.db2\.gitignore del /q %f
+ -if exist 1.db2\__Freeze rmdir /q /s 1.db2\__Freeze
-for %f in (1.db2\*) do if not %f == 1.db2\.gitignore del /q %f
+ -if exist 2.db2\__Freeze rmdir /q /s 2.db2\__Freeze
-for %f in (2.db2\*) do if not %f == 2.db2\.gitignore del /q %f
!include .depend.mak
diff --git a/cpp/test/IceStorm/rep1/Makefile b/cpp/test/IceStorm/rep1/Makefile index 28379a0f4bb..e52aced3013 100644 --- a/cpp/test/IceStorm/rep1/Makefile +++ b/cpp/test/IceStorm/rep1/Makefile @@ -49,8 +49,8 @@ $(SUB): $(OBJS) $(SUB_OBJS) clean:: -rm -f build.txt - -rm -f 0.db/* - -rm -f 1.db/* - -rm -f 2.db/* + -rm -rf 0.db/* + -rm -rf 1.db/* + -rm -rf 2.db/* include .depend diff --git a/cpp/test/IceStorm/rep1/Makefile.mak b/cpp/test/IceStorm/rep1/Makefile.mak index 38d67087e69..03b6229b19e 100644 --- a/cpp/test/IceStorm/rep1/Makefile.mak +++ b/cpp/test/IceStorm/rep1/Makefile.mak @@ -69,8 +69,11 @@ all:: clean::
del /q build.txt
del /q Single.cpp Single.h
+ -if exist 0.db\__Freeze rmdir /q /s 0.db\__Freeze
-for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
+ -if exist 1.db\__Freeze rmdir /q /s 1.db\__Freeze
-for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
+ -if exist 2.db\__Freeze rmdir /q /s 2.db\__Freeze
-for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
!include .depend.mak
diff --git a/cpp/test/IceStorm/repstress/Makefile b/cpp/test/IceStorm/repstress/Makefile index 4f5e651ae48..980c6b38305 100644 --- a/cpp/test/IceStorm/repstress/Makefile +++ b/cpp/test/IceStorm/repstress/Makefile @@ -52,8 +52,8 @@ $(CONTROL): $(COBJS) clean:: -rm -f build.txt - -rm -f 0.db/* - -rm -f 1.db/* - -rm -f 2.db/* + -rm -rf 0.db/* + -rm -rf 1.db/* + -rm -rf 2.db/* include .depend diff --git a/cpp/test/IceStorm/repstress/Makefile.mak b/cpp/test/IceStorm/repstress/Makefile.mak index d89f3e5faed..07706853837 100644 --- a/cpp/test/IceStorm/repstress/Makefile.mak +++ b/cpp/test/IceStorm/repstress/Makefile.mak @@ -71,8 +71,11 @@ clean:: del /q build.txt
del /q Single.cpp Single.h
del /q Controller.cpp Controller.h
+ -if exist 0.db\__Freeze rmdir /q /s 0.db\__Freeze
-for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
+ -if exist 1.db\__Freeze rmdir /q /s 1.db\__Freeze
-for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
+ -if exist 2.db\__Freeze rmdir /q /s 2.db\__Freeze
-for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
!include .depend.mak
diff --git a/cpp/test/IceStorm/single/Makefile b/cpp/test/IceStorm/single/Makefile index cb20b1dfdb5..b5c8e01115c 100644 --- a/cpp/test/IceStorm/single/Makefile +++ b/cpp/test/IceStorm/single/Makefile @@ -41,9 +41,9 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS) clean:: -rm -f build.txt - -rm -f db/* - -rm -f 0.db/* - -rm -f 1.db/* - -rm -f 2.db/* + -rm -rf db/* + -rm -rf 0.db/* + -rm -rf 1.db/* + -rm -rf 2.db/* include .depend diff --git a/cpp/test/IceStorm/single/Makefile.mak b/cpp/test/IceStorm/single/Makefile.mak index 5f972d56525..d7c1d406fc6 100644 --- a/cpp/test/IceStorm/single/Makefile.mak +++ b/cpp/test/IceStorm/single/Makefile.mak @@ -60,9 +60,13 @@ all:: clean::
del /q build.txt
del /q Single.cpp Single.h
+ -if exist db\__Freeze rmdir /q /s db\__Freeze
-for %f in (db\*) do if not %f == db\.gitignore del /q %f
+ -if exist 0.db\__Freeze rmdir /q /s 0.db\__Freeze
-for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
+ -if exist 1.db\__Freeze rmdir /q /s 1.db\__Freeze
-for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
+ -if exist 2.db\__Freeze rmdir /q /s 2.db\__Freeze
-for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
!include .depend.mak
diff --git a/cpp/test/IceStorm/stress/Makefile b/cpp/test/IceStorm/stress/Makefile index a08338a4b58..c76cd495d6b 100644 --- a/cpp/test/IceStorm/stress/Makefile +++ b/cpp/test/IceStorm/stress/Makefile @@ -41,9 +41,9 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS) clean:: -rm -f build.txt - -rm -f db/* db2/* - -rm -f 0.db/* 0.db2/* - -rm -f 1.db/* 1.db2/* - -rm -f 2.db/* 2.db2/* + -rm -rf db/* db2/* + -rm -rf 0.db/* 0.db2/* + -rm -rf 1.db/* 1.db2/* + -rm -rf 2.db/* 2.db2/* include .depend diff --git a/cpp/test/IceStorm/stress/Makefile.mak b/cpp/test/IceStorm/stress/Makefile.mak index a545dddf641..1239400bf65 100644 --- a/cpp/test/IceStorm/stress/Makefile.mak +++ b/cpp/test/IceStorm/stress/Makefile.mak @@ -59,13 +59,21 @@ all:: clean::
del /q build.txt
del /q Event.cpp Event.h
+ -if exist db\__Freeze rmdir /q /s db\__Freeze
-for %f in (db\*) do if not %f == db\.gitignore del /q %f
+ -if exist 0.db\__Freeze rmdir /q /s 0.db\__Freeze
-for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f
+ -if exist 1.db\__Freeze rmdir /q /s 1.db\__Freeze
-for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f
+ -if exist 2.db\__Freeze rmdir /q /s 2.db\__Freeze
-for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f
+ -if exist db2\__Freeze rmdir /q /s db2\__Freeze
-for %f in (db2\*) do if not %f == db2\.gitignore del /q %f
+ -if exist 0.db2\__Freeze rmdir /q /s 0.db2\__Freeze
-for %f in (0.db2\*) do if not %f == 0.db2\.gitignore del /q %f
+ -if exist 1.db2\__Freeze rmdir /q /s 1.db2\__Freeze
-for %f in (1.db2\*) do if not %f == 1.db2\.gitignore del /q %f
+ -if exist 2.db2\__Freeze rmdir /q /s 2.db2\__Freeze
-for %f in (2.db2\*) do if not %f == 2.db2\.gitignore del /q %f
!include .depend.mak
|