diff options
44 files changed, 122 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore index 78ef596b4ab..e1b545d3b9d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,13 +17,17 @@ core generated cgenerated sgenerated -java/depcache -java/lib +/java/depcache +/java/lib +/cpp/bin +/cpp/lib *# .#* *~ *.lib *.idb +*.suo +core.* cpp/src/Ice/EventLoggerMsg.h cpp/src/Ice/EventLoggerMsg.rc cpp/src/Ice/EventLoggerMsg.res diff --git a/cpp/demo/Freeze/library/Makefile.mak b/cpp/demo/Freeze/library/Makefile.mak index 6921a54e234..1ccd227fbb5 100644 --- a/cpp/demo/Freeze/library/Makefile.mak +++ b/cpp/demo/Freeze/library/Makefile.mak @@ -87,13 +87,12 @@ Grammar.cpp Grammar.h: Grammar.y del /q Grammar.output clean:: - del /q LibraryTypes.h LibraryTypes.cpp - -clean:: del /q Library.cpp Library.h clean:: + del /q LibraryTypes.h LibraryTypes.cpp del /q Grammar.cpp Grammar.h del /q Scanner.cpp + for %f in (db\*) do if not %f == db\.gitignore del /q %f !include .depend diff --git a/cpp/demo/Freeze/phonebook/Makefile.mak b/cpp/demo/Freeze/phonebook/Makefile.mak index a32bb906902..df124deefbe 100644 --- a/cpp/demo/Freeze/phonebook/Makefile.mak +++ b/cpp/demo/Freeze/phonebook/Makefile.mak @@ -86,13 +86,12 @@ Grammar.cpp Grammar.h: Grammar.y del /q Grammar.output clean:: - del /q NameIndex.h NameIndex.cpp - -clean:: del /q PhoneBook.cpp PhoneBook.h clean:: + del /q NameIndex.h NameIndex.cpp del /q Grammar.cpp Grammar.h del /q Scanner.cpp + for %f in (db\*) do if not %f == db\.gitignore del /q %f !include .depend diff --git a/cpp/demo/IceGrid/allocate/Makefile.mak b/cpp/demo/IceGrid/allocate/Makefile.mak index 97394ae1650..2bf2f4846b6 100644 --- a/cpp/demo/IceGrid/allocate/Makefile.mak +++ b/cpp/demo/IceGrid/allocate/Makefile.mak @@ -48,4 +48,8 @@ $(SERVER): $(OBJS) $(SOBJS) clean:: -del /q Hello.cpp Hello.h +clean:: + 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 diff --git a/cpp/demo/IceGrid/replication/Makefile.mak b/cpp/demo/IceGrid/replication/Makefile.mak index 7a55f38431a..2c0d29ea602 100644 --- a/cpp/demo/IceGrid/replication/Makefile.mak +++ b/cpp/demo/IceGrid/replication/Makefile.mak @@ -48,4 +48,11 @@ $(SERVER): $(OBJS) $(SOBJS) 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 + !include .depend diff --git a/cpp/demo/IceGrid/sessionActivation/Makefile.mak b/cpp/demo/IceGrid/sessionActivation/Makefile.mak index 08a00dce72d..6ff4ab6bcdd 100644 --- a/cpp/demo/IceGrid/sessionActivation/Makefile.mak +++ b/cpp/demo/IceGrid/sessionActivation/Makefile.mak @@ -48,4 +48,8 @@ $(SERVER): $(OBJS) $(SOBJS) clean:: del /q Hello.cpp Hello.h +clean:: + 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 diff --git a/cpp/demo/IceGrid/simple/Makefile.mak b/cpp/demo/IceGrid/simple/Makefile.mak index 7a55f38431a..6223ab774e9 100644 --- a/cpp/demo/IceGrid/simple/Makefile.mak +++ b/cpp/demo/IceGrid/simple/Makefile.mak @@ -48,4 +48,8 @@ $(SERVER): $(OBJS) $(SOBJS) clean:: del /q Hello.cpp Hello.h +clean:: + 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 diff --git a/cpp/demo/IceStorm/clock/Makefile b/cpp/demo/IceStorm/clock/Makefile index 61b48ef8902..01cffa11b74 100644 --- a/cpp/demo/IceStorm/clock/Makefile +++ b/cpp/demo/IceStorm/clock/Makefile @@ -39,4 +39,7 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) +clean:: + -rm -f db/* + include .depend diff --git a/cpp/demo/IceStorm/clock/Makefile.mak b/cpp/demo/IceStorm/clock/Makefile.mak index b2d74f1ae32..9e2e021db1d 100644 --- a/cpp/demo/IceStorm/clock/Makefile.mak +++ b/cpp/demo/IceStorm/clock/Makefile.mak @@ -48,4 +48,7 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS) clean:: del /q Clock.cpp Clock.h +clean:: + for %f in (db\*) do if not %f == db\.gitignore del /q %f + !include .depend diff --git a/cpp/demo/IceStorm/counter/Makefile b/cpp/demo/IceStorm/counter/Makefile index b26a1c2acb7..bff4bd7e573 100644 --- a/cpp/demo/IceStorm/counter/Makefile +++ b/cpp/demo/IceStorm/counter/Makefile @@ -41,4 +41,7 @@ $(SERVER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(IS_LIBS) +clean:: + -rm -f db/* + include .depend diff --git a/cpp/demo/IceStorm/counter/Makefile.mak b/cpp/demo/IceStorm/counter/Makefile.mak index d5965f59982..7b9e6a0161f 100644 --- a/cpp/demo/IceStorm/counter/Makefile.mak +++ b/cpp/demo/IceStorm/counter/Makefile.mak @@ -50,4 +50,7 @@ $(SERVER): $(OBJS) $(SOBJS) clean:: del /q Counter.cpp Counter.h +clean:: + for %f in (db\*) do if not %f == db\.gitignore del /q %f + !include .depend diff --git a/cpp/demo/IceStorm/replicated/Makefile b/cpp/demo/IceStorm/replicated/Makefile index 02330cc5133..c67d2e15287 100644 --- a/cpp/demo/IceStorm/replicated/Makefile +++ b/cpp/demo/IceStorm/replicated/Makefile @@ -39,4 +39,7 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) +clean:: + -rm -rf db/node/* db/registry/* + include .depend diff --git a/cpp/demo/IceStorm/replicated/Makefile.mak b/cpp/demo/IceStorm/replicated/Makefile.mak index 91103c5ffe7..1e88cc7acce 100644 --- a/cpp/demo/IceStorm/replicated/Makefile.mak +++ b/cpp/demo/IceStorm/replicated/Makefile.mak @@ -48,4 +48,8 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS) clean:: del /q Clock.cpp Clock.h +clean:: + 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 diff --git a/cpp/demo/book/freeze_filesystem/Makefile.mak b/cpp/demo/book/freeze_filesystem/Makefile.mak index f464b53fb9a..9bce3d76618 100644 --- a/cpp/demo/book/freeze_filesystem/Makefile.mak +++ b/cpp/demo/book/freeze_filesystem/Makefile.mak @@ -51,4 +51,7 @@ clean:: del /q Filesystem.cpp Filesystem.h del /q PersistentFilesystem.cpp PersistentFilesystem.h +clean:: + for %f in (db\*) do if not %f == db\.gitignore del /q %f + !include .depend diff --git a/cs/demo/IceGrid/allocate/.gitignore b/cs/demo/IceGrid/allocate/.gitignore new file mode 100644 index 00000000000..3e9f78f05d8 --- /dev/null +++ b/cs/demo/IceGrid/allocate/.gitignore @@ -0,0 +1,2 @@ +db/registry/* +db/node/* diff --git a/cs/demo/IceGrid/allocate/Makefile b/cs/demo/IceGrid/allocate/Makefile index b9fa8708b95..a88ab9d302d 100644 --- a/cs/demo/IceGrid/allocate/Makefile +++ b/cs/demo/IceGrid/allocate/Makefile @@ -32,4 +32,7 @@ client.exe: $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) $(MCS) $(MCSFLAGS) -out:$@ $(call ref,icecs) $(subst /,$(DSEP),$^) +clean:: + -rm -rf db/node/* db/registry/* + include .depend diff --git a/cs/demo/IceGrid/allocate/Makefile.mak b/cs/demo/IceGrid/allocate/Makefile.mak index 7d05d117846..18938418ee1 100644 --- a/cs/demo/IceGrid/allocate/Makefile.mak +++ b/cs/demo/IceGrid/allocate/Makefile.mak @@ -33,4 +33,8 @@ client.exe: $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\icecs.dll $(S_SRCS) $(GEN_SRCS) +clean:: + 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 diff --git a/cs/demo/IceGrid/sessionActivation/.gitignore b/cs/demo/IceGrid/sessionActivation/.gitignore new file mode 100644 index 00000000000..3e9f78f05d8 --- /dev/null +++ b/cs/demo/IceGrid/sessionActivation/.gitignore @@ -0,0 +1,2 @@ +db/registry/* +db/node/* diff --git a/cs/demo/IceGrid/sessionActivation/Makefile b/cs/demo/IceGrid/sessionActivation/Makefile index b9fa8708b95..a88ab9d302d 100644 --- a/cs/demo/IceGrid/sessionActivation/Makefile +++ b/cs/demo/IceGrid/sessionActivation/Makefile @@ -32,4 +32,7 @@ client.exe: $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) $(MCS) $(MCSFLAGS) -out:$@ $(call ref,icecs) $(subst /,$(DSEP),$^) +clean:: + -rm -rf db/node/* db/registry/* + include .depend diff --git a/cs/demo/IceGrid/sessionActivation/Makefile.mak b/cs/demo/IceGrid/sessionActivation/Makefile.mak index 7d05d117846..18938418ee1 100644 --- a/cs/demo/IceGrid/sessionActivation/Makefile.mak +++ b/cs/demo/IceGrid/sessionActivation/Makefile.mak @@ -33,4 +33,8 @@ client.exe: $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\icecs.dll $(S_SRCS) $(GEN_SRCS) +clean:: + 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 diff --git a/cs/demo/IceGrid/simple/.gitignore b/cs/demo/IceGrid/simple/.gitignore new file mode 100644 index 00000000000..3e9f78f05d8 --- /dev/null +++ b/cs/demo/IceGrid/simple/.gitignore @@ -0,0 +1,2 @@ +db/registry/* +db/node/* diff --git a/cs/demo/IceGrid/simple/Makefile b/cs/demo/IceGrid/simple/Makefile index 47d2141eecb..df580640ad6 100644 --- a/cs/demo/IceGrid/simple/Makefile +++ b/cs/demo/IceGrid/simple/Makefile @@ -32,4 +32,7 @@ client.exe: $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) $(MCS) $(MCSFLAGS) -out:$@ $(call ref,icecs) $(subst /,$(DSEP),$^) +clean:: + -rm -rf db/node/* db/registry/* + include .depend diff --git a/cs/demo/IceGrid/simple/Makefile.mak b/cs/demo/IceGrid/simple/Makefile.mak index 5364d547ce0..919a7aea553 100644 --- a/cs/demo/IceGrid/simple/Makefile.mak +++ b/cs/demo/IceGrid/simple/Makefile.mak @@ -32,4 +32,8 @@ client.exe: $(C_SRCS) $(GEN_SRCS) server.exe: $(S_SRCS) $(GEN_SRCS) $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\icecs.dll $(S_SRCS) $(GEN_SRCS) +clean:: + 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 diff --git a/cs/demo/IceStorm/clock/.gitignore b/cs/demo/IceStorm/clock/.gitignore new file mode 100644 index 00000000000..9c39416c539 --- /dev/null +++ b/cs/demo/IceStorm/clock/.gitignore @@ -0,0 +1 @@ +db/* diff --git a/cs/demo/IceStorm/clock/Makefile b/cs/demo/IceStorm/clock/Makefile index 64487683f30..65fd82cb159 100644 --- a/cs/demo/IceStorm/clock/Makefile +++ b/cs/demo/IceStorm/clock/Makefile @@ -32,4 +32,7 @@ publisher.exe: $(C_SRCS) $(GEN_SRCS) subscriber.exe: $(S_SRCS) $(GEN_SRCS) $(MCS) $(MCSFLAGS) -out:$@ $(call ref,icecs) $(call ref,icestormcs) $(subst /,$(DSEP),$^) +clean:: + -rm -f db/* + include .depend diff --git a/cs/demo/IceStorm/clock/Makefile.mak b/cs/demo/IceStorm/clock/Makefile.mak index 5506a3b10d0..a178dad7cb6 100644 --- a/cs/demo/IceStorm/clock/Makefile.mak +++ b/cs/demo/IceStorm/clock/Makefile.mak @@ -32,4 +32,7 @@ publisher.exe: $(C_SRCS) $(GEN_SRCS) subscriber.exe: $(S_SRCS) $(GEN_SRCS) $(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\icecs.dll -r:$(bindir)\icestormcs.dll $(S_SRCS) $(GEN_SRCS) +clean:: + for %f in (db\*) do if not %f == db\.gitignore del /q %f + !include .depend diff --git a/cs/test/IceGrid/simple/Makefile b/cs/test/IceGrid/simple/Makefile index c8351bb52cc..0152d4fd50b 100644 --- a/cs/test/IceGrid/simple/Makefile +++ b/cs/test/IceGrid/simple/Makefile @@ -33,6 +33,6 @@ server.exe: $(S_SRCS) $(GEN_SRCS) $(MCS) $(MCSFLAGS) -out:$@ $(call ref,icecs) -r:$(bindir)/glacier2cs.dll $(subst /,$(DSEP),$^) clean:: - -rm -rf db/node db/registry + -rm -rf db/node db/registry db/replica-* include .depend diff --git a/cs/test/IceGrid/simple/Makefile.mak b/cs/test/IceGrid/simple/Makefile.mak index 4eeca849f31..2a3571f78d3 100644 --- a/cs/test/IceGrid/simple/Makefile.mak +++ b/cs/test/IceGrid/simple/Makefile.mak @@ -35,6 +35,8 @@ server.exe: $(S_SRCS) $(GEN_SRCS) $(S_SRCS) $(GEN_SRCS) clean:: - del /q db\node db\registry + if exist db\node rmdir /s /q db\node + if exist db\registry rmdir /s /q db\registry + if exist db\replica-1 rmdir /s /q db\replica-1 !include .depend diff --git a/java/demo/IceGrid/allocate/.gitignore b/java/demo/IceGrid/allocate/.gitignore new file mode 100644 index 00000000000..3e9f78f05d8 --- /dev/null +++ b/java/demo/IceGrid/allocate/.gitignore @@ -0,0 +1,2 @@ +db/registry/* +db/node/* diff --git a/java/demo/IceGrid/allocate/build.xml b/java/demo/IceGrid/allocate/build.xml index 360a83b6375..6619ade4480 100644 --- a/java/demo/IceGrid/allocate/build.xml +++ b/java/demo/IceGrid/allocate/build.xml @@ -45,6 +45,10 @@ <target name="clean"> <delete dir="${generated.dir}"/> <delete dir="${class.dir}"/> + <delete quiet="true" includeEmptyDirs="true"> + <fileset dir="db/node" excludes=".gitignore"/> + <fileset dir="db/registry" excludes=".gitignore"/> + </delete> </target> </project> diff --git a/java/demo/IceGrid/sessionActivation/.gitignore b/java/demo/IceGrid/sessionActivation/.gitignore new file mode 100644 index 00000000000..3e9f78f05d8 --- /dev/null +++ b/java/demo/IceGrid/sessionActivation/.gitignore @@ -0,0 +1,2 @@ +db/registry/* +db/node/* diff --git a/java/demo/IceGrid/sessionActivation/build.xml b/java/demo/IceGrid/sessionActivation/build.xml index 613fd6f2b0c..a607346b336 100644 --- a/java/demo/IceGrid/sessionActivation/build.xml +++ b/java/demo/IceGrid/sessionActivation/build.xml @@ -45,6 +45,10 @@ <target name="clean"> <delete dir="${generated.dir}"/> <delete dir="${class.dir}"/> + <delete quiet="true" includeEmptyDirs="true"> + <fileset dir="db/node" excludes=".gitignore"/> + <fileset dir="db/registry" excludes=".gitignore"/> + </delete> </target> </project> diff --git a/java/demo/IceGrid/simple/.gitignore b/java/demo/IceGrid/simple/.gitignore new file mode 100644 index 00000000000..3e9f78f05d8 --- /dev/null +++ b/java/demo/IceGrid/simple/.gitignore @@ -0,0 +1,2 @@ +db/registry/* +db/node/* diff --git a/java/demo/IceGrid/simple/build.xml b/java/demo/IceGrid/simple/build.xml index 97c9dd3abc6..fd54de9ecdd 100644 --- a/java/demo/IceGrid/simple/build.xml +++ b/java/demo/IceGrid/simple/build.xml @@ -45,6 +45,10 @@ <target name="clean"> <delete dir="${generated.dir}"/> <delete dir="${class.dir}"/> + <delete quiet="true" includeEmptyDirs="true"> + <fileset dir="db/node" excludes=".gitignore"/> + <fileset dir="db/registry" excludes=".gitignore"/> + </delete> </target> </project> diff --git a/java/demo/IceStorm/clock/.gitignore b/java/demo/IceStorm/clock/.gitignore new file mode 100644 index 00000000000..9c39416c539 --- /dev/null +++ b/java/demo/IceStorm/clock/.gitignore @@ -0,0 +1 @@ +db/* diff --git a/java/demo/IceStorm/clock/build.xml b/java/demo/IceStorm/clock/build.xml index d6690489045..0828c9a6e4a 100644 --- a/java/demo/IceStorm/clock/build.xml +++ b/java/demo/IceStorm/clock/build.xml @@ -45,6 +45,9 @@ <target name="clean"> <delete dir="${generated.dir}"/> <delete dir="${class.dir}"/> + <delete quiet="true"> + <fileset dir="db" excludes=".gitignore"/> + </delete> </target> </project> diff --git a/java/test/Freeze/complex/.gitignore b/java/test/Freeze/complex/.gitignore index 39af5887579..ca51e824975 100644 --- a/java/test/Freeze/complex/.gitignore +++ b/java/test/Freeze/complex/.gitignore @@ -1 +1,2 @@ -# Dummy file, so that git retains this otherwise empty directory. +db/* + diff --git a/java/test/IceGrid/simple/build.xml b/java/test/IceGrid/simple/build.xml index c4907bb44b3..70c3cf891e6 100644 --- a/java/test/IceGrid/simple/build.xml +++ b/java/test/IceGrid/simple/build.xml @@ -43,9 +43,9 @@ <target name="clean"> <delete dir="${generated.dir}"/> <delete dir="${class.dir}"/> - <delete quiet="true"> + <delete quiet="true" includeEmptyDirs="true"> <fileset dir="db/node"/> - <fileset dir="db/registry"/> + <fileset dir="db/registry"/> </delete> </target> diff --git a/java/test/IcePack/simple/data/.gitignore b/java/test/IcePack/simple/data/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/java/test/IcePack/simple/data/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/java/test/IcePack/simple/data/db/.gitignore b/java/test/IcePack/simple/data/db/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/java/test/IcePack/simple/data/db/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/py/demo/IceGrid/allocate/.gitignore b/py/demo/IceGrid/allocate/.gitignore new file mode 100644 index 00000000000..3e9f78f05d8 --- /dev/null +++ b/py/demo/IceGrid/allocate/.gitignore @@ -0,0 +1,2 @@ +db/registry/* +db/node/* diff --git a/py/demo/IceGrid/sessionActivation/.gitignore b/py/demo/IceGrid/sessionActivation/.gitignore new file mode 100644 index 00000000000..3e9f78f05d8 --- /dev/null +++ b/py/demo/IceGrid/sessionActivation/.gitignore @@ -0,0 +1,2 @@ +db/registry/* +db/node/* diff --git a/py/demo/IceGrid/simple/.gitignore b/py/demo/IceGrid/simple/.gitignore new file mode 100644 index 00000000000..3e9f78f05d8 --- /dev/null +++ b/py/demo/IceGrid/simple/.gitignore @@ -0,0 +1,2 @@ +db/registry/* +db/node/* diff --git a/py/demo/IceStorm/clock/.gitignore b/py/demo/IceStorm/clock/.gitignore new file mode 100644 index 00000000000..9c39416c539 --- /dev/null +++ b/py/demo/IceStorm/clock/.gitignore @@ -0,0 +1 @@ +db/* |