diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-05-03 19:26:09 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-05-03 19:26:09 +0200 |
| commit | ee3b7be185f7d887a33b9c242a7ccd08a09d2614 (patch) | |
| tree | 1974211a0cbd5e3df95b6deed0b2b42f7854aca9 /cpp/test/IceStorm | |
| parent | Rename files for consistency (diff) | |
| download | ice-ee3b7be185f7d887a33b9c242a7ccd08a09d2614.tar.bz2 ice-ee3b7be185f7d887a33b9c242a7ccd08a09d2614.tar.xz ice-ee3b7be185f7d887a33b9c242a7ccd08a09d2614.zip | |
Re-factored gmake build system
Diffstat (limited to 'cpp/test/IceStorm')
22 files changed, 121 insertions, 467 deletions
diff --git a/cpp/test/IceStorm/Makefile b/cpp/test/IceStorm/Makefile deleted file mode 100644 index 2303b98b33f..00000000000 --- a/cpp/test/IceStorm/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/config/Make.rules - -SUBDIRS = single \ - federation \ - federation2 \ - stress \ - rep1 \ - repstress \ - repgrid - -.PHONY: $(EVERYTHING) $(SUBDIRS) - -all:: $(SUBDIRS) - -$(SUBDIRS): - @echo "making all in $@" - @$(MAKE) all --directory=$@ - - -$(EVERYTHING_EXCEPT_ALL):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done diff --git a/cpp/test/IceStorm/federation/.gitignore b/cpp/test/IceStorm/federation/.gitignore deleted file mode 100644 index 9f3e354edb6..00000000000 --- a/cpp/test/IceStorm/federation/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -publisher -subscriber -.depend -Event.cpp -Event.h -build.txt -db/* -0.db/* -1.db/* -2.db/* diff --git a/cpp/test/IceStorm/federation/Makefile b/cpp/test/IceStorm/federation/Makefile deleted file mode 100644 index e8cf7ba8a00..00000000000 --- a/cpp/test/IceStorm/federation/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -PUBLISHER = publisher -SUBSCRIBER = subscriber - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) - -SLICE_OBJS = Event.o - -POBJS = $(SLICE_OBJS) \ - Publisher.o - -SOBJS = $(SLICE_OBJS) \ - Subscriber.o - -OBJS = $(POBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) -LIBS := -lIceStorm $(LIBS) - -$(PUBLISHER): $(POBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) - -$(SUBSCRIBER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -clean:: - -rm -f build.txt - -rm -rf db/* - -rm -rf 0.db/* - -rm -rf 1.db/* - -rm -rf 2.db/* diff --git a/cpp/test/IceStorm/federation/Makefile.mk b/cpp/test/IceStorm/federation/Makefile.mk new file mode 100644 index 00000000000..de316f2bbda --- /dev/null +++ b/cpp/test/IceStorm/federation/Makefile.mk @@ -0,0 +1,18 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_programs = publisher subscriber +$(test)_dependencies = IceStorm Ice IceUtil TestCommon + +$(test)_publisher_sources = Publisher.cpp Event.ice +$(test)_subscriber_sources = Subscriber.cpp Event.ice + +$(test)_cleanfiles = db/* 0.db/* 1.db/* 2.db/* + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceStorm/federation2/.gitignore b/cpp/test/IceStorm/federation2/.gitignore deleted file mode 100644 index 1ee63744e74..00000000000 --- a/cpp/test/IceStorm/federation2/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -publisher -subscriber -.depend -Event.cpp -Event.h -build.txt -db/* -db2/* -0.db/* -0.db2/* -1.db/* -1.db2/* -2.db/* -2.db2/* diff --git a/cpp/test/IceStorm/federation2/Makefile b/cpp/test/IceStorm/federation2/Makefile deleted file mode 100644 index ee6e5920c72..00000000000 --- a/cpp/test/IceStorm/federation2/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -PUBLISHER = publisher -SUBSCRIBER = subscriber - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) - -SLICE_OBJS = Event.o - -POBJS = $(SLICE_OBJS) \ - Publisher.o - -SOBJS = $(SLICE_OBJS) \ - Subscriber.o - -OBJS = $(POBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) -LIBS := -lIceStorm $(LIBS) - -$(PUBLISHER): $(POBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) - -$(SUBSCRIBER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -clean:: - -rm -f build.txt - -rm -rf db/* db2/* - -rm -rf 0.db/* 0.db2/* - -rm -rf 1.db/* 1.db2/* - -rm -rf 2.db/* 2.db2/* diff --git a/cpp/test/IceStorm/federation2/Makefile.mk b/cpp/test/IceStorm/federation2/Makefile.mk new file mode 100644 index 00000000000..012bbe6da48 --- /dev/null +++ b/cpp/test/IceStorm/federation2/Makefile.mk @@ -0,0 +1,19 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_programs = publisher subscriber +$(test)_dependencies = IceStorm Ice IceUtil TestCommon + +$(test)_publisher_sources = Publisher.cpp Event.ice +$(test)_subscriber_sources = Subscriber.cpp Event.ice + +$(test)_cleanfiles = db/* 0.db/* 1.db/* 2.db/* db2/* 0.db2/* 1.db2/* 2.db2/* + + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/.gitignore b/cpp/test/IceStorm/rep1/.gitignore deleted file mode 100644 index 9cd9b7ec547..00000000000 --- a/cpp/test/IceStorm/rep1/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -publisher -subscriber -sub -.depend -Single.cpp -Single.h -build.txt -0.db/* -1.db/* -2.db/* diff --git a/cpp/test/IceStorm/rep1/Makefile b/cpp/test/IceStorm/rep1/Makefile deleted file mode 100644 index eb010ab56c7..00000000000 --- a/cpp/test/IceStorm/rep1/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -PUBLISHER = publisher -SUBSCRIBER = subscriber -SUB = sub - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) $(SUB) - -SLICE_OBJS = Single.o - -POBJS = $(SLICE_OBJS) \ - Publisher.o - -SOBJS = $(SLICE_OBJS) \ - Subscriber.o - -SUB_OBJS = $(SLICE_OBJS) \ - Sub.o - -OBJS = $(SUB_OBJS) \ - $(POBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) -LIBS := -lIceStorm $(LIBS) - -$(PUBLISHER): $(POBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) - -$(SUBSCRIBER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -$(SUB): $(SUB_OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SUB_OBJS) $(LIBS) - -clean:: - -rm -f build.txt - -rm -rf 0.db/* - -rm -rf 1.db/* - -rm -rf 2.db/* diff --git a/cpp/test/IceStorm/rep1/Makefile.mk b/cpp/test/IceStorm/rep1/Makefile.mk new file mode 100644 index 00000000000..5155cc324f6 --- /dev/null +++ b/cpp/test/IceStorm/rep1/Makefile.mk @@ -0,0 +1,19 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_programs = publisher subscriber sub +$(test)_dependencies = IceStorm Ice IceUtil TestCommon + +$(test)_publisher_sources = Publisher.cpp Single.ice +$(test)_subscriber_sources = Subscriber.cpp Single.ice +$(test)_sub_sources = Sub.cpp Single.ice + +$(test)_cleanfiles = 0.db/* 1.db/* 2.db/* + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceStorm/repgrid/.gitignore b/cpp/test/IceStorm/repgrid/.gitignore deleted file mode 100644 index 6c0d77be0e0..00000000000 --- a/cpp/test/IceStorm/repgrid/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend -Single.cpp -Single.h -build.txt -db/node/* -db/registry/* -db/replica-1/* diff --git a/cpp/test/IceStorm/repgrid/Makefile b/cpp/test/IceStorm/repgrid/Makefile deleted file mode 100644 index b04cd70822b..00000000000 --- a/cpp/test/IceStorm/repgrid/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client - -TARGETS = $(CLIENT) - -SLICE_OBJS = Single.o - -OBJS = $(SLICE_OBJS) \ - Client.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) -LIBS := -lIceStorm $(LIBS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(LIBS) - -clean:: - -rm -f build.txt - -rm -rf db/node/* db/registry/* db/replica-1/* diff --git a/cpp/test/IceStorm/repgrid/Makefile.mk b/cpp/test/IceStorm/repgrid/Makefile.mk new file mode 100644 index 00000000000..437b6c6b36f --- /dev/null +++ b/cpp/test/IceStorm/repgrid/Makefile.mk @@ -0,0 +1,14 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_dependencies = IceStorm Ice IceUtil TestCommon + +$(test)_client_sources = Client.cpp Single.ice + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/.gitignore b/cpp/test/IceStorm/repstress/.gitignore deleted file mode 100644 index c1e2c6ba18a..00000000000 --- a/cpp/test/IceStorm/repstress/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -publisher -subscriber -control -.depend -Single.cpp -Controller.cpp -Single.h -Controller.h -build.txt -0.db/* -1.db/* -2.db/* diff --git a/cpp/test/IceStorm/repstress/Makefile b/cpp/test/IceStorm/repstress/Makefile deleted file mode 100644 index 003e1b5894f..00000000000 --- a/cpp/test/IceStorm/repstress/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -PUBLISHER = publisher -SUBSCRIBER = subscriber -CONTROL = control - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) $(CONTROL) - -SLICE_OBJS = Single.o \ - Controller.o - -POBJS = $(SLICE_OBJS) \ - Publisher.o - -SOBJS = $(SLICE_OBJS) \ - Subscriber.o - -COBJS = Control.o \ - Controller.o - -OBJS = $(COBJS) \ - $(POBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) -LIBS := -lIceStorm $(LIBS) - -$(PUBLISHER): $(POBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) - -$(SUBSCRIBER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -$(CONTROL): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) - -clean:: - -rm -f build.txt - -rm -rf 0.db/* - -rm -rf 1.db/* - -rm -rf 2.db/* diff --git a/cpp/test/IceStorm/repstress/Makefile.mk b/cpp/test/IceStorm/repstress/Makefile.mk new file mode 100644 index 00000000000..63d03c56fb7 --- /dev/null +++ b/cpp/test/IceStorm/repstress/Makefile.mk @@ -0,0 +1,19 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_programs = publisher subscriber control +$(test)_dependencies = IceStorm Ice IceUtil TestCommon + +$(test)_publisher_sources = Publisher.cpp Single.ice Controller.ice +$(test)_subscriber_sources = Subscriber.cpp Single.ice Controller.ice +$(test)_control_sources = Control.cpp Controller.ice + +$(test)_cleanfiles = 0.db/* 1.db/* 2.db/* + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceStorm/single/.gitignore b/cpp/test/IceStorm/single/.gitignore deleted file mode 100644 index 7245563774f..00000000000 --- a/cpp/test/IceStorm/single/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -publisher -subscriber -.depend -Single.cpp -Single.h -build.txt -db/* -0.db/* -1.db/* -2.db/* diff --git a/cpp/test/IceStorm/single/Makefile b/cpp/test/IceStorm/single/Makefile deleted file mode 100644 index 5f138a38892..00000000000 --- a/cpp/test/IceStorm/single/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -PUBLISHER = publisher -SUBSCRIBER = subscriber - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) - -SLICE_OBJS = Single.o - -POBJS = $(SLICE_OBJS) \ - Publisher.o - -SOBJS = $(SLICE_OBJS) \ - Subscriber.o - -OBJS = $(POBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(NO_DEPRECATED_FLAGS) -LIBS := -lIceStorm $(LIBS) - -$(PUBLISHER): $(POBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) - -$(SUBSCRIBER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -clean:: - -rm -f build.txt - -rm -rf db/* - -rm -rf 0.db/* - -rm -rf 1.db/* - -rm -rf 2.db/* diff --git a/cpp/test/IceStorm/single/Makefile.mk b/cpp/test/IceStorm/single/Makefile.mk new file mode 100644 index 00000000000..60694e4883d --- /dev/null +++ b/cpp/test/IceStorm/single/Makefile.mk @@ -0,0 +1,16 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_programs = publisher subscriber +$(test)_dependencies = IceStorm Ice IceUtil TestCommon + +$(test)_publisher_sources = Publisher.cpp Single.ice +$(test)_subscriber_sources = Subscriber.cpp Single.ice + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceStorm/stress/.gitignore b/cpp/test/IceStorm/stress/.gitignore deleted file mode 100644 index 1ee63744e74..00000000000 --- a/cpp/test/IceStorm/stress/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -publisher -subscriber -.depend -Event.cpp -Event.h -build.txt -db/* -db2/* -0.db/* -0.db2/* -1.db/* -1.db2/* -2.db/* -2.db2/* diff --git a/cpp/test/IceStorm/stress/Makefile b/cpp/test/IceStorm/stress/Makefile deleted file mode 100644 index ee6e5920c72..00000000000 --- a/cpp/test/IceStorm/stress/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -PUBLISHER = publisher -SUBSCRIBER = subscriber - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) - -SLICE_OBJS = Event.o - -POBJS = $(SLICE_OBJS) \ - Publisher.o - -SOBJS = $(SLICE_OBJS) \ - Subscriber.o - -OBJS = $(POBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) -LIBS := -lIceStorm $(LIBS) - -$(PUBLISHER): $(POBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) - -$(SUBSCRIBER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -clean:: - -rm -f build.txt - -rm -rf db/* db2/* - -rm -rf 0.db/* 0.db2/* - -rm -rf 1.db/* 1.db2/* - -rm -rf 2.db/* 2.db2/* diff --git a/cpp/test/IceStorm/stress/Makefile.mk b/cpp/test/IceStorm/stress/Makefile.mk new file mode 100644 index 00000000000..96cfdfccc30 --- /dev/null +++ b/cpp/test/IceStorm/stress/Makefile.mk @@ -0,0 +1,16 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_programs = publisher subscriber +$(test)_dependencies = IceStorm Ice IceUtil TestCommon + +$(test)_publisher_sources = Publisher.cpp Event.ice +$(test)_subscriber_sources = Subscriber.cpp Event.ice + +tests += $(test)
\ No newline at end of file |