22 files changed, 43 insertions, 65 deletions
diff --git a/cpp/config/makegitignore.py b/cpp/config/makegitignore.py
index b76e2138746..3667df7b9ef 100755
--- a/cpp/config/makegitignore.py
+++ b/cpp/config/makegitignore.py
@@ -56,18 +56,9 @@ def createGitIgnore(filename, gitIgnoreFiles):
             x = x.replace("rm -f", "", 1)
         elif x.startswith("rm -rf"):
             x = x.replace("rm -rf", "", 1)
-        elif x.startswith("make[1]: Entering directory"): # Change cwd
-            beg = x.find("`")
-            end = x.rfind("'")
-            if beg == -1 or end == -1:
-                continue
-            x = x[beg + 1:end]
-            cwdStack.append(cwd)
-            cwd = x
-            continue
-        elif x.startswith("make[1]: Leaving directory"): # Back to previous cwd
-            cwd = cwdStack.pop()
-            continue
+        elif x.startswith("making clean in"):
+            # Don't clean sub-directories
+            break
         else:
             continue
 
@@ -86,6 +77,15 @@ def createGitIgnore(filename, gitIgnoreFiles):
                 k = os.path.join(cwd, ".gitignore")
                 v = f + "\n"
 
+            if v.find(".so.") > 0:
+                continue                   
+            elif v.endswith(".so\n"):
+                v = v.replace(".so", ".*")
+            elif v.endswith(".dylib\n"):
+                v = v.replace(".dylib", ".*")
+                if v.find('.', 0, len(v) - 3) > 0:
+                    continue
+
             k = os.path.normpath(k)
             if not gitIgnoreFiles.has_key(k):
                 gitIgnoreFiles[k] = [ ]
