replace .dummy with .gitignore. Fix makedist.py to remove the .gitignore files.

62 files changed, 1 insertions, 20 deletions

diff --git a/cpp/bin/.dummy b/cpp/bin/.dummy
deleted file mode 100644
index 029d4b7cff2..00000000000
--- a/cpp/bin/.dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file, so that `cvs export' creates this otherwise empty directory.
diff --git a/cpp/demo/Freeze/backup/db/data/.dummy b/cpp/demo/Freeze/backup/db/data/.dummy
deleted file mode 100644
index 029d4b7cff2..00000000000
--- a/cpp/demo/Freeze/backup/db/data/.dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file, so that `cvs export' creates this otherwise empty directory.
diff --git a/cpp/demo/IceGrid/allocate/db/node/.dummy b/cpp/demo/Freeze/backup/db/data/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/demo/IceGrid/allocate/db/node/.dummy
+++ b/cpp/demo/Freeze/backup/db/data/.gitignore
diff --git a/cpp/demo/Freeze/backup/db/logs/.dummy b/cpp/demo/Freeze/backup/db/logs/.dummy
deleted file mode 100644
index 029d4b7cff2..00000000000
--- a/cpp/demo/Freeze/backup/db/logs/.dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file, so that `cvs export' creates this otherwise empty directory.
diff --git a/cpp/demo/IceGrid/allocate/db/registry/.dummy b/cpp/demo/Freeze/backup/db/logs/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/demo/IceGrid/allocate/db/registry/.dummy
+++ b/cpp/demo/Freeze/backup/db/logs/.gitignore
diff --git a/cpp/demo/Freeze/bench/db/.dummy b/cpp/demo/Freeze/bench/db/.dummy
deleted file mode 100644
index 029d4b7cff2..00000000000
--- a/cpp/demo/Freeze/bench/db/.dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file, so that `cvs export' creates this otherwise empty directory.
diff --git a/cpp/demo/IceGrid/replication/db/master/.dummy b/cpp/demo/Freeze/bench/db/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/demo/IceGrid/replication/db/master/.dummy
+++ b/cpp/demo/Freeze/bench/db/.gitignore
diff --git a/cpp/demo/Freeze/library/db/.dummy b/cpp/demo/Freeze/library/db/.dummy
deleted file mode 100644
index 029d4b7cff2..00000000000
--- a/cpp/demo/Freeze/library/db/.dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file, so that `cvs export' creates this otherwise empty directory.
diff --git a/cpp/demo/IceGrid/replication/db/node1/.dummy b/cpp/demo/Freeze/library/db/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/demo/IceGrid/replication/db/node1/.dummy
+++ b/cpp/demo/Freeze/library/db/.gitignore
diff --git a/cpp/demo/Freeze/phonebook/db/.dummy b/cpp/demo/Freeze/phonebook/db/.dummy
deleted file mode 100644
index 029d4b7cff2..00000000000
--- a/cpp/demo/Freeze/phonebook/db/.dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file, so that `cvs export' creates this otherwise empty directory.
diff --git a/cpp/demo/IceGrid/replication/db/node2/.dummy b/cpp/demo/Freeze/phonebook/db/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/demo/IceGrid/replication/db/node2/.dummy
+++ b/cpp/demo/Freeze/phonebook/db/.gitignore
diff --git a/cpp/demo/IceGrid/replication/db/replica1/.dummy b/cpp/demo/IceGrid/allocate/db/node/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/demo/IceGrid/replication/db/replica1/.dummy
+++ b/cpp/demo/IceGrid/allocate/db/node/.gitignore
diff --git a/cpp/demo/IceGrid/replication/db/replica2/.dummy b/cpp/demo/IceGrid/allocate/db/registry/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/demo/IceGrid/replication/db/replica2/.dummy
+++ b/cpp/demo/IceGrid/allocate/db/registry/.gitignore
diff --git a/cpp/demo/IceGrid/sessionActivation/db/node/.dummy b/cpp/demo/IceGrid/replication/db/master/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/demo/IceGrid/sessionActivation/db/node/.dummy
+++ b/cpp/demo/IceGrid/replication/db/master/.gitignore
diff --git a/cpp/demo/IceGrid/sessionActivation/db/registry/.dummy b/cpp/demo/IceGrid/replication/db/node1/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/demo/IceGrid/sessionActivation/db/registry/.dummy
+++ b/cpp/demo/IceGrid/replication/db/node1/.gitignore
diff --git a/cpp/demo/IceGrid/simple/db/node/.dummy b/cpp/demo/IceGrid/replication/db/node2/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/demo/IceGrid/simple/db/node/.dummy
+++ b/cpp/demo/IceGrid/replication/db/node2/.gitignore
diff --git a/cpp/demo/IceGrid/simple/db/registry/.dummy b/cpp/demo/IceGrid/replication/db/replica1/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/demo/IceGrid/simple/db/registry/.dummy
+++ b/cpp/demo/IceGrid/replication/db/replica1/.gitignore
diff --git a/cpp/demo/IceStorm/counter/db/.dummy b/cpp/demo/IceGrid/replication/db/replica2/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/demo/IceStorm/counter/db/.dummy
+++ b/cpp/demo/IceGrid/replication/db/replica2/.gitignore
diff --git a/cpp/demo/IceStorm/replicated/db/node/.dummy b/cpp/demo/IceGrid/sessionActivation/db/node/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/demo/IceStorm/replicated/db/node/.dummy
+++ b/cpp/demo/IceGrid/sessionActivation/db/node/.gitignore
diff --git a/cpp/demo/IceStorm/replicated/db/registry/.dummy b/cpp/demo/IceGrid/sessionActivation/db/registry/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/demo/IceStorm/replicated/db/registry/.dummy
+++ b/cpp/demo/IceGrid/sessionActivation/db/registry/.gitignore
diff --git a/cpp/test/Freeze/evictor/db/.dummy b/cpp/demo/IceGrid/simple/db/node/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/test/Freeze/evictor/db/.dummy
+++ b/cpp/demo/IceGrid/simple/db/node/.gitignore
diff --git a/cpp/test/Freeze/oldevictor/db/.dummy b/cpp/demo/IceGrid/simple/db/registry/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/test/Freeze/oldevictor/db/.dummy
+++ b/cpp/demo/IceGrid/simple/db/registry/.gitignore
diff --git a/cpp/demo/IceStorm/clock/db/.dummy b/cpp/demo/IceStorm/clock/db/.dummy
deleted file mode 100644
index 029d4b7cff2..00000000000
--- a/cpp/demo/IceStorm/clock/db/.dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file, so that `cvs export' creates this otherwise empty directory.
diff --git a/cpp/test/IceGrid/activation/db/.dummy b/cpp/demo/IceStorm/clock/db/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/test/IceGrid/activation/db/.dummy
+++ b/cpp/demo/IceStorm/clock/db/.gitignore
diff --git a/cpp/test/IceGrid/allocation/db/.dummy b/cpp/demo/IceStorm/counter/db/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/test/IceGrid/allocation/db/.dummy
+++ b/cpp/demo/IceStorm/counter/db/.gitignore
diff --git a/cpp/test/IceGrid/deployer/db/.dummy b/cpp/demo/IceStorm/replicated/db/node/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/test/IceGrid/deployer/db/.dummy
+++ b/cpp/demo/IceStorm/replicated/db/node/.gitignore
diff --git a/cpp/test/IceGrid/distribution/db/.dummy b/cpp/demo/IceStorm/replicated/db/registry/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/test/IceGrid/distribution/db/.dummy
+++ b/cpp/demo/IceStorm/replicated/db/registry/.gitignore
diff --git a/cpp/demo/book/freeze_filesystem/db/.dummy b/cpp/demo/book/freeze_filesystem/db/.dummy
deleted file mode 100644
index 029d4b7cff2..00000000000
--- a/cpp/demo/book/freeze_filesystem/db/.dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file, so that `cvs export' creates this otherwise empty directory.
diff --git a/cpp/test/IceGrid/replicaGroup/db/.dummy b/cpp/demo/book/freeze_filesystem/db/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/test/IceGrid/replicaGroup/db/.dummy
+++ b/cpp/demo/book/freeze_filesystem/db/.gitignore
diff --git a/cpp/include/Glacier2/.dummy b/cpp/include/Glacier2/.dummy
deleted file mode 100644
index 029d4b7cff2..00000000000
--- a/cpp/include/Glacier2/.dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file, so that `cvs export' creates this otherwise empty directory.
diff --git a/cpp/include/IceBox/.dummy b/cpp/include/IceBox/.dummy
deleted file mode 100644
index 029d4b7cff2..00000000000
--- a/cpp/include/IceBox/.dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file, so that `cvs export' creates this otherwise empty directory.
diff --git a/cpp/include/IceStorm/.dummy b/cpp/include/IceStorm/.dummy
deleted file mode 100644
index 029d4b7cff2..00000000000
--- a/cpp/include/IceStorm/.dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file, so that `cvs export' creates this otherwise empty directory.
diff --git a/cpp/lib/.dummy b/cpp/lib/.dummy
deleted file mode 100644
index 029d4b7cff2..00000000000
--- a/cpp/lib/.dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file, so that `cvs export' creates this otherwise empty directory.
diff --git a/cpp/makedist.py b/cpp/makedist.py
index bc6151cb055..d0bdc5ae3ef 100755
--- a/cpp/makedist.py
+++ b/cpp/makedist.py
@@ -275,7 +275,7 @@ filesToRemove = [ \
     os.path.join("ice", "src", "IceUtil", "iceutile.dsp"), \
     os.path.join("ice", "src", "Slice", "slicee.dsp"), \
     ]
