diff options
Diffstat (limited to 'cpp')
24 files changed, 25 insertions, 12 deletions
diff --git a/cpp/config/makegitignore.py b/cpp/config/makegitignore.py index 7a2f9735e21..943c2afacc1 100755 --- a/cpp/config/makegitignore.py +++ b/cpp/config/makegitignore.py @@ -46,11 +46,18 @@ def createGitIgnore(filename, gitIgnoreFiles): for f in files: if f in ignore: continue - k = os.path.join(cwd, os.path.dirname(f), ".gitignore") + + if f.startswith(".."): + k = os.path.join(cwd, os.path.dirname(f), ".gitignore") + v = os.path.basename(f) + "\n" + else: + k = os.path.join(cwd, ".gitignore") + v = f + "\n" + k = os.path.normpath(k) if not gitIgnoreFiles.has_key(k): gitIgnoreFiles[k] = [ ] - gitIgnoreFiles[k].append(os.path.basename(f) + "\n") + gitIgnoreFiles[k].append(v) file.close() diff --git a/cpp/demo/Freeze/backup/.gitignore b/cpp/demo/Freeze/backup/.gitignore index d576b7508e1..5cbc71295e9 100644 --- a/cpp/demo/Freeze/backup/.gitignore +++ b/cpp/demo/Freeze/backup/.gitignore @@ -1,3 +1,5 @@ client IntLongMap.h IntLongMap.cpp +db/data/* +db/logs/* diff --git a/cpp/demo/Freeze/backup/db/.gitignore b/cpp/demo/Freeze/backup/db/.gitignore deleted file mode 100644 index 1e864f5a596..00000000000 --- a/cpp/demo/Freeze/backup/db/.gitignore +++ /dev/null @@ -1 +0,0 @@ -__db.* diff --git a/cpp/demo/Freeze/backup/db/data/.gitignore b/cpp/demo/Freeze/backup/db/data/.gitignore deleted file mode 100644 index 72e8ffc0db8..00000000000 --- a/cpp/demo/Freeze/backup/db/data/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/cpp/demo/Freeze/backup/db/logs/.gitignore b/cpp/demo/Freeze/backup/db/logs/.gitignore deleted file mode 100644 index 72e8ffc0db8..00000000000 --- a/cpp/demo/Freeze/backup/db/logs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/cpp/demo/Freeze/bench/.gitignore b/cpp/demo/Freeze/bench/.gitignore index 35ac6d536d9..057d08c4210 100644 --- a/cpp/demo/Freeze/bench/.gitignore +++ b/cpp/demo/Freeze/bench/.gitignore @@ -1,5 +1,6 @@ client Test.cpp Test.h +db/* BenchTypes.h BenchTypes.cpp diff --git a/cpp/demo/Freeze/bench/db/.gitignore b/cpp/demo/Freeze/bench/db/.gitignore deleted file mode 100644 index 72e8ffc0db8..00000000000 --- a/cpp/demo/Freeze/bench/db/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/cpp/demo/Freeze/customEvictor/db/.gitignore b/cpp/demo/Freeze/customEvictor/db/.gitignore deleted file mode 100644 index 6bf97a50c8a..00000000000 --- a/cpp/demo/Freeze/customEvictor/db/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -log.* -__catalog -items diff --git a/cpp/demo/Freeze/library/.gitignore b/cpp/demo/Freeze/library/.gitignore index b1d0bce8d58..95e9579dc81 100644 --- a/cpp/demo/Freeze/library/.gitignore +++ b/cpp/demo/Freeze/library/.gitignore @@ -3,6 +3,7 @@ server collocated Library.cpp Library.h +db/* LibraryTypes.h LibraryTypes.cpp Grammar.cpp diff --git a/cpp/demo/Freeze/library/db/.gitignore b/cpp/demo/Freeze/library/db/.gitignore deleted file mode 100644 index 72e8ffc0db8..00000000000 --- a/cpp/demo/Freeze/library/db/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/cpp/demo/Freeze/phonebook/.gitignore b/cpp/demo/Freeze/phonebook/.gitignore index 1d9a43a6478..27fe2d42bca 100644 --- a/cpp/demo/Freeze/phonebook/.gitignore +++ b/cpp/demo/Freeze/phonebook/.gitignore @@ -8,3 +8,4 @@ NameIndex.cpp Grammar.cpp Grammar.h Scanner.cpp +db/* diff --git a/cpp/demo/Freeze/phonebook/db/.gitignore b/cpp/demo/Freeze/phonebook/db/.gitignore deleted file mode 100644 index 72e8ffc0db8..00000000000 --- a/cpp/demo/Freeze/phonebook/db/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/cpp/demo/book/freeze_filesystem/.gitignore b/cpp/demo/book/freeze_filesystem/.gitignore index 76d00a9a496..795f6975e08 100644 --- a/cpp/demo/book/freeze_filesystem/.gitignore +++ b/cpp/demo/book/freeze_filesystem/.gitignore @@ -4,6 +4,7 @@ Filesystem.cpp PersistentFilesystem.cpp Filesystem.h PersistentFilesystem.h +db/* Grammar.cpp Grammar.h Scanner.cpp diff --git a/cpp/demo/book/freeze_filesystem/db/.gitignore b/cpp/demo/book/freeze_filesystem/db/.gitignore deleted file mode 100644 index 72e8ffc0db8..00000000000 --- a/cpp/demo/book/freeze_filesystem/db/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/cpp/test/Freeze/complex/.gitignore b/cpp/test/Freeze/complex/.gitignore index 0116b5c6b9b..33221c2ad37 100644 --- a/cpp/test/Freeze/complex/.gitignore +++ b/cpp/test/Freeze/complex/.gitignore @@ -6,3 +6,4 @@ ComplexDict.cpp Grammar.cpp Grammar.h Scanner.cpp +db/* diff --git a/cpp/test/Freeze/dbmap/.gitignore b/cpp/test/Freeze/dbmap/.gitignore index 89b3a95b42a..dc60e1cd591 100644 --- a/cpp/test/Freeze/dbmap/.gitignore +++ b/cpp/test/Freeze/dbmap/.gitignore @@ -9,3 +9,4 @@ SortedMap.h SortedMap.cpp WstringWstringMap.h WstringWstringMap.cpp +db/* diff --git a/cpp/test/Freeze/evictor/.gitignore b/cpp/test/Freeze/evictor/.gitignore index 30d5d1b9929..59add91bbd5 100644 --- a/cpp/test/Freeze/evictor/.gitignore +++ b/cpp/test/Freeze/evictor/.gitignore @@ -2,3 +2,4 @@ client server Test.cpp Test.h +db/* diff --git a/cpp/test/Freeze/oldevictor/.gitignore b/cpp/test/Freeze/oldevictor/.gitignore index 30d5d1b9929..59add91bbd5 100644 --- a/cpp/test/Freeze/oldevictor/.gitignore +++ b/cpp/test/Freeze/oldevictor/.gitignore @@ -2,3 +2,4 @@ client server Test.cpp Test.h +db/* diff --git a/cpp/test/FreezeScript/dbmap/.gitignore b/cpp/test/FreezeScript/dbmap/.gitignore index e675be89b00..4c120bf75ea 100644 --- a/cpp/test/FreezeScript/dbmap/.gitignore +++ b/cpp/test/FreezeScript/dbmap/.gitignore @@ -3,3 +3,4 @@ TestOld.cpp TestOld.h IntSMap.h IntSMap.cpp +db/* diff --git a/cpp/test/FreezeScript/evictor/.gitignore b/cpp/test/FreezeScript/evictor/.gitignore index 143855275f8..3c86b4a4657 100644 --- a/cpp/test/FreezeScript/evictor/.gitignore +++ b/cpp/test/FreezeScript/evictor/.gitignore @@ -1,3 +1,4 @@ makedb TestOld.cpp TestOld.h +db/* diff --git a/cpp/test/IceStorm/federation/.gitignore b/cpp/test/IceStorm/federation/.gitignore index 1ac307f15b1..abc4a5c8ef1 100644 --- a/cpp/test/IceStorm/federation/.gitignore +++ b/cpp/test/IceStorm/federation/.gitignore @@ -3,3 +3,4 @@ subscriber Event.cpp Event.h build.txt +db/* diff --git a/cpp/test/IceStorm/federation2/.gitignore b/cpp/test/IceStorm/federation2/.gitignore index 1ac307f15b1..abc4a5c8ef1 100644 --- a/cpp/test/IceStorm/federation2/.gitignore +++ b/cpp/test/IceStorm/federation2/.gitignore @@ -3,3 +3,4 @@ subscriber Event.cpp Event.h build.txt +db/* diff --git a/cpp/test/IceStorm/single/.gitignore b/cpp/test/IceStorm/single/.gitignore index 18c76971d42..25260713758 100644 --- a/cpp/test/IceStorm/single/.gitignore +++ b/cpp/test/IceStorm/single/.gitignore @@ -3,3 +3,4 @@ subscriber Single.cpp Single.h build.txt +db/* diff --git a/cpp/test/IceStorm/stress/.gitignore b/cpp/test/IceStorm/stress/.gitignore index 1ac307f15b1..abc4a5c8ef1 100644 --- a/cpp/test/IceStorm/stress/.gitignore +++ b/cpp/test/IceStorm/stress/.gitignore @@ -3,3 +3,4 @@ subscriber Event.cpp Event.h build.txt +db/* |