@@ -154,7 +154,8 @@ excludePath = [ os.path.join(toplevel, "cpp", "bin"), os.path.join(toplevel, "cp
 for (path, files) in gitIgnoreFiles.iteritems():
     if os.path.dirname(path) in excludePath:
         continue
-    
+    if not os.path.exists(path):
+        print files
     gitIgnore = open(path, "w")
     gitIgnore.write(preamble);
     gitIgnore.writelines(files)
diff --git a/cpp/demo/Ice/plugin/.gitignore b/cpp/demo/Ice/plugin/.gitignore
index c8ca8d89cb9..2195b2c868c 100644
--- a/cpp/demo/Ice/plugin/.gitignore
+++ b/cpp/demo/Ice/plugin/.gitignore
@@ -3,9 +3,7 @@
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 client
 server
-libLoggerPlugin.so
-libLoggerPlugin.so.34
-libHelloPlugin.so
-libHelloPlugin.so.34
+libLoggerPlugin.*
+libHelloPlugin.*
 Hello.cpp
 Hello.h
diff --git a/cpp/demo/IceBox/hello/.gitignore b/cpp/demo/IceBox/hello/.gitignore
index 20a7b29a4a9..eecf1d6c204 100644
--- a/cpp/demo/IceBox/hello/.gitignore
+++ b/cpp/demo/IceBox/hello/.gitignore
@@ -2,6 +2,6 @@
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 client
-libHelloService.so
+libHelloService.*
 Hello.cpp
 Hello.h
diff --git a/cpp/demo/IceGrid/icebox/.gitignore b/cpp/demo/IceGrid/icebox/.gitignore
index 2169402e345..ee30c50ee81 100644
--- a/cpp/demo/IceGrid/icebox/.gitignore
+++ b/cpp/demo/IceGrid/icebox/.gitignore
@@ -2,7 +2,7 @@
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 client
-libHelloService.so
+libHelloService.*
 Hello.cpp
 Hello.h
 db/node/*
diff --git a/cpp/demo/IceGrid/secure/.gitignore b/cpp/demo/IceGrid/secure/.gitignore
index ebb4189ea80..8e835bbc3ed 100644
--- a/cpp/demo/IceGrid/secure/.gitignore
+++ b/cpp/demo/IceGrid/secure/.gitignore
@@ -5,8 +5,7 @@ client
 server
 Hello.cpp
 Hello.h
-db/registry/*
-db/node/*
 db/master/*
 db/slave/*
+db/node/*
 certs/*
diff --git a/cpp/demo/IceGrid/secure/Makefile b/cpp/demo/IceGrid/secure/Makefile
index d5a3c124913..123d592821e 100644
--- a/cpp/demo/IceGrid/secure/Makefile
+++ b/cpp/demo/IceGrid/secure/Makefile
@@ -40,6 +40,6 @@ $(SERVER): $(OBJS) $(SOBJS)
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS)
 
 clean::
-	-rm -rf db/registry/* db/node/* certs/*
+	-rm -rf db/master/* db/slave/* db/node/* certs/*
 
 include .depend
diff --git a/cpp/include/Ice/.gitignore b/cpp/include/Ice/.gitignore
index 4b45c800da2..1000b4fb87c 100644
--- a/cpp/include/Ice/.gitignore
+++ b/cpp/include/Ice/.gitignore
@@ -14,8 +14,6 @@ FacetMap.h
 Identity.h
 ImplicitContextF.h
 ImplicitContext.h
-InstrumentationF.h
-Instrumentation.h
 LocalException.h
 LocatorF.h
 Locator.h
@@ -26,6 +24,8 @@ ObjectAdapterF.h
 ObjectAdapter.h
 ObjectFactoryF.h
 ObjectFactory.h
+Instrumentation.h
+InstrumentationF.h
 PluginF.h
 Plugin.h
 ProcessF.h
diff --git a/cpp/include/IceStorm/.gitignore b/cpp/include/IceStorm/.gitignore
index 648cffd9098..bb5bf8a8dc7 100644
--- a/cpp/include/IceStorm/.gitignore
+++ b/cpp/include/IceStorm/.gitignore
@@ -1,5 +1,5 @@
 // Generated by makegitignore.py
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
-IceStorm.h
 Metrics.h
+IceStorm.h
diff --git a/cpp/src/Ice/.gitignore b/cpp/src/Ice/.gitignore
index 5bc00632736..d0885c785ae 100644
--- a/cpp/src/Ice/.gitignore
+++ b/cpp/src/Ice/.gitignore
@@ -14,8 +14,6 @@ FacetMap.cpp
 Identity.cpp
 ImplicitContextF.cpp
 ImplicitContext.cpp
-InstrumentationF.cpp
-Instrumentation.cpp
 LocalException.cpp
 LocatorF.cpp
 Locator.cpp
@@ -26,6 +24,8 @@ ObjectAdapterF.cpp
 ObjectAdapter.cpp
 ObjectFactoryF.cpp
 ObjectFactory.cpp
+Instrumentation.cpp
+InstrumentationF.cpp
 PluginF.cpp
 Plugin.cpp
 ProcessF.cpp
@@ -58,10 +58,13 @@ LocatorF.h
 Locator.h
 LoggerF.h
 Logger.h
+Metrics.h
 ObjectAdapterF.h
 ObjectAdapter.h
 ObjectFactoryF.h
 ObjectFactory.h
+Instrumentation.h
+InstrumentationF.h
 PluginF.h
 Plugin.h
 ProcessF.h
@@ -75,3 +78,4 @@ ServantLocator.h
 SliceChecksumDict.h
 StatsF.h
 Stats.h
+Version.h
diff --git a/cpp/src/IceGrid/FreezeDB/.gitignore b/cpp/src/IceGrid/FreezeDB/.gitignore
index c1743c2721a..9a9fe4ebd8c 100644
--- a/cpp/src/IceGrid/FreezeDB/.gitignore
+++ b/cpp/src/IceGrid/FreezeDB/.gitignore
@@ -7,9 +7,3 @@ IdentityObjectInfoDict.h
 IdentityObjectInfoDict.cpp
 StringAdapterInfoDict.h
 StringAdapterInfoDict.cpp
-StringApplicationInfoDict.h
-StringApplicationInfoDict.cpp
-IdentityObjectInfoDict.h
-IdentityObjectInfoDict.cpp
-StringAdapterInfoDict.h
-StringAdapterInfoDict.cpp
diff --git a/cpp/src/IceStorm/.gitignore b/cpp/src/IceStorm/.gitignore
index 01f6e083475..bb229c5474b 100644
--- a/cpp/src/IceStorm/.gitignore
+++ b/cpp/src/IceStorm/.gitignore
@@ -1,10 +1,14 @@
 // Generated by makegitignore.py
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
+Metrics.cpp
+Instrumentation.cpp
 Election.cpp
 IceStormInternal.cpp
 LLURecord.cpp
 SubscriberRecord.cpp
+Metrics.h
+Instrumentation.h
 Election.h
 IceStormInternal.h
 LLURecord.h
diff --git a/cpp/src/IceStorm/FreezeDB/.gitignore b/cpp/src/IceStorm/FreezeDB/.gitignore
index d02d62438a4..5dd2c6f2b61 100644
--- a/cpp/src/IceStorm/FreezeDB/.gitignore
+++ b/cpp/src/IceStorm/FreezeDB/.gitignore
@@ -15,17 +15,3 @@ LLUMap.h
 LLUMap.cpp
 LinkRecord.h
 LinkRecord.cpp
-V32Format.cpp
-V31Format.cpp
-V32Format.h
-V31Format.h
-SubscriberMap.h
-SubscriberMap.cpp
-V32FormatDB.h
-V32FormatDB.cpp
-V31FormatDB.h
-V31FormatDB.cpp
-LLUMap.h
-LLUMap.cpp
-LinkRecord.h
-LinkRecord.cpp
diff --git a/cpp/test/Ice/background/.gitignore b/cpp/test/Ice/background/.gitignore
index bba2ac0bf3a..3b65bea68f8 100644
--- a/cpp/test/Ice/background/.gitignore
+++ b/cpp/test/Ice/background/.gitignore
@@ -3,8 +3,6 @@
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 client
 server
-libTestTransport.so.3.4.2
-libTestTransport.so.34
-libTestTransport.so
+libTestTransport.*
 Test.cpp
 Test.h
diff --git a/cpp/test/Ice/checksum/server/.gitignore b/cpp/test/Ice/checksum/server/.gitignore
index 923da7fc497..4d88c2a958a 100644
--- a/cpp/test/Ice/checksum/server/.gitignore
+++ b/cpp/test/Ice/checksum/server/.gitignore
@@ -6,8 +6,3 @@ Test.cpp
 Types.cpp
 Test.h
 Types.h
-server
-Test.cpp
-Types.cpp
-Test.h
-Types.h
diff --git a/cpp/test/Ice/hash/.gitignore b/cpp/test/Ice/hash/.gitignore
index d780341c0e4..505a9066685 100644
--- a/cpp/test/Ice/hash/.gitignore
+++ b/cpp/test/Ice/hash/.gitignore
@@ -2,5 +2,5 @@
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 client
-Test.h
 Test.cpp
+Test.h
diff --git a/cpp/test/Ice/plugin/.gitignore b/cpp/test/Ice/plugin/.gitignore
index a86ad423f93..2b0c67f9d75 100644
--- a/cpp/test/Ice/plugin/.gitignore
+++ b/cpp/test/Ice/plugin/.gitignore
@@ -2,6 +2,4 @@
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 client
-plugins/libTestPlugin.so.3.4.2
-plugins/libTestPlugin.so.34
-plugins/libTestPlugin.so
+plugins/libTestPlugin.*
diff --git a/cpp/test/Ice/slicing/exceptions/.gitignore b/cpp/test/Ice/slicing/exceptions/.gitignore
index 3a6d24b8114..ed8bb406a1e 100644
--- a/cpp/test/Ice/slicing/exceptions/.gitignore
+++ b/cpp/test/Ice/slicing/exceptions/.gitignore
@@ -4,13 +4,13 @@
 client
 server
 serveramd
-ClientPrivate.cpp
-ClientPrivate.h
 Test.cpp
 TestAMD.cpp
+ClientPrivate.cpp
 ServerPrivate.cpp
 ServerPrivateAMD.cpp
 Test.h
 TestAMD.h
+ClientPrivate.h
 ServerPrivate.h
 ServerPrivateAMD.h
diff --git a/cpp/test/IceBox/admin/.gitignore b/cpp/test/IceBox/admin/.gitignore
index bc5fb97a328..881ee03f814 100644
--- a/cpp/test/IceBox/admin/.gitignore
+++ b/cpp/test/IceBox/admin/.gitignore
@@ -2,6 +2,6 @@
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 client
-libTestService.so
+libTestService.*
 Test.cpp
 Test.h
diff --git a/cpp/test/IceBox/configuration/.gitignore b/cpp/test/IceBox/configuration/.gitignore
index bc5fb97a328..881ee03f814 100644
--- a/cpp/test/IceBox/configuration/.gitignore
+++ b/cpp/test/IceBox/configuration/.gitignore
@@ -2,6 +2,6 @@
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 client
-libTestService.so
+libTestService.*
 Test.cpp
 Test.h
diff --git a/cpp/test/IceGrid/deployer/.gitignore b/cpp/test/IceGrid/deployer/.gitignore
index 03998a30ea1..7f02284cfee 100644
--- a/cpp/test/IceGrid/deployer/.gitignore
+++ b/cpp/test/IceGrid/deployer/.gitignore
@@ -3,7 +3,7 @@
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 client
 server
-libTestService.so
+libTestService.*
 Test.cpp
 Test.h
 build.txt
diff --git a/cpp/test/IceGrid/noRestartUpdate/.gitignore b/cpp/test/IceGrid/noRestartUpdate/.gitignore
index 43222375494..d12de56b4ca 100644
--- a/cpp/test/IceGrid/noRestartUpdate/.gitignore
+++ b/cpp/test/IceGrid/noRestartUpdate/.gitignore
@@ -3,6 +3,7 @@
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 client
 server
+libTestService.*
 Test.cpp
 Test.h
 db/node
diff --git a/cpp/test/IceGrid/replicaGroup/.gitignore b/cpp/test/IceGrid/replicaGroup/.gitignore
index 51c8cc45dea..6c64605ce39 100644
--- a/cpp/test/IceGrid/replicaGroup/.gitignore
+++ b/cpp/test/IceGrid/replicaGroup/.gitignore
@@ -3,7 +3,7 @@
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 client
 server
-libTestService.so
+libTestService.*
 Test.cpp
 Test.h
 build.txt