-filesToRemove.extend(find("ice", ".dummy"))
+filesToRemove.extend(find("ice", ".gitignore"))
 for x in filesToRemove:
     if os.path.exists(x):
         os.remove(x)
diff --git a/cpp/test/Freeze/complex/db/.dummy b/cpp/test/Freeze/complex/db/.dummy
deleted file mode 100644
index 029d4b7cff2..00000000000
--- a/cpp/test/Freeze/complex/db/.dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file, so that `cvs export' creates this otherwise empty directory.
diff --git a/cpp/test/IceGrid/replication/db/.dummy b/cpp/test/Freeze/complex/db/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/test/IceGrid/replication/db/.dummy
+++ b/cpp/test/Freeze/complex/db/.gitignore
diff --git a/cpp/test/Freeze/dbmap/db/.dummy b/cpp/test/Freeze/dbmap/db/.dummy
deleted file mode 100644
index 029d4b7cff2..00000000000
--- a/cpp/test/Freeze/dbmap/db/.dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file, so that `cvs export' creates this otherwise empty directory.
diff --git a/cpp/test/IceGrid/session/db/.dummy b/cpp/test/Freeze/dbmap/db/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/test/IceGrid/session/db/.dummy
+++ b/cpp/test/Freeze/dbmap/db/.gitignore
diff --git a/cpp/test/IceGrid/simple/db/.dummy b/cpp/test/Freeze/evictor/db/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/test/IceGrid/simple/db/.dummy
+++ b/cpp/test/Freeze/evictor/db/.gitignore
diff --git a/cpp/test/IceGrid/update/db/.dummy b/cpp/test/Freeze/oldevictor/db/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/test/IceGrid/update/db/.dummy
+++ b/cpp/test/Freeze/oldevictor/db/.gitignore
diff --git a/cpp/test/FreezeScript/dbmap/db/.dummy b/cpp/test/FreezeScript/dbmap/db/.dummy
deleted file mode 100644
index 029d4b7cff2..00000000000
--- a/cpp/test/FreezeScript/dbmap/db/.dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file, so that `cvs export' creates this otherwise empty directory.
diff --git a/cpp/test/IceStorm/federation2/db2/.dummy b/cpp/test/FreezeScript/dbmap/db/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/test/IceStorm/federation2/db2/.dummy
+++ b/cpp/test/FreezeScript/dbmap/db/.gitignore
diff --git a/cpp/test/FreezeScript/evictor/db/.dummy b/cpp/test/FreezeScript/evictor/db/.dummy
deleted file mode 100644
index 029d4b7cff2..00000000000
--- a/cpp/test/FreezeScript/evictor/db/.dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file, so that `cvs export' creates this otherwise empty directory.
diff --git a/cpp/test/IceStorm/stress/db/.dummy b/cpp/test/FreezeScript/evictor/db/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/test/IceStorm/stress/db/.dummy
+++ b/cpp/test/FreezeScript/evictor/db/.gitignore
diff --git a/cpp/test/IceStorm/stress/db2/.dummy b/cpp/test/IceGrid/activation/db/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cpp/test/IceStorm/stress/db2/.dummy
+++ b/cpp/test/IceGrid/activation/db/.gitignore
diff --git a/cpp/test/IceGrid/allocation/db/.gitignore b/cpp/test/IceGrid/allocation/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/cpp/test/IceGrid/allocation/db/.gitignore
diff --git a/cpp/test/IceGrid/deployer/db/.gitignore b/cpp/test/IceGrid/deployer/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/cpp/test/IceGrid/deployer/db/.gitignore
diff --git a/cpp/test/IceGrid/distribution/db/.gitignore b/cpp/test/IceGrid/distribution/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/cpp/test/IceGrid/distribution/db/.gitignore
diff --git a/cpp/test/IceGrid/replicaGroup/db/.gitignore b/cpp/test/IceGrid/replicaGroup/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/cpp/test/IceGrid/replicaGroup/db/.gitignore
diff --git a/cpp/test/IceGrid/replication/db/.gitignore b/cpp/test/IceGrid/replication/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/cpp/test/IceGrid/replication/db/.gitignore
diff --git a/cpp/test/IceGrid/session/db/.gitignore b/cpp/test/IceGrid/session/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/cpp/test/IceGrid/session/db/.gitignore
diff --git a/cpp/test/IceGrid/simple/db/.gitignore b/cpp/test/IceGrid/simple/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/cpp/test/IceGrid/simple/db/.gitignore
diff --git a/cpp/test/IceGrid/update/db/.gitignore b/cpp/test/IceGrid/update/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/cpp/test/IceGrid/update/db/.gitignore
diff --git a/cpp/test/IceStorm/federation/db/.dummy b/cpp/test/IceStorm/federation/db/.dummy
deleted file mode 100644
index 029d4b7cff2..00000000000
--- a/cpp/test/IceStorm/federation/db/.dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file, so that `cvs export' creates this otherwise empty directory.
diff --git a/cpp/test/IceStorm/federation/db/.gitignore b/cpp/test/IceStorm/federation/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/cpp/test/IceStorm/federation/db/.gitignore
diff --git a/cpp/test/IceStorm/federation2/db/.dummy b/cpp/test/IceStorm/federation2/db/.dummy
deleted file mode 100644
index 029d4b7cff2..00000000000
--- a/cpp/test/IceStorm/federation2/db/.dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file, so that `cvs export' creates this otherwise empty directory.
diff --git a/cpp/test/IceStorm/federation2/db/.gitignore b/cpp/test/IceStorm/federation2/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/cpp/test/IceStorm/federation2/db/.gitignore
diff --git a/cpp/test/IceStorm/federation2/db2/.gitignore b/cpp/test/IceStorm/federation2/db2/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/cpp/test/IceStorm/federation2/db2/.gitignore
diff --git a/cpp/test/IceStorm/single/db/.dummy b/cpp/test/IceStorm/single/db/.dummy
deleted file mode 100644
index 029d4b7cff2..00000000000
--- a/cpp/test/IceStorm/single/db/.dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file, so that `cvs export' creates this otherwise empty directory.
diff --git a/cpp/test/IceStorm/single/db/.gitignore b/cpp/test/IceStorm/single/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/cpp/test/IceStorm/single/db/.gitignore
diff --git a/cpp/test/IceStorm/stress/db/.gitignore b/cpp/test/IceStorm/stress/db/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/cpp/test/IceStorm/stress/db/.gitignore
diff --git a/cpp/test/IceStorm/stress/db2/.gitignore b/cpp/test/IceStorm/stress/db2/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/cpp/test/IceStorm/stress/db2/.gitignore