diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..176a458f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto diff --git a/Makefile b/Makefile index 2734c523..d49ed2a9 100644 --- a/Makefile +++ b/Makefile @@ -2,52 +2,38 @@ # # 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. +# # ********************************************************************** -SUBDIRS = cpp java -CLEAN_SUBDIRS = java cpp -DEPEND_SUBDIRS = cpp -INSTALL_SUBDIRS = cpp java - -all:: - @for subdir in $(SUBDIRS); \ - do \ - echo "making all in $$subdir"; \ - ( cd $$subdir && $(MAKE) all ) || exit 1; \ - done +top_srcdir := . -clean:: - @for subdir in $(CLEAN_SUBDIRS); \ - do \ - echo "making clean in $$subdir"; \ - ( cd $$subdir && $(MAKE) clean ) || exit 1; \ - done +include $(top_srcdir)/config/Make.rules -depend:: - @for subdir in $(DEPEND_SUBDIRS); \ +define make-global-rule +$1:: + @for subdir in $2; \ do \ - echo "making depend in $$subdir"; \ - ( cd $$subdir && $(MAKE) depend ) || exit 1; \ + echo "making all in $$$$subdir"; \ + ( cd $$$$subdir && $(MAKE) $1 ) || exit 1; \ done +endef -install:: - @for subdir in $(INSTALL_SUBDIRS); \ - do \ - echo "making install in $$subdir"; \ - ( cd $$subdir && $(MAKE) install ) || exit 1; \ - done +$(eval $(call make-global-rule,srcs,$(languages))) +$(eval $(call make-global-rule,tests,$(languages))) +$(eval $(call make-global-rule,all,$(languages))) +$(eval $(call make-global-rule,clean,$(languages))) +$(eval $(call make-global-rule,distclean,$(languages))) +$(eval $(call make-global-rule,install,$(languages))) -test:: - @for subdir in $(SUBDIRS); \ - do \ - echo "making test in $$subdir"; \ - ( cd $$subdir && $(MAKE) test ) || exit 1; \ - done +# +# Install documentation and slice files +# +install:: install-doc install-slice -cpp:: - echo "making all in cpp"; - ( cd cpp && $(MAKE) all ) || exit 1; +$(eval $(call install-data-files,$(wildcard $(slicedir)/*/*.ice),$(slicedir),$(install_slicedir),\ + install-slice,"Installing slice files")) -java:: - echo "making all in java"; - ( cd java && $(MAKE) all ) || exit 1; +$(eval $(call install-data-files,$(wildcard $(top_srcdir)/*LICENSE),$(top_srcdir),$(install_docdir),\ + install-doc,"Installing documentation files")) diff --git a/config/Make.rules b/config/Make.rules new file mode 100644 index 00000000..693aae15 --- /dev/null +++ b/config/Make.rules @@ -0,0 +1,144 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# +# ********************************************************************** + +# +# Select an installation base directory. The directory will be created +# if it does not exist. +# +prefix ?= /opt/Ice-$(version) + +# +# The "root directory" for runpath embedded in executables. Can be set +# to change the runpath added to Ice executables. +# +# If not set, a runpath relative to the path of the executable is +# embedded (using @loader_path on OS X and $ORIGIN on Linux). +# +#embedded_runpath_prefix ?= /opt/Ice-$(mmversion) + +# +# Define embedded_runpath as no if you don't want any runpath added to +# the executables. If not set, defaults to to "yes" +# +embedded_runpath ?= yes + +# +# Define OPTIMIZE as yes if you want to build with optimization. +# Otherwise Ice is build with debug information. +# +#OPTIMIZE = yes + +# +# Define PLATFORMS to the list of platforms to build. This defaults +# to the first supported platform for this system. +# +# Run `make print V=supported-platforms' to see the list of supported +# platforms on this system. +# +PLATFORMS ?= $(firstword $(supported-platforms)) + +# +# Configurations to build. This defaults to the first supported +# configuration. +# +# Run `make print V=supported-configs` to see the list of supported +# configurations. +# +CONFIGS ?= $(firstword $(supported-configs)) + +# +# Third-party libraries +# +# If a third-party library is not installed in a standard location +# where the compiler can find it, set the corresponding variable +# below to the installation directory of the library. +# +#DB_HOME ?= /opt/db +#EXPAT_HOME ?= /opt/expat +#BZ2_HOME ?= /opt/bz2 +#MCPP_HOME ?= /opt/mcpp + +# ---------------------------------------------------------------------- +# Don't change anything below this line! +# ---------------------------------------------------------------------- + +os ?= $(shell uname) + +include $(top_srcdir)/ice/config/Make.rules.$(os) +include $(top_srcdir)/ice/config/Make.project.rules +include $(top_srcdir)/ice/config/Make.tests.rules + +-include $(top_srcdir)/config/Make.rules.$(os) + +ifeq ($(USE_BIN_DIST),yes) +prefix := $(or $(ICE_HOME),$(if $(filter Darwin,$(os)),/usr/local,/usr)) +bindir ?= $(install_bindir) +libdir ?= $(install_libdir) +slicedir ?= $(install_slicedir) +includedir ?= $(install_includedir) +else +bindir ?= $(call mappingdir,$(or $1,$(currentdir)),bin) +libdir ?= $(call mappingdir,$(or $1,$(currentdir)),lib) +slicedir ?= $(top_srcdir)/slice +includedir ?= $(call mappingdir,$(or $1,$(currentdir)),include) + +ice_bindir ?= $(top_srcdir)/ice/cpp/bin +ice_libdir ?= $(top_srcdir)/ice/cpp/lib +ice_slicedir ?= $(top_srcdir)/ice/slice +ice_includedir ?= $(top_srcdir)/ice/cpp/include +endif + +version = 3.7a0 +soversion = 37a0 +ice_src_dist := $(wildcard $(ice_home)/config/Make.rules) + +usr_dir_install := $(filter /usr%,$(prefix)) +install_bindir ?= $(prefix)/bin +install_libdir ?= $(prefix)/lib +install_slicedir ?= $(prefix)$(if $(usr_dir_install),/share/Ice-$(version))/slice +install_includedir ?= $(prefix)/include +install_docdir ?= $(prefix)$(if $(usr_dir_install),/share/Ice-$(version)) +install_mandir ?= $(prefix)$(if $(usr_dir_install),/share)/man + +# +# Languages, platforms and configurations to build +# +supported-languages ?= cpp java +supported-configs ?= shared static + +# +# Support for 3rd party libraries +# +thirdparties := bz2 db expat mcpp +bz2_home := $(BZ2_HOME) +db_home := $(DB_HOME) +db_ldflags := -ldb_cxx +expat_home := $(EXPAT_HOME) +mcpp_home := $(MCPP_HOME) + +define make-thirdparty +ifneq ($($1_home),) +# Check for 3rd party libraries either in home/lib or home/lib +$1_libdir ?= $$(strip $$(if $$(wildcard $$($1_home)/lib$$(call platform-var,installdir,$$1,$$2,$$3)),\ + $$($1_home)/lib$$(call platform-var,installdir,$$1,$$2,$$3),$$($1_home)/lib)) +$1_includedir ?= $$($1_home)/include +endif +$1_ldflags ?= -l$1 +endef +$(foreach l,$(thirdparties),$(eval $(call make-thirdparty,$l))) + +# +# Support for Ice libraries +# +static_projects = % +shared_excludes = IceUtil Slice + +$(eval $(call load-dependencies,$(addprefix $(top_srcdir)/ice/cpp/src/,IceUtil Slice Ice IceXML))) + +# Create component dependency variables +ice_targetdir := $(top_srcdir)/ice/cpp/lib +$(foreach d,$(dependencies),$(eval $(call create-component-targets,ice,$d,library))) + diff --git a/config/Make.rules.Darwin b/config/Make.rules.Darwin new file mode 100644 index 00000000..45342e3b --- /dev/null +++ b/config/Make.rules.Darwin @@ -0,0 +1,11 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# +# ********************************************************************** + +ifeq ($(DB_HOME),) + ifneq ($(wildcard /usr/local/opt/berkeley-db53),) + DB_HOME = /usr/local/opt/berkeley-db53 + endif +endif \ No newline at end of file diff --git a/cpp/Makefile b/cpp/Makefile index 2ba5aed4..c1087a3a 100644 --- a/cpp/Makefile +++ b/cpp/Makefile @@ -4,48 +4,35 @@ # # ********************************************************************** -top_srcdir = . +top_srcdir := .. +lang_srcdir := $(top_srcdir)/cpp -include $(top_srcdir)/make/Make.rules +include $(top_srcdir)/config/Make.rules +include $(lang_srcdir)/config/Make.rules -SUBDIRS = src include -ifneq ($(MAKECMDGOALS),install) - SUBDIRS := $(SUBDIRS) test demo -endif - -INSTALL_SUBDIRS = $(install_bindir) $(install_libdir)$(cpp11libdirsuffix) $(install_includedir) \ - $(install_mandir) - -install:: install-common - @for subdir in $(INSTALL_SUBDIRS); \ - do \ - if test ! -d $(DESTDIR)$$subdir ; \ - then \ - echo "Creating $(DESTDIR)$$subdir..." ; \ - mkdir -p $(DESTDIR)$$subdir ; \ - chmod a+rx $(DESTDIR)$$subdir ; \ - fi ; \ - done -ifeq ($(create_runpath_symlink),yes) - @if test -h $(embedded_runpath_prefix) ; \ - then \ - if `\rm -f $(embedded_runpath_prefix) 2>/dev/null`; \ - then echo "Removed symbolic link $(embedded_runpath_prefix)"; fi \ - fi - @if ! test -d $(embedded_runpath_prefix) ; \ - then \ - if `ln -s $(prefix) $(embedded_runpath_prefix) 2>/dev/null`; \ - then echo "Created symbolic link $(embedded_runpath_prefix) --> $(prefix)"; fi \ - fi -endif +# +# Create projects for all the Slice translators from src/slice2* and load source projects. +# +projects := +include $(shell find $(lang_srcdir)/src -name Makefile.mk) +$(foreach t,$(wildcard $(lang_srcdir)/src/slice2*),$(eval $(call create-translator-project,$(call project,$t)))) +$(call make-projects,$(projects),make-cpp-src-project) -$(EVERYTHING):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done +# +# Create and load test projects. +# +projects := +tests := $(tests-without-project-makefile) +include $(shell find $(lang_srcdir)/test -name Makefile.mk) +$(foreach t,$(tests),$(eval $(call create-cpp-test-project,$(t)))) +$(call make-projects,$(projects),make-cpp-test-project) -test:: - @python $(top_srcdir)/allTests.py +# +# Create and load demo projects. +# +projects := +demos := +include $(shell find $(lang_srcdir)/demo -name Makefile.mk) +$(foreach d,$(demos),$(eval $(call create-cpp-demo-project,$(d)))) +$(call make-projects,$(projects),make-cpp-demo-project) diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules new file mode 100644 index 00000000..297d1d0c --- /dev/null +++ b/cpp/config/Make.rules @@ -0,0 +1,156 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# +# ********************************************************************** + +# ---------------------------------------------------------------------- +# Don't change anything below this line! +# ---------------------------------------------------------------------- + +-include $(lang_srcdir)/config/Make.rules.$(os) + +# +# Supported configurations +# +supported-configs = shared static + +slice2cpp_targetext = cpp +slice2cpp_path = $(ice_bindir)/slice2cpp + +# +# Create top-level include/config dir +# +$(DESTDIR)$(install_includedir): + $(Q)$(MKDIR) $@ + +# +# $(call make-freeze-components,$1=project,$2=component,$3=target) +# +# This is called by the component extension mechanism to allow adding generated sources +# and headers to the build of the component. +# +define make-freeze-components + +ifneq ($$($2_slice2freeze),) + +$2_sources += $$(addprefix $$($1_generated_srcdir)/,$$(addsuffix .cpp,$$($2_slice2freeze))) + +$2_generated_includedir := $$(or $$($2_generated_includedir),$$($1_generated_includedir)) + +$$(foreach d,$$($2_slice2freeze),$$(if $$($2_$$d),$$(eval $$(call make-slice2freeze,$$d,$$($2_$$d),\ + $$($2_$$d_slice),$$($2_generated_includedir),$$($1_generated_srcdir),$$($2_$$d_flags) $$($2_sliceflags))))) + +$2_generated_headers += $$(foreach d,$$($2_slice2freeze),$$(if $$($2_$$d),$$($2_generated_includedir)/$$d.h)) +$1_generated += $$(foreach d,$$($2_slice2freeze),$$(if $$($2_$$d),$$($2_generated_includedir)/$$d.h)) + +ifeq ($(wildcard $$(1_generated_srcdir)/*),) +# Make sure the slice2freeze generated files are built first +$(wildcard $1/*.cpp): $$(foreach d,$$($2_slice2freeze),$$(if $$($2_$$d),$$($2_generated_includedir)/$$d.h)) +endif +endif + +endef + +define make-freeze-project + +ifneq ($$($1_slice2freeze),) + +$$(foreach d,$$($1_slice2freeze),$$(eval $$(call make-slice2freeze,$$d,$$($1_$$d),\ + $$($1_$$d_slice),$$($1_generated_includedir),$$($1_generated_srcdir),$$($1_$$d_flags) $$($1_sliceflags)))) + +$1_generated += $$(foreach d,$$($1_slice2freeze),$$($1_generated_includedir)/$$d.h) + +ifeq ($(wildcard $$(1_generated_srcdir)/*),) +# Make sure the slice2freeze generated files are built first +$(wildcard $1/*.cpp): $$(foreach d,$$($1_slice2freeze),$$($1_generated_includedir)/$$d.h) +endif +endif + +endef + +# +# $(call make-cpp-src-project,$1=project) +# +define make-cpp-src-project +ifeq ($(USE_BIN_DIST),yes) + $(create-project-targets) +else +ifneq ($(filter ../ice/%,$1),) +# Building ice submodule project +$1_cppflags += -I../ice/cpp/include -I../ice/cpp/include/generated -I../ice/cpp/src +else +# Building freeze project +$1_slicecompiler := slice2cpp +$1_sliceflags += --ice -I$(ice_slicedir) -I$(slicedir) +$1_cppflags += -I$(ice_includedir) -I$(includedir) -I$1/generated -I../ice/cpp/src -Isrc +$1_cppflags += -I$(ice_includedir)/generated -I$(includedir)/generated +$1_extensions := make-freeze-project +$1_component_extensions := make-freeze-components +endif +$(make-project) +srcs:: $1 +endif +endef + +# +# $(call make-cpp-test-project,$1=project) +# +define make-cpp-test-project +$1_slicecompiler := slice2cpp +$1_sliceflags += -I$(ice_slicedir) -I$(slicedir) -I$1 +$1_cppflags += -I$(ice_includedir) -I$(includedir) -I$1/generated -Itest/include -I$1 +ifneq ($(USE_BIN_DIST),yes) +$1_cppflags += -I$(ice_includedir)/generated -I$(includedir)/generated +endif +$1_extensions := make-freeze-project +$1_component_extensions := make-freeze-components +$(make-project) +tests:: $1 +endef + +# +# $(create-cpp-test-project $1=test) +# +define create-cpp-test-project +$1_srcext := cpp +$1_dependencies := $$(or $$($1_dependencies),Freeze Ice) +$(create-test-project) +endef + +# +# $(call make-cpp-demo-project,$1=project) +# +define make-cpp-demo-project +$1_slicecompiler := slice2cpp +$1_sliceflags += -I$(ice_slicedir) -I$(slicedir) -I$1 +$1_cppflags += -I$(ice_includedir) -I$(includedir) -I$1/generated -I$1 +ifneq ($(USE_BIN_DIST),yes) +$1_cppflags += -I$(ice_includedir)/generated -I$(includedir)/generated +endif +$1_extensions := make-freeze-project +$1_component_extensions := make-freeze-components +$(make-project) +demos:: $1 +endef + +# +# $(create-cpp-demo-project $1=demo) +# +define create-cpp-demo-project +$1_srcext := cpp +$1_dependencies := $$(or $$($1_dependencies),Freeze Ice) +$(create-test-project) +endef + +# +# $(call make-slice2freeze,$1=name,$2=command,$3=slice,$4=hdir,$5=sdir,$6=sliceflags) +# +define make-slice2freeze +$4/$1.h: $5/$1.cpp +$5/$1.cpp: $3 $$(slice2freeze_path) | $5 $4 + $(E) "Generating $$@ with slice2freeze" + $(Q)$(RM) $4/$1.h $5/$1.cpp + $(Q)$$(slice2freeze_path) $(strip $6) $2 --output-dir $5 $1 $3 + $(if $(filter-out $4,$5),$(Q)$(MV) $5/$1.h $4/$1.h) +endef diff --git a/cpp/demo/Freeze/Makefile b/cpp/demo/Freeze/Makefile deleted file mode 100644 index 3d5af3f3..00000000 --- a/cpp/demo/Freeze/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/make/Make.rules - -SUBDIRS = casino phonebook bench library backup transform customEvictor - -.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/demo/Freeze/backup/Makefile b/cpp/demo/Freeze/backup/Makefile deleted file mode 100644 index af8862f8..00000000 --- a/cpp/demo/Freeze/backup/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client - -TARGETS = $(CLIENT) - -OBJS = Client.o IntLongMap.o - -all:: IntLongMap.cpp IntLongMap.h - -include $(top_srcdir)/make/Make.rules - -CPPFLAGS := -I. $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -# The slice2freeze rules are structured like this to avoid issues with -# parallel make. -IntLongMap.h: IntLongMap.cpp -IntLongMap.cpp: $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f IntLongMap.h IntLongMap.cpp - $(SLICE2FREEZE) -I$(slicedir) --dict IntLongMap,int,long IntLongMap - -clean:: - -rm -f IntLongMap.h IntLongMap.cpp - -rm -rf db/__* db/data/* db/logs/* db/__Freeze - -rm -rf hotbackup hotbackup.1 diff --git a/cpp/demo/Freeze/backup/Makefile.mk b/cpp/demo/Freeze/backup/Makefile.mk new file mode 100644 index 00000000..0216219c --- /dev/null +++ b/cpp/demo/Freeze/backup/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# +# ********************************************************************** + +$(test)_client_sources := Client.cpp + +$(test)_client_slice2freeze := IntLongMap +$(test)_client_IntLongMap := --dict IntLongMap,int,long + +demos += $(test) diff --git a/cpp/demo/Freeze/bench/Makefile b/cpp/demo/Freeze/bench/Makefile deleted file mode 100644 index 29ee3da7..00000000 --- a/cpp/demo/Freeze/bench/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client - -TARGETS = $(CLIENT) - -SLICE_OBJS = Test.o - -OBJS = $(SLICE_OBJS) \ - BenchTypes.o \ - Client.o - -all:: BenchTypes.cpp BenchTypes.h - -include $(top_srcdir)/make/Make.rules - -CPPFLAGS := -I. $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -# The slice2freeze rules are structured like this to avoid issues with -# parallel make. -BenchTypes.h: BenchTypes.cpp -BenchTypes.cpp: Test.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f BenchTypes.h BenchTypes.cpp - $(SLICE2FREEZE) -I. -I$(slicedir) --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2 \ - --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1 \ - --dict Demo::Struct1ObjectMap,Demo::Struct1,Object \ - --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap \ - --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2 \ - --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive \ - --dict-index Demo::IndexedStruct1Struct2Map,s1 \ - --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1 \ - --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive \ - BenchTypes Test.ice - -clean:: - -rm -rf db/* - -rm -f BenchTypes.h BenchTypes.cpp diff --git a/cpp/demo/Freeze/bench/Makefile.mk b/cpp/demo/Freeze/bench/Makefile.mk new file mode 100644 index 00000000..61745dc9 --- /dev/null +++ b/cpp/demo/Freeze/bench/Makefile.mk @@ -0,0 +1,25 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# +# ********************************************************************** + +$(test)_client_sources := Test.ice Client.cpp +$(test)_client_slice2freeze := BenchTypes + +$(test)_client_BenchTypes := --dict "Demo::IntIntMap,int,int" \ + --dict "Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2" \ + --dict "Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1" \ + --dict "Demo::Struct1ObjectMap,Demo::Struct1,Object" \ + --dict "Demo::IndexedIntIntMap,int,int" \ + --dict-index "Demo::IndexedIntIntMap" \ + --dict "Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2" \ + --dict-index "Demo::IndexedStruct1Struct2Map,s,case-insensitive" \ + --dict-index "Demo::IndexedStruct1Struct2Map,s1" \ + --dict "Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1" \ + --dict-index "Demo::IndexedStruct1Class1Map,s,case-sensitive" + +$(test)_client_BenchTypes_slice := $(test)/Test.ice + + +demos += $(test) diff --git a/cpp/demo/Freeze/casino/Makefile b/cpp/demo/Freeze/casino/Makefile deleted file mode 100644 index df703097..00000000 --- a/cpp/demo/Freeze/casino/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -SLICE_OBJS = Casino.o \ - CasinoStore.o - -COBJS = Casino.o \ - Client.o \ - -SOBJS = $(SLICE_OBJS) \ - BankI.o \ - BetI.o \ - BetResolver.o \ - PlayerI.o \ - Server.o - - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/make/Make.rules - -CPPFLAGS := -I. $(CPPFLAGS) - -SLICE2CPPFLAGS := -I. $(SLICE2CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -clean:: - -rm -rf db/__catalog db/__catalogIndexList db/bet db/bank db/player db/log.* db/__Freeze diff --git a/cpp/demo/Freeze/casino/Makefile.mk b/cpp/demo/Freeze/casino/Makefile.mk new file mode 100644 index 00000000..4553f48e --- /dev/null +++ b/cpp/demo/Freeze/casino/Makefile.mk @@ -0,0 +1,16 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# +# ********************************************************************** + +$(test)_client_sources = Casino.ice Client.cpp + +$(test)_server_sources = Casino.ice CasinoStore.ice \ + BankI.cpp \ + BetI.cpp \ + BetResolver.cpp \ + PlayerI.cpp \ + Server.cpp + +demos += $(test) diff --git a/cpp/demo/Freeze/customEvictor/Makefile b/cpp/demo/Freeze/customEvictor/Makefile deleted file mode 100644 index e744767b..00000000 --- a/cpp/demo/Freeze/customEvictor/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Item.o \ - ItemInfo.o - -COBJS = Item.o \ - Client.o - -SOBJS = $(SLICE_OBJS) \ - ItemI.o \ - CurrentDatabase.o \ - Database.o \ - Evictor.o \ - EvictorBase.o \ - Server.o \ - SimpleEvictor.o - -OBJS = $(COBJS) \ - $(SOBJS) - -all:: Database.cpp Database.h - -include $(top_srcdir)/make/Make.rules - -CPPFLAGS := -I. $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -# The slice2freeze rules are structured like this to avoid issues with -# parallel make. -Database.h: Database.cpp -Database.cpp: ItemInfo.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f Database.h Database.cpp - $(SLICE2FREEZE) -I. -I$(slicedir) --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice - -clean:: - -rm -rf db/__* db/items db/log* db/__Freeze - -rm -f Database.h Database.cpp diff --git a/cpp/demo/Freeze/customEvictor/Makefile.mk b/cpp/demo/Freeze/customEvictor/Makefile.mk new file mode 100644 index 00000000..410b7c3c --- /dev/null +++ b/cpp/demo/Freeze/customEvictor/Makefile.mk @@ -0,0 +1,23 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# +# ********************************************************************** + +$(test)_client_sources = Item.ice Client.cpp + +$(test)_server_sources = Item.ice \ + ItemInfo.ice \ + ItemI.cpp \ + CurrentDatabase.cpp \ + Evictor.cpp \ + EvictorBase.cpp \ + Server.cpp \ + SimpleEvictor.cpp + +$(test)_server_slice2freeze := Database +$(test)_server_Database := --dict Database,string,Warehouse::ItemInfo +$(test)_server_Database_slice := $(test)/ItemInfo.ice + + +demos += $(test) diff --git a/cpp/demo/Freeze/library/Makefile b/cpp/demo/Freeze/library/Makefile deleted file mode 100644 index 25256586..00000000 --- a/cpp/demo/Freeze/library/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server -COLLOCATED = collocated - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -SLICE_OBJS = Library.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - Grammar.o \ - Parser.o \ - RunParser.o \ - Scanner.o - -SOBJS = $(SLICE_OBJS) \ - BookFactory.o \ - LibraryI.o \ - LibraryTypes.o \ - Server.o - -COLOBJS = $(SLICE_OBJS) \ - BookFactory.o \ - Collocated.o \ - Grammar.o \ - LibraryI.o \ - LibraryTypes.o \ - Parser.o \ - RunParser.o \ - Scanner.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(COLOBJS) - -all:: LibraryTypes.cpp LibraryTypes.h - -include $(top_srcdir)/make/Make.rules - -CPPFLAGS := -I. $(CPPFLAGS) $(READLINE_FLAGS) -SLICE2CPPFLAGS := --ice $(SLICE2CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(READLINE_LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -$(COLLOCATED): $(COLOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COLOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) $(READLINE_LIBS) - -# The slice2freeze rules are structured like this to avoid issues with -# parallel make. -LibraryTypes.h: LibraryTypes.cpp -LibraryTypes.cpp: Library.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f LibraryTypes.h LibraryTypes.cpp - $(SLICE2FREEZE) --ice -I. -I$(ice_slicedir) --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes $(ice_slicedir)/Ice/BuiltinSequences.ice Library.ice - -clean:: - -rm -rf db/* - -rm -f LibraryTypes.h LibraryTypes.cpp diff --git a/cpp/demo/Freeze/library/Makefile.mk b/cpp/demo/Freeze/library/Makefile.mk new file mode 100644 index 00000000..6b7682fb --- /dev/null +++ b/cpp/demo/Freeze/library/Makefile.mk @@ -0,0 +1,37 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# +# ********************************************************************** + +$(test)_client_sources := Library.ice \ + Client.cpp \ + Grammar.y \ + Parser.cpp \ + RunParser.cpp \ + Scanner.l + +$(test)_server_sources := Library.ice \ + BookFactory.cpp \ + LibraryI.cpp \ + Server.cpp + +$(test)_server_slice2freeze := LibraryTypes + +$(test)_collocated_sources := Library.ice \ + Collocated.cpp \ + Grammar.y \ + Parser.cpp \ + RunParser.cpp \ + Scanner.l \ + BookFactory.cpp \ + LibraryI.cpp + +$(test)_collocated_slice2freeze := LibraryTypes + +$(test)_slice2freeze := LibraryTypes +$(test)_LibraryTypes := --dict StringIsbnSeqDict,string,Ice::StringSeq +$(test)_LibraryTypes_slice := $(ice_slicedir)/Ice/BuiltinSequences.ice $(test)/Library.ice +$(test)_LibraryTypes_flags := --ice + +demos += $(test) diff --git a/cpp/demo/Freeze/phonebook/Makefile b/cpp/demo/Freeze/phonebook/Makefile deleted file mode 100644 index 46719b38..00000000 --- a/cpp/demo/Freeze/phonebook/Makefile +++ /dev/null @@ -1,71 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server -COLLOCATED = collocated - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -SLICE_OBJS = PhoneBook.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - Grammar.o \ - Parser.o \ - RunParser.o \ - Scanner.o - -SOBJS = $(SLICE_OBJS) \ - ContactFactory.o \ - NameIndex.o \ - PhoneBookI.o \ - Server.o - -COLOBJS = $(SLICE_OBJS) \ - Collocated.o \ - ContactFactory.o \ - Grammar.o \ - NameIndex.o \ - Parser.o \ - PhoneBookI.o \ - RunParser.o \ - Scanner.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(COLOBJS) - -all:: NameIndex.cpp NameIndex.h - -include $(top_srcdir)/make/Make.rules - -CPPFLAGS := -I. $(CPPFLAGS) $(READLINE_FLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(READLINE_LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -$(COLLOCATED): $(COLOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COLOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) $(READLINE_LIBS) - -# The slice2freeze rules are structured like this to avoid issues with -# parallel make. -NameIndex.h: NameIndex.cpp -NameIndex.cpp: PhoneBook.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f NameIndex.h NameIndex.cpp - $(SLICE2FREEZE) -I. $(ICECPPFLAGS) --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice - -clean:: - -rm -f NameIndex.h NameIndex.cpp - -rm -rf db/* diff --git a/cpp/demo/Freeze/phonebook/Makefile.mk b/cpp/demo/Freeze/phonebook/Makefile.mk new file mode 100644 index 00000000..1bbc1325 --- /dev/null +++ b/cpp/demo/Freeze/phonebook/Makefile.mk @@ -0,0 +1,36 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# +# ********************************************************************** + +$(test)_client_sources := PhoneBook.ice \ + Client.cpp \ + Grammar.y \ + Parser.cpp \ + RunParser.cpp \ + Scanner.l + +$(test)_server_sources := PhoneBook.ice \ + ContactFactory.cpp \ + PhoneBookI.cpp \ + Server.cpp + +$(test)_server_slice2freeze := NameIndex + +$(test)_collocated_sources := PhoneBook.ice \ + ContactFactory.cpp \ + PhoneBookI.cpp \ + Collocated.cpp \ + Grammar.y \ + Parser.cpp \ + RunParser.cpp \ + Scanner.l + +$(test)_collocated_slice2freeze := NameIndex + +$(test)_slice2freeze := NameIndex +$(test)_NameIndex := --index NameIndex,Demo::Contact,name,case-insensitive +$(test)_NameIndex_slice := $(test)/PhoneBook.ice + +demos += $(test) diff --git a/cpp/demo/Freeze/transform/Makefile b/cpp/demo/Freeze/transform/Makefile deleted file mode 100644 index 93eb92a2..00000000 --- a/cpp/demo/Freeze/transform/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CREATE = create -READ = read -READNEW = readnew -RECREATE = recreate - -TARGETS = $(CREATE) $(READ) $(READNEW) $(RECREATE) - -CREATE_OBJS = ContactData.o Contacts.o create.o -READ_OBJS = ContactData.o Contacts.o read.o -READNEW_OBJS = NewContactData.o NewContacts.o readnew.o -RECREATE_OBJS = NewContactData.o NewContacts.o recreate.o - -OBJS = $(CREATE_OBJS) $(READ_OBJS) $(READNEW_OBJS) $(RECREATE_OBJS) - -SLICE_OBJS = ContactData.o NewContactData.o - -all:: Contacts.cpp Contacts.h NewContacts.cpp NewContacts.h - -include $(top_srcdir)/make/Make.rules - -CPPFLAGS := -I. $(CPPFLAGS) - -$(CREATE): $(CREATE_OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(CREATE_OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -$(READ): $(READ_OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(READ_OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -$(READNEW): $(READNEW_OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(READNEW_OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -$(RECREATE): $(RECREATE_OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(RECREATE_OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - - -# The slice2freeze rules are structured like this to avoid issues with -# parallel make. -Contacts.h: Contacts.cpp -Contacts.cpp: ContactData.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f Contacts.h Contacts.cpp - $(SLICE2FREEZE) -I. -I$(slicedir) --dict Demo::Contacts,string,Demo::ContactData,sort \ - --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice - -NewContacts.h: NewContacts.cpp -NewContacts.cpp: NewContactData.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f NewContacts.h NewContacts.cpp - $(SLICE2FREEZE) -I. -I$(slicedir) --dict Demo::NewContacts,string,Demo::ContactData,sort \ - --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice - -cleandb:: - -rm -rf db/* dbnew/* - -clean:: - -rm -rf db/* dbnew/* - -rm -f Contacts.h Contacts.cpp NewContacts.h NewContacts.cpp diff --git a/cpp/demo/Freeze/transform/Makefile.mk b/cpp/demo/Freeze/transform/Makefile.mk new file mode 100644 index 00000000..dca2882d --- /dev/null +++ b/cpp/demo/Freeze/transform/Makefile.mk @@ -0,0 +1,32 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# +# ********************************************************************** + +$(test)_programs := create read recreate readnew + +$(test)_create_sources := ContactData.ice create.cpp +$(test)_create_slice2freeze := Contacts + +$(test)_read_sources := ContactData.ice read.cpp +$(test)_read_slice2freeze := Contacts + +$(test)_recreate_sources := NewContactData.ice recreate.cpp +$(test)_recreate_slice2freeze := NewContacts + +$(test)_readnew_sources := NewContactData.ice readnew.cpp +$(test)_readnew_slice2freeze := NewContacts + +$(test)_slice2freeze := Contacts NewContacts + +$(test)_Contacts := --dict "Demo::Contacts,string,Demo::ContactData,sort" \ + --dict-index "Demo::Contacts,phoneNumber,sort" +$(test)_Contacts_slice := $(test)/ContactData.ice + +$(test)_NewContacts := --dict "Demo::NewContacts,string,Demo::ContactData,sort" \ + --dict-index "Demo::NewContacts,phoneNumber,sort" +$(test)_NewContacts_slice := $(test)/NewContactData.ice + + +demos += $(test) diff --git a/cpp/demo/Makefile b/cpp/demo/Makefile deleted file mode 100644 index 2698ca8f..00000000 --- a/cpp/demo/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = .. - -include $(top_srcdir)/make/Make.rules - -SUBDIRS = Freeze \ - Manual - -.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/demo/Manual/Makefile b/cpp/demo/Manual/Makefile deleted file mode 100644 index 7e4d4da6..00000000 --- a/cpp/demo/Manual/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/make/Make.rules - -SUBDIRS = evictorFilesystem \ - mapFilesystem - -.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/demo/Manual/evictorFilesystem/Makefile b/cpp/demo/Manual/evictorFilesystem/Makefile deleted file mode 100644 index 295d6ecc..00000000 --- a/cpp/demo/Manual/evictorFilesystem/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Filesystem.o PersistentFilesystem.o - -COBJS = Filesystem.o \ - Client.o \ - Grammar.o \ - Parser.o \ - Scanner.o - -SOBJS = $(SLICE_OBJS) \ - PersistentFilesystemI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(COLOBJS) - - -include $(top_srcdir)/make/Make.rules - -CPPFLAGS := -I. $(CPPFLAGS) $(READLINE_FLAGS) -SLICE2CPPFLAGS := -I. $(SLICE2CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(READLINE_LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -clean:: - -rm -rf db/* diff --git a/cpp/demo/Manual/evictorFilesystem/Makefile.mk b/cpp/demo/Manual/evictorFilesystem/Makefile.mk new file mode 100644 index 00000000..f74b7775 --- /dev/null +++ b/cpp/demo/Manual/evictorFilesystem/Makefile.mk @@ -0,0 +1,18 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# +# ********************************************************************** + +$(test)_client_sources = Filesystem.ice \ + Client.cpp \ + Grammar.y \ + Parser.cpp \ + Scanner.l + +$(test)_server_sources = Filesystem.ice \ + PersistentFilesystem.ice \ + PersistentFilesystemI.cpp \ + Server.cpp + +demos += $(test) diff --git a/cpp/demo/Manual/mapFilesystem/Makefile b/cpp/demo/Manual/mapFilesystem/Makefile deleted file mode 100644 index cfe4a80f..00000000 --- a/cpp/demo/Manual/mapFilesystem/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Filesystem.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - Grammar.o \ - Parser.o \ - Scanner.o - -SOBJS = $(SLICE_OBJS) \ - FilesystemDB.o \ - FilesystemI.o \ - IdentityDirectoryEntryMap.o \ - IdentityFileEntryMap.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -all:: IdentityFileEntryMap.cpp IdentityDirectoryEntryMap.cpp - -include $(top_srcdir)/make/Make.rules - -CPPFLAGS := -I. $(CPPFLAGS) $(READLINE_FLAGS) -SLICE2CPPFLAGS := -I. $(SLICE2CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) $(READLINE_LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -IdentityFileEntryMap.h: IdentityFileEntryMap.cpp -IdentityFileEntryMap.cpp: FilesystemDB.ice Filesystem.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f IdentityFileEntryMap.h IdentityFileEntryMap.cpp - $(SLICE2FREEZE) -I$(ice_slicedir) -I. --ice \ - --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry \ - IdentityFileEntryMap FilesystemDB.ice $(ice_slicedir)/Ice/Identity.ice -clean:: - -rm -f IdentityFileEntryMap.h IdentityFileEntryMap.cpp - -IdentityDirectoryEntryMap.h: IdentityDirectoryEntryMap.cpp -IdentityDirectoryEntryMap.cpp: FilesystemDB.ice Filesystem.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f IdentityDirectoryEntryMap.h IdentityDirectoryEntryMap.cpp - $(SLICE2FREEZE) -I$(ice_slicedir) -I. --ice \ - --dict FilesystemDB::IdentityDirectoryEntryMap,Ice::Identity,FilesystemDB::DirectoryEntry \ - IdentityDirectoryEntryMap FilesystemDB.ice $(ice_slicedir)/Ice/Identity.ice -clean:: - -rm -f IdentityDirectoryEntryMap.h IdentityDirectoryEntryMap.cpp - -clean:: - -rm -f FilesystemDB.h FilesystemDB.cpp - -rm -rf db/* diff --git a/cpp/demo/Manual/mapFilesystem/Makefile.mk b/cpp/demo/Manual/mapFilesystem/Makefile.mk new file mode 100644 index 00000000..32b7a521 --- /dev/null +++ b/cpp/demo/Manual/mapFilesystem/Makefile.mk @@ -0,0 +1,28 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# +# ********************************************************************** + +$(test)_client_sources = Filesystem.ice \ + Client.cpp \ + Grammar.y \ + Parser.cpp \ + Scanner.l + +$(test)_server_sources = Filesystem.ice \ + FilesystemDB.ice \ + FilesystemI.cpp \ + Server.cpp + +$(test)_server_slice2freeze := IdentityFileEntryMap IdentityDirectoryEntryMap + +$(test)_server_IdentityFileEntryMap := --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry +$(test)_server_IdentityFileEntryMap_slice := $(test)/FilesystemDB.ice $(ice_slicedir)/Ice/Identity.ice +$(test)_server_IdentityFileEntryMap_flags := --ice + +$(test)_server_IdentityDirectoryEntryMap := --dict FilesystemDB::IdentityDirectoryEntryMap,Ice::Identity,FilesystemDB::DirectoryEntry +$(test)_server_IdentityDirectoryEntryMap_slice := $(test)/FilesystemDB.ice $(ice_slicedir)/Ice/Identity.ice +$(test)_server_IdentityDirectoryEntryMap_flags := --ice + +demos += $(test) diff --git a/cpp/include/Freeze/Makefile b/cpp/include/Freeze/Makefile deleted file mode 100644 index e67c0b82..00000000 --- a/cpp/include/Freeze/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/make/Make.rules - -install:: - @if test ! -d $(DESTDIR)$(install_includedir)/Freeze ; \ - then \ - echo "Creating $(DESTDIR)$(install_includedir)/Freeze..." ; \ - $(call mkdir,$(DESTDIR)$(install_includedir)/Freeze) ; \ - fi - - @for i in *.h ; \ - do \ - echo "Installing $$i" ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(install_includedir)/Freeze/$$i ; \ - chmod a+r $(DESTDIR)$(install_includedir)/Freeze/$$i ; \ - done diff --git a/cpp/include/Freeze/Map.h b/cpp/include/Freeze/Map.h index c93ba6d9..43a165cd 100644 --- a/cpp/include/Freeze/Map.h +++ b/cpp/include/Freeze/Map.h @@ -880,7 +880,7 @@ class MapObjectValueCodec : public MapCodecBase { _stream.startEncapsulation(); _stream.write(v); - _stream.writePendingObjects(); + _stream.writePendingValues(); _stream.endEncapsulation(); init(); } @@ -892,7 +892,7 @@ class MapObjectValueCodec : public MapCodecBase Ice::OutputStream stream(communicator, encoding); stream.startEncapsulation(); stream.write(v); - stream.writePendingObjects(); + stream.writePendingValues(); stream.endEncapsulation(); std::vector(stream.b.begin(), stream.b.end()).swap(bytes); } @@ -902,10 +902,10 @@ class MapObjectValueCodec : public MapCodecBase const Ice::EncodingVersion& encoding) { Ice::InputStream stream(communicator, encoding, bytes); - stream.setSliceObjects(false); + stream.setSliceValues(false); stream.startEncapsulation(); stream.read(v); - stream.readPendingObjects(); + stream.readPendingValues(); stream.endEncapsulation(); } }; diff --git a/cpp/include/Makefile b/cpp/include/Makefile deleted file mode 100644 index 7783f603..00000000 --- a/cpp/include/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = .. - -include $(top_srcdir)/make/Make.rules - -SUBDIRS = Freeze - -$(EVERYTHING):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done diff --git a/cpp/make/Make.rules b/cpp/make/Make.rules deleted file mode 100644 index decf8aee..00000000 --- a/cpp/make/Make.rules +++ /dev/null @@ -1,577 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -# -# Select an installation base directory. The directory will be created -# if it does not exist. -# -prefix ?= /opt/Ice-$(VERSION) - -# -# Define OPTIMIZE as yes if you want to build with -# optimization. Otherwise Ice is build with debug information. -# -#OPTIMIZE = yes - -# -# Define LP64 as yes or no if you want force a 32 or 64 bit. The -# default is platform-dependent -# -#LP64 ?= yes - -# -# Define CPP11 as yes if you want to enable C++11 features in GCC or -# Clang. -# -#CPP11 ?= yes - -# -# If Ice is not installed in the default location (/usr) set ICE_HOME to -# the Ice installation directory. -# -#ICE_HOME ?= /opt/Ice-3.6.1 - -# ---------------------------------------------------------------------- -# Don't change anything below this line! -# ---------------------------------------------------------------------- - -# -# Compile scanner and grammar files? -# -#BISON_FLEX ?= yes - -# -# Common definitions -# -ice_language = cpp -slice_translator = slice2cpp - -SHELL = /bin/sh -VERSION_MAJOR = 3 -VERSION_MINOR = 7 -VERSION_PATCH = 0 -VERSION = 3.7.0 -SHORT_VERSION = 3.7 -SOVERSION = 37 - -INSTALL = cp -fp -INSTALL_PROGRAM = ${INSTALL} -INSTALL_LIBRARY = ${INSTALL} -INSTALL_DATA = ${INSTALL} - -OBJEXT = .o - -UNAME := $(shell uname) -MACHINE_TYPE := $(shell uname -m) - -bindir = $(top_srcdir)/bin -libdir = $(top_srcdir)/$(libsubdir) -headerdir = $(top_srcdir)/include -slicedir = $(top_srcdir)/../slice - -# -# Ensure ice_language has been set by the file that includes this one. -# -ifndef ice_language -$(error ice_language must be defined) -endif - -ifeq ($(UNAME),Darwin) - usr_dir = /usr/local -else - usr_dir = /usr -endif - -ifeq ($(UNAME),SunOS) - ifeq ($(MACHINE_TYPE),sun4u) - lp64suffix = /64 - lp64binsuffix = /sparcv9 - endif - ifeq ($(MACHINE_TYPE),sun4v) - lp64suffix = /64 - lp64binsuffix = /sparcv9 - endif - ifeq ($(MACHINE_TYPE),i86pc) - lp64suffix = /amd64 - lp64binsuffix = /amd64 - endif -endif - -ifeq ($(UNAME),HP-UX) - lp64suffix = /pa20_64 - lp64binsuffix = /pa20_64 -endif - -ifeq ($(UNAME),Linux) - ifeq ($(MACHINE_TYPE),x86_64) - # - # Ubuntu. - # - ifeq ($(shell test -d $(usr_dir)/lib/x86_64-linux-gnu && echo 0),0) - lp64suffix = /x86_64-linux-gnu - endif - - # - # Rhel/SLES - # - ifeq ($(shell test -d $(usr_dir)/lib64 && echo 0),0) - lp64suffix = 64 - endif - - ifeq ($(LP64),) - LP64 = yes - endif - endif - ifneq ($(STATICLIBS),yes) - ifneq ($(LP64),yes) - binsuffix = 32 - endif - endif -endif - -ifeq ($(shell test -d $(usr_dir)/lib/i386-linux-gnu && echo 0),0) - lp32suffix = /i386-linux-gnu -endif - -ifeq ($(CPP11),yes) - ifneq ($(UNAME),Darwin) - cpp11libdirsuffix = /c++11 - cpp11libsuffix = ++11 - cpp11sonamedir = ../ - binsuffix := $(binsuffix)++11 - endif -endif - -ifneq ($(findstring MINGW,$(UNAME)),) - UNAME := MINGW - lp64suffix := /x64 - COMPILER_MACHINE := $(shell $(CXX) -dumpmachine) - ifeq ($(COMPILER_MACHINE),x86_64-w64-mingw32) - LP64 := yes - endif -endif - -ifeq ($(LP64),yes) - libsubdir := lib$(lp64suffix) - binsubdir := bin$(lp64binsuffix) -else - libsubdir := lib$(lp32suffix) - binsubdir := bin - # - # For x86 builds in x86_64 machines lib64subdir points to the x86_64 lib - # directory and libsubdir to the x86 lib directory. - # - ifeq ($(MACHINE_TYPE),x86_64) - lib64subdir = lib$(lp64suffix) - endif -endif - -# -# The following variables might also be defined: -# -# - slice_translator: the name of the slice translator required for the build. -# Setting this variable is required when building source trees other than the -# the source distribution (e.g.: the demo sources). -# -ifeq ($(ICE_HOME),) - # - # /usr or /usr/local install. - # - ifndef slice_translator -$(error slice_translator must be defined) - endif - - ifneq ($(shell test -f $(usr_dir)/bin/$(slice_translator) && echo 0), 0) -$(error Unable to find a valid Ice distribution, please verify ICE_HOME is properly configured and Ice is correctly installed.) - endif - - ice_dir = $(usr_dir) - ice_cpp_dir = $(ice_dir) -else - # - # Two cases here. Either an /opt style install, or a source tree. - # - ice_dir = $(ICE_HOME) - ifeq ($(shell test -f $(ICE_HOME)/$(binsubdir)/$(slice_translator) && echo 0), 0) - ice_cpp_dir = $(ice_dir) - else - ifeq ($(shell test -f $(ice_dir)/cpp/bin/$(slice_translator) && echo 0), 0) - ice_src_dist = 1 - ice_cpp_dir = $(ice_dir)/cpp - else -$(error Unable to find $(slice_translator) in $(ICE_HOME)/$(binsubdir), please verify ICE_HOME is properly configured and Ice is correctly installed.) - endif - endif -endif - -# -# Set ice_slicedir to the path of the directory containing the Slice files. -# -ifeq ($(ice_dir), $(usr_dir)) - ice_slicedir = $(usr_dir)/share/slice -else - ice_slicedir = $(ice_dir)/slice -endif - -ifdef ice_src_dist - ice_lib_dir = $(ice_cpp_dir)/$(libsubdir) - ice_bin_dir = $(ice_cpp_dir)/$(binsubdir) -else - ifndef lib64subdir - ice_lib_dir = $(ice_dir)/$(libsubdir) - else - ice_lib_dir = $(ice_dir)/$(lib64subdir) - endif - ice_bin_dir = $(ice_dir)/$(binsubdir) -endif - -# -# Set environment variables for the Slice translator. -# -ifneq ($(ice_dir), $(usr_dir)) - # - # We always set library path because the build needs to work - # whe slice compiler was built without RPATH - # - ifeq ($(UNAME),Linux) - export LD_LIBRARY_PATH := $(ice_lib_dir):$(LD_LIBRARY_PATH) - endif - - ifeq ($(UNAME),Darwin) - export DYLD_LIBRARY_PATH := $(ice_lib_dir):$(DYLD_LIBRARY_PATH) - endif - - - ifeq ($(UNAME),SunOS) - ifeq ($(LP64),yes) - export LD_LIBRARY_PATH_64 := $(ice_lib_dir):$(LD_LIBRARY_PATH_64) - else - export LD_LIBRARY_PATH := $(ice_lib_dir):$(LD_LIBRARY_PATH) - endif - endif - - ifeq ($(UNAME),AIX) - export LIBPATH := $(ice_lib_dir):$(LIBPATH) - endif - - ifeq ($(UNAME),HP-UX) - ifeq ($(LP64),yes) - export LD_LIBRARY_PATH := $(ice_lib_dir)$(lp64dir):$(SHLIB_PATH) - else - export SHLIB_PATH := $(ice_lib_dir):$(LD_LIBRARY_PATH) - endif - endif - - ifeq ($(UNAME),FreeBSD) - export LD_LIBRARY_PATH := $(ice_lib_dir):$(LD_LIBRARY_PATH) - endif - - ifeq ($(UNAME),OSF1) - export LD_LIBRARY_PATH := $(ice_lib_dir):$(LD_LIBRARY_PATH) - endif - - ifneq ($(findstring MINGW,$(UNAME)),) - set PATH := $(ice_lib_dir);$(PATH) - endif -endif - - -# -# Default functions for shared library names (we have to defined them here -# for the SLICE2PARSERLIB dependency) -# -ifeq ($(mklibfilename),) - ifeq ($(UNAME),Darwin) - mklibfilename = $(if $(2),lib$(1)$(cpp11libsuffix).$(2).dylib,lib$(1)$(cpp11libsuffix).dylib) - else - mklibfilename = $(if $(2),lib$(1)$(cpp11libsuffix).so.$(2),lib$(1)$(cpp11libsuffix).so) - endif -endif - -ifeq ($(mksoname),) - ifeq ($(UNAME),Darwin) - mksoname = $(if $(2),lib$(1)$(cpp11libsuffix).$(2).dylib,lib$(1).dylib) - else - mksoname = $(if $(2),lib$(1)$(cpp11libsuffix).so.$(2),lib$(1).so) - endif -endif - -ifeq ($(mklibname),) - ifeq ($(STATICLIBS),yes) - mklibname = lib$(1)$(cpp11libsuffix).a - else - ifeq ($(UNAME),Darwin) - mklibname = lib$(1).dylib - else - mklibname = lib$(1).so - endif - endif -endif - -ifndef mklibtargets - ifeq ($(STATICLIBS),yes) - mklibtargets = $(3) - else - mklibtargets = $(1) $(2) $(3) - endif -endif - -all:: - -includedir = $(ice_cpp_dir)/include - -# -# Embed the runpath if ICE_HOME is defined, otherwise the install -# is /usr or /usr/local. -# -ifneq ($(ICE_HOME),) - embedded_runpath = yes -endif - -# -# Platform specific definitions -# -include $(top_srcdir)/make/Make.rules.$(UNAME) - -install_includedir := $(prefix)/include -install_bindir := $(prefix)/$(binsubdir)$(cpp11suffix) -install_libdir := $(prefix)/$(libsubdir)$(cpp11suffix) - -ifndef usr_dir_install -install_mandir := $(prefix)/man/man1 -else -install_mandir := $(prefix)/share/man/man1 -endif - -ICECPPFLAGS = -I$(ice_slicedir) -I$(slicedir) - -SLICE2CPPFLAGS = $(ICECPPFLAGS) - -CPPFLAGS += -I$(headerdir) - -ifeq ($(ice_dir), $(usr_dir)) - LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) - ifeq ($(CPP11),yes) - LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11libdirsuffix) - endif -else - CPPFLAGS += -I$(includedir) - ifdef ice_src_dist - LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_cpp_dir)/$(libsubdir)$(cpp11libdirsuffix) - else - LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11libdirsuffix) - endif -endif - -LDFLAGS += -L$(libdir)$(cpp11libdirsuffix) - -ifeq ($(FLEX_NOLINE),yes) - FLEXFLAGS := -L -else - FLEXFLAGS := -endif - -ifeq ($(BISON_NOLINE),yes) - BISONFLAGS := -dvtl -else - BISONFLAGS := -dvt -endif - -ifneq ($(DB_HOME),) - DB_FLAGS = -I$(DB_HOME)/include - ifeq ($(DB_LIBS),) - DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb_cxx - endif - DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir)) -else - ifeq ($(shell if [ -d /usr/include/db53 -a -d /usr/$(libsubdir)/db53 ] ; then echo yes; fi), yes) - DB_FLAGS = -I/usr/include/db53 - DB_LIBS = -L/usr/$(libsubdir)/db53 -ldb_cxx - else - ifeq ($(shell if [ -d /usr/local/include/db53 -a -d /usr/local/$(libsubdir)/db53 ] ; then echo yes; fi), yes) - DB_FLAGS = -I/usr/local/include/db53 - DB_LIBS = -L/usr/local/$(libsubdir)/db53 -ldb_cxx - else - DB_LIBS = -ldb_cxx - endif - endif -endif - -ifeq ($(mkshlib),) - $(error You need to define mkshlib in Make.rules.$(UNAME)) -endif - -SLICEPARSERLIB = $(ice_lib_dir)/$(subst $(cpp11libsuffix),,$(call mklibfilename,Slice,$(VERSION))) -SLICE2CPP = $(ice_bin_dir)/slice2cpp -SLICE2FREEZE = $(bindir)/slice2freeze - -EVERYTHING = all clean install -EVERYTHING_EXCEPT_ALL = clean install - -.SUFFIXES: -.SUFFIXES: .cpp .c .o - -ifneq ($(SLICE_OBJS),) --include $(addprefix .depend/, $(SLICE_OBJS:.o=.ice.d)) -endif - -# -# If dependencies haven't been created yet make all OBJS depend on all -# SRCS, Slice generated files will be created before C++ compilation -# starts. This prevents issues parallel make. -# -ifneq ($(OBJS),) - -ifeq ($(wildcard .depend/*.d),) - -$(OBJS):$(OBJS:.o=.cpp) - -else - --include $(addprefix .depend/, $(OBJS:.o=.d)) - -# -# OBJS depend on the non existing sources so generated files are created -# before compilation takes place. -# -$(OBJS):$(filter-out $(wildcard $(OBJS:.o=.cpp)) ,$(OBJS:.o=.cpp)) - -clean:: - rm -rf .depend -endif - -endif - -.cpp.o: - $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< - @mkdir -p .depend - @$(CXX) -DMAKEDEPEND -M $(CPPFLAGS) $< | sed 's/$(subst /,\/,$(includedir))/$$\(includedir\)/' > .depend/$(*F).d - -.c.o: - $(CC) -c $(CPPFLAGS) $(CFLAGS) $< - -$(HDIR)/%.h %.cpp: $(SDIR)/%.ice $(SLICE2CPP) $(SLICEPARSERLIB) - rm -f $(HDIR)/$(*F).h $(*F).cpp - $(SLICE2CPP) $(SLICE2CPPFLAGS) $< - mv $(*F).h $(HDIR) - @touch $(*F).cpp - @mkdir -p .depend - @$(SLICE2CPP) $(SLICE2CPPFLAGS) --depend $< | sed 's/\(.*: \\\)/\$$(HDIR)\/\1/' > .depend/$(*F).ice.d - -%.h %.cpp: %.ice $(SLICE2CPP) $(SLICEPARSERLIB) - rm -f $(*F).h $(*F).cpp - $(SLICE2CPP) $(SLICE2CPPFLAGS) $(*F).ice - @touch $(*F).cpp - @mkdir -p .depend - @$(SLICE2CPP) $(SLICE2CPPFLAGS) --depend $(*F).ice > .depend/$(*F).ice.d - -ifeq ($(BISON_FLEX),yes) - -%.h %.cpp: %.y - rm -f $(*F).h $(*F).cpp - bison $(BISONFLAGS) $< - mv $(*F).tab.c $(*F).cpp - mv $(*F).tab.h $(*F).h - rm -f $(*F).output - -%.cpp: %.l - flex $(FLEXFLAGS) $< - rm -f $@ - echo '#include ' > $@ - cat lex.yy.c >> $@ - rm -f lex.yy.c - -endif - -all:: $(SRCS) $(TARGETS) - -clean:: - -rm -f $(TARGETS) - -rm -f core *.o *.bak - -rm -rf .depend - -ifneq ($(SLICE_OBJS),) -clean:: - rm -f $(addsuffix .cpp, $(basename $(notdir $(SLICE_OBJS)))) - rm -f $(addsuffix .h, $(basename $(notdir $(SLICE_OBJS)))) -endif - -ifneq ($(HDIR),) -clean:: - rm -f $(addprefix $(HDIR)/, $(addsuffix .h, $(basename $(SLICE_OBJS)))) -endif - -ifeq ($(installlib),) - ifeq ($(STATICLIBS),yes) - installlib = $(INSTALL) $(2)/$(5) $(1); \ - chmod a+rx $(1)/$(5) - else - installlib = $(INSTALL) $(2)/$(3) $(1); \ - rm -f $(1)/$(4); ln -s $(3) $(1)/$(4); \ - rm -f $(1)$(cpp11libdirsuffix)/$(5); ln -s $(cpp11sonamedir)$(4) $(1)$(cpp11libdirsuffix)/$(5); \ - chmod a+rx $(1)/$(3) - endif -endif - -ifeq ($(installdata),) - installdata = $(INSTALL_DATA) $(1) $(2); \ - chmod a+r $(2)/$(notdir $(1)) -endif - -ifeq ($(installprogram),) - installprogram = $(INSTALL_PROGRAM) $(1) $(2); \ - chmod a+rx $(2)/$(notdir $(1)) -endif - -ifeq ($(mkdir),) - mkdir = $(if $(2),mkdir $(2) $(1),mkdir $(1)); \ - chmod a+rx $(1) -endif - -# -# Installation location for slice and doc files. -# -ifdef usr_dir_install - install_slicedir = $(prefix)/share/Ice-$(VERSION)/slice - install_docdir = $(prefix)/share/Ice-$(VERSION) -else - install_slicedir = $(prefix)/slice - install_docdir = $(prefix) -endif - -ifeq ($(wildcard $(top_srcdir)/../ICE_LICENSE.txt),) - TEXT_EXTENSION = -else - TEXT_EXTENSION = .txt -endif - -install-common:: - @if test ! -d $(DESTDIR)$(prefix) ; \ - then \ - echo "Creating $(prefix)..." ; \ - $(call mkdir,$(DESTDIR)$(prefix), -p) ; \ - fi - - @if test ! -d $(DESTDIR)$(install_slicedir) ; \ - then \ - echo "Creating $(DESTDIR)$(install_slicedir)..." ; \ - $(call mkdir, $(DESTDIR)$(install_slicedir), -p) ; \ - if test ! -z "$(usr_dir_install)" ; \ - then \ - ln -s Ice-$(VERSION)/slice $(DESTDIR)/$(prefix)/share/slice ; \ - fi ; \ - cd $(top_srcdir)/../slice ; \ - for subdir in * ; \ - do \ - echo "Copying slice/$$subdir to $(DESTDIR)$(install_slicedir)..." ; \ - cp -fpr $$subdir $(DESTDIR)$(install_slicedir) ; \ - done ; \ - fi - - @if test ! -f $(DESTDIR)$(install_docdir)/LICENSE$(TEXT_EXTENSION) ; \ - then \ - $(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_docdir)) ; \ - fi diff --git a/cpp/make/Make.rules.Darwin b/cpp/make/Make.rules.Darwin deleted file mode 100644 index 9db3ed4e..00000000 --- a/cpp/make/Make.rules.Darwin +++ /dev/null @@ -1,82 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -# -# This file is included by Make.rules when uname is Darwin. -# - -OSX_TARGET_MIN_SDK_VERSION = 10.9 - -CXX = xcrun clang++ - -CPPFLAGS += -pthread -fvisibility=hidden -CXXFLAGS += -Wall -Werror -Wextra -Wshadow -Wredundant-decls -mmacosx-version-min=$(OSX_TARGET_MIN_SDK_VERSION) - -# -# By default we build x86_64 binaries. -# -ifeq ($(CXXARCHFLAGS),) - CXXARCHFLAGS := -arch x86_64 -endif - -ifeq ($(OPTIMIZE),yes) - CXXFLAGS := $(CXXARCHFLAGS) -O2 -DNDEBUG $(CXXFLAGS) -else - CXXFLAGS := $(CXXARCHFLAGS) -g $(CXXFLAGS) -endif - -# -# On OS X, always build with C++11 support enabled unless we -# explicitly set it to no (possibly to test binary compatibility). -# -ifneq ($(CPP11), no) - CPPFLAGS += --std=c++11 -endif - -# -# C++ run-time libraries, necessary for linking some shared libraries. -# -CXXLIBS = - -clean:: - rm -f *.keychain *.fl* - -# -# If embedded_runpath is not set to yes we do not add -# an rpath dir. -# -ifeq ($(embedded_runpath),yes) - LOADER_PATH = @loader_path - - ifeq ($(RPATH_DIR),) - ifdef ice_src_dist - RPATH_DIR = @loader_path/$(libdir) - else - RPATH_DIR = $(ice_dir)/$(libsubdir) - endif - endif - - LDEXEFLAGS = -Wl,-rpath,$(ice_lib_dir) -Wl,-rpath,$(RPATH_DIR) -endif - -mklib = libtool -static -o $(1) $(2) -mkshlib = $(CXX) -dynamiclib $(LDFLAGS) -o $(1) -install_name @rpath/$(2) $(3) $(4) - -BASELIBS = -lIceUtil -LIBS = -lIce $(BASELIBS) - -ICONV_LIB = -liconv - -ICEUTIL_OS_LIBS = -ICE_OS_LIBS = -ldl - -SSL_OS_LIBS = -framework Security -framework CoreFoundation - -ifeq ($(DB_HOME),) - ifneq ($(wildcard /usr/local/opt/berkeley-db53),) - DB_HOME = /usr/local/opt/berkeley-db53 - endif -endif diff --git a/cpp/make/Make.rules.Linux b/cpp/make/Make.rules.Linux deleted file mode 100644 index bac778b3..00000000 --- a/cpp/make/Make.rules.Linux +++ /dev/null @@ -1,179 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -# -# This file is included by Make.rules when uname is Linux. -# - -USE_SPARC_ASM = irrelevant -MACHINE = $(shell uname -m) -SUSE_i586 = $(shell grep i586 /etc/SuSE-release 2>/dev/null) - -ifneq ($(shell grep 'release 4' /etc/redhat-release 2>/dev/null),) - NPTL_LIB = -L/usr/$(libsubdir)/nptl - NPTL_FLAGS = -I/usr/include/nptl -endif - -# -# Default compiler is c++ (aka g++). -# -ifeq ($(CXX),) - CXX = g++ -endif - -ifeq ($(CXX),c++) - CXX = g++ -endif - -ifeq ($(CXX),clang++) - GCC_COMPILER = yes -endif - -ifeq ($(CXX:g++%=g++),g++) - GCC_COMPILER = yes -endif - -ifeq ($(GCC_COMPILER),yes) - - ifneq ($(SUSE_i586),) - CXXARCHFLAGS += -march=i586 - endif - - ifeq ($(CPP11), yes) - CXXFLAGS += -std=c++0x - endif - - ifeq ($(MACHINE),sparc64) - # - # We are an ultra, at least, and so have the atomic instructions - # - $(warning ===================================================================) - $(warning Linux on SPARC is currently unsupported. The Ice team does not) - $(warning maintain SPARC specific portions of the source code or build) - $(warning system. Contact sales@zeroc.com if you wish to sponsor official) - $(warning support.) - $(warning ===================================================================) - USE_SPARC_ASM = yes - CXXARCHFLAGS += -mcpu=ultrasparc -pipe -Wno-deprecated -DUSE_SPARC_ASM - endif - - ifeq ($(MACHINE),sparc) - # - # We are a sun4m or sun4c - # On sun4m, there is a bug in some CPU/kernel/gcc configurations which - # prevent us from using '-mcpu=v8' - # - $(warning ===================================================================) - $(warning Linux on SPARC is currently unsupported. The Ice team does not) - $(warning maintain SPARC specific portions of the source code or build) - $(warning system. Contact sales@zeroc.com if you wish to sponsor official) - $(warning support.) - $(warning ===================================================================) - USE_SPARC_ASM = no - CXXARCHFLAGS += -mtune=v8 -pipe -Wno-deprecated -DICE_USE_MUTEX_SHARED - endif - - ifeq ($(MACHINE),x86_64) - ifeq ($(LP64),yes) - CXXARCHFLAGS += -m64 - else - CXXARCHFLAGS += -m32 - endif - endif - - CXXFLAGS += $(CXXARCHFLAGS) -fvisibility=hidden -Wall -Werror -Wextra -pthread - - ifneq ($(GENPIC),no) - CXXFLAGS += -fPIC - endif - - ifeq ($(OPTIMIZE),yes) - CXXFLAGS += -O2 -DNDEBUG - else - CXXFLAGS += -g - endif - - # - # Add RPATH to LDEXEFLAGS if embedded_runpath is set to yes - # - ifeq ($(embedded_runpath),yes) - # - # Unless new_dtags is set to yes we use old style dtags, to add a RPATH - # entry instead of RUNPATH entry, this allow the plug-ins to load without - # need to set LD_LIBRARY_PATH - # - ifeq ($(new_dtags),yes) - DTAGS = -Wl,--enable-new-dtags - else - DTAGS = -Wl,--disable-new-dtags - endif - - LOADER_PATH = \$$ORIGIN - ifeq ($(RPATH_DIR),) - ifdef ice_src_dist - RPATH_DIR = \$$ORIGIN/$(libdir) - else - RPATH_DIR = $(ice_dir)/$(libsubdir) - endif - endif - - LDEXEFLAGS = $(DTAGS) -Wl,-rpath,$(ice_lib_dir) -Wl,-rpath,$(RPATH_DIR) - endif - - # - # C++ run-time libraries, necessary for linking some shared libraries. - # - CXXLIBS = - - mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) - - mklib = ar cr $(1) $(2) - - LDPLATFORMFLAGS += -rdynamic - -endif - -ifeq ($(CXX),icpc) - $(warning ===================================================================) - $(warning Intel C++ is currently not supported. The Ice team does not) - $(warning maintain Intel C++ specific portions of the source code or build) - $(warning system. Contact sales@zeroc.com if you wish to sponsor official) - $(warning support.) - $(warning ===================================================================) - CXXFLAGS = -D_REENTRANT - - ifneq ($(GENPIC),no) - CXXFLAGS += -fPIC - endif - - ifeq ($(OPTIMIZE),yes) - CXXFLAGS += -O2 -DNDEBUG - else - CXXFLAGS += -g - endif - - # - # C++ run-time libraries, necessary for linking some shared libraries. - # - CXXLIBS = - - mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) -lpthread - - mklib = ar cr $(1) $(2) - -endif - -BASELIBS = -lIceUtil -ifneq ($(NPTL_LIB),) - CXXFLAGS += $(NPTL_FLAGS) - BASELIBS := $(NPTL_LIB) $(BASELIBS) -endif - -ICESSL_LIBS = $(OPENSSL_RPATH_LINK) -lIceSSL -LIBS = $(BZIP2_RPATH_LINK) -lIce $(BASELIBS) - -ICEUTIL_OS_LIBS = -lrt $(OPENSSL_RPATH_LINK) -lcrypto -ICE_OS_LIBS = -ldl diff --git a/cpp/make/Make.rules.msvc b/cpp/make/Make.rules.msvc deleted file mode 100755 index df96c655..00000000 --- a/cpp/make/Make.rules.msvc +++ /dev/null @@ -1,88 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -# -# This file is included by Make.rules.mak when using a Microsoft C++ -# compiler -# - -CXX = cl.exe -CC = cl.exe -LINK = link.exe -AR = lib.exe -RC = rc.exe - -BASE = /base -PREOUT = /out: -PRELIBS = -PRELIBPATH = /LIBPATH: - -!if "$(OPTIMIZE)" != "yes" || "$(RELEASEPDBS)" == "yes" -GENERATE_PDB = yes -!endif - -CPPFLAGS = $(CPPFLAGS) -nologo -GR -EHsc -WX -!if "$(MAXWARN)" != "yes" -# Added for VS2015 RC: -wd4275 -CPPFLAGS = $(CPPFLAGS) -W3 -wd4250 -wd4251 -wd4275 -!else -CPPFLAGS = $(CPPFLAGS) -W4 -!endif -ARFLAGS = $(ARFLAGS) -nologo -WX - -# -# ICE_WIN32_WINNT sets the minimum version of Windows supported by this build -# 0x600 = Windows Vista / Windows Server 2008 -# 0x601 = Windows 7 / Windows Server 2008 R2 -# 0x602 = Windows 8 / Windows Server 2012 -# -ICE_WIN32_WINNT = 0x601 -CPPFLAGS = $(CPPFLAGS) -D_CONSOLE -D_WIN32_WINNT=$(ICE_WIN32_WINNT) - -CPPFLAGS = $(CPPFLAGS) -MP - -!if "$(OPTIMIZE)" == "yes" - -CPPFLAGS = $(CPPFLAGS) -O2 -DNDEBUG -MD -CONFIG = Retail - -!if "$(RELEASEPDBS)" == "yes" -CPPFLAGS = $(CPPFLAGS) -Zi -Oy- -!endif - -!else - -CPPFLAGS = $(CPPFLAGS) -Zi -Od -D_DEBUG -MDd -RTC1 -CONFIG = Debug - -!endif - -!if "$(STATICLIBS)" == "yes" -CPPFLAGS = $(CPPFLAGS) -DICE_STATIC_LIBS -!endif - -LDFLAGS = $(LDFLAGS) /nologo - -!if "$(OPTIMIZE)" == "yes" -LDFLAGS = $(LDFLAGS) /OPT:REF -!endif - -!if "$(GENERATE_PDB)" != "yes" -LDFLAGS = $(LDFLAGS) /pdb:none -!else -LDFLAGS = $(LDFLAGS) /debug /incremental:no -!endif - -LD_DLLFLAGS = $(LDFLAGS) /dll -LD_EXEFLAGS = $(LDFLAGS) - -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) - -# -# With MSVC, we link automatically all Ice libraries using pragma comment -# -BASELIBS = -LIBS = diff --git a/cpp/make/makedepend-slice.vbs b/cpp/make/makedepend-slice.vbs deleted file mode 100644 index fe993c31..00000000 --- a/cpp/make/makedepend-slice.vbs +++ /dev/null @@ -1,50 +0,0 @@ - -Const ForReading = 1, ForWriting = 2, ForAppending =8 - -Dim line, fs, baseName, outFile, depends, shell, srcPrefix - -Set depends = CreateObject("Scripting.Dictionary") - -Set fs = CreateObject("Scripting.FileSystemObject") - -Set shell = WScript.CreateObject("WScript.Shell") - -baseName = WScript.Arguments(0) - -If InStr(1, shell.ExpandEnvironmentStrings("%WINRT%"), "yes") Then - baseName = Replace(baseName, "..\", "") -End If - -Set outFile = fs.OpenTextFile(".depend.mak", ForAppending, True) - -outFile.WriteLine("") - -If WScript.Arguments.Count > 1 Then - srcPrefix = WScript.Arguments(1) -Else - srcPrefix = "" -End If - -Do While Not WScript.StdIn.AtEndOfStream - line = WScript.StdIn.ReadLine() - line = Trim(line) - line = Replace(line, "..\..\..\..\..\slice", "$(slicedir)") - line = Replace(line, "..\..\..\..\slice", "$(slicedir)") - line = Replace(line, "..\..\..\slice", "$(slicedir)") - line = Replace(line, "..\..\slice", "$(slicedir)") - - If len(line) > 0 Then - If InStr(len(line) - 2, line, ": \") Then - outFile.WriteLine(srcPrefix & line) - Else - If InStr(1, line, "$(slicedir)") Then - line = """" & Replace(line, ".ice", ".ice""") - End If - line = " " & line - If Not depends.Exists(line) Then - depends.Add line, "" - outFile.WriteLine(line) - End If - End If - End If -Loop diff --git a/cpp/make/makedepend.vbs b/cpp/make/makedepend.vbs deleted file mode 100644 index c3f7c7f8..00000000 --- a/cpp/make/makedepend.vbs +++ /dev/null @@ -1,85 +0,0 @@ - -Const ForReading = 1, ForWriting = 2, ForAppending =8 - -Dim line, i, fs, baseName, outFile, depends, errors, shell, topSrcDir, cppSrcDir, cppIncludeDir, cppTestIncludeDir, workDir, objPrefix - -Set depends = CreateObject("Scripting.Dictionary") - -errors = False - -Set fs = CreateObject("Scripting.FileSystemObject") - -Set shell = WScript.CreateObject("WScript.Shell") - -baseName = WScript.Arguments(0) - - -topSrcDir = fs.GetAbsolutePathName(WScript.Arguments(1) & "\..") -cppThirdPartyDir = fs.GetAbsolutePathName(WScript.Arguments(1) & "\third-party-packages\") -cppSrcDir = fs.GetAbsolutePathName(WScript.Arguments(1) & "\src\") -cppIncludeDir = fs.GetAbsolutePathName(WScript.Arguments(1) & "\include\") -cppTestIncludeDir = fs.GetAbsolutePathName(WScript.Arguments(1) & "\test\include\") -workDir = fs.GetAbsolutePathName(".") - -iceCppIncludeDir = fs.GetAbsolutePathName(WScript.Arguments(1) & "\..\cpp\include\") - -objPrefix = "" - -If InStr(1, shell.ExpandEnvironmentStrings("%WINRT%"), "yes") Then - baseName = Replace(baseName, "..\..\IceDiscovery\", "IceDiscovery\") - baseName = Replace(baseName, "..\..\IceLocatorDiscovery\", "IceLocatorDiscovery\") - baseName = Replace(baseName, "..\", "") - objPrefix = "$(ARCH)\$(CONFIG)\" -End If - -Set outFile = fs.OpenTextFile(".depend.mak", ForAppending, True) - -outFile.WriteLine("") - -outFile.WriteLine(objPrefix & Replace(baseName, ".cpp", ".obj") & ": \") -outFile.WriteLine(" " & WScript.Arguments(0) & " \") - -Set stream = fs.OpenTextFile(Replace(basename, ".cpp", ".d"), ForReading) - -Do While Not stream.AtEndOfStream - Do - line = stream.ReadLine() - - i = InStr(1, line, "Note: including file:") - If i > 0 Then - i = i + Len("Note: including file:") - line = Mid(line, i) - line = Trim(line) - - line = fs.GetAbsolutePathName(line) - - If InStr(1, line, cppThirdPartyDir) Then Exit Do - - If InStr(1, line, topSrcDir) Then - If InStr(1, line, workDir & "\") > 0 Then - line = Right(line, len(line) - len(workDir) -1) - Elseif InStr(1, line, cppSrcDir) > 0 Then - line = WScript.Arguments(1) & "\src" & Right(line, len(line) - len(cppSrcDir)) - Elseif InStr(1, line, cppIncludeDir) > 0 Then - line = "$(includedir)" & Right(line, len(line) - len(cppIncludeDir)) - Elseif InStr(1, line, iceCppIncludeDir) > 0 Then - line = "$(ice_cpp_dir)\include" & Right(line, len(line) - len(iceCppIncludeDir)) - Elseif InStr(1, line, cppTestIncludeDir) > 0 Then - line = "$(top_srcdir)\test\include" & Right(line, len(line) - len(cppTestIncludeDir)) - End If - - line = " """ & line & """ \" - If Not depends.Exists(line) Then - depends.Add line, "" - outFile.WriteLine(line) - End If - End If - End If - Loop While False -Loop - -stream.Close() - -If errors Then - WScript.Quit 1 -End If diff --git a/cpp/msbuild/freeze.cpp.props b/cpp/msbuild/freeze.cpp.props index 7ec47dec..c16d1575 100644 --- a/cpp/msbuild/freeze.cpp.props +++ b/cpp/msbuild/freeze.cpp.props @@ -1,149 +1,47 @@ - - - - - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..')) - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration) - true - false - 37a0 - - - - $(MSBuildThisFileDirectory)..\.. - $(FreezeHome)\ice - $(FreezeHome)\cpp\bin\$(Platform)\$(Configuration) - $(FreezeHome)\cpp\include\generated\$(Platform)\$(Configuration);$(FreezeHome)\cpp\include - $(FreezeHome)\cpp\lib\$(Platform)\$(Configuration) - $(FreezeHome)\cpp\bin\$(Platform)\$(Configuration);$(Path) - - - - - - $(Ice_SrcRootDir)\lib\$(Platform)\$(Configuration)\ - - - - - $(Ice_SrcRootDir)\bin\$(Platform)\$(Configuration)\ - - - - - - - - - Debug - - - - - Release - - - - - - - - Level3 - _CONSOLE;_WIN32_WINNT=0x601;WIN32_LEAN_AND_MEAN - 4250;4251;4275 - /bigobj %(AdditionalOptions) - true - true - true - false - - false - NotUsing - $(Ice_SrcRootDir)\include\generated\$(Platform)\$(Configuration);$(Ice_SrcRootDir)\include;$(Ice_SrcRootDir)\src;$(IceHome)\cpp\src;%(AdditionalIncludeDirectories) - - - - - $(Ice_SrcRootDir)\lib\$(Platform)\$(Configuration) - - - - - - - Disabled - _DEBUG;%(PreprocessorDefinitions) - ProgramDatabase - $(OutDir)$(TargetName).pdb - - - _DEBUG - - - - - - - Debug - - - - - - Yes - - - - - - - MaxSpeed - NDEBUG;%(PreprocessorDefinitions) - false - None - - - - No - - - - - - - $(Ice_SrcRootDir)\include\generated\$(Platform)\$(Ice_Configuration);%(AdditionalIncludeDirectories) - ICE_BUILDING_SRC;%(PreprocessorDefinitions) - - - $(Ice_SrcRootDir)\lib\$(Platform)\$(Ice_Configuration) - - - - - - $(Ice_SrcRootDir)\lib\$(Platform)\$(Ice_Configuration)\$(TargetName).lib - - - - - - wsetargv.obj - - - - - - $(ProjectName)$(IceSoVersion)d - - - - $(ProjectName)$(IceSoVersion) - - - - - + + + + + + + + yes + cpp98 + + + + + + + + $(MSBuildThisFileDirectory)..\.. + $(FreezeHome)\cpp\bin\$(Platform)\$(Configuration) + + + + + $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..')) + $(Freeze_SrcRootDir)\bin\$(Platform)\$(Configuration)\ + + + + + $(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Ice_Configuration); + $(Freeze_SrcRootDir)\include;$(Freeze_SrcRootDir)\src; + %(AdditionalIncludeDirectories) + + + $(Freeze_SrcRootDir)\lib\$(Platform)\$(Ice_Configuration) + + + + + + $(Freeze_SrcRootDir)\lib\$(Platform)\$(Ice_Configuration)\$(TargetName).lib + + + + diff --git a/cpp/msbuild/freeze.test.props b/cpp/msbuild/freeze.test.props index c46f6eb7..b7d40b08 100644 --- a/cpp/msbuild/freeze.test.props +++ b/cpp/msbuild/freeze.test.props @@ -1,19 +1,25 @@ - - - - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - - - $(Platform)\$(Configuration);$(Ice_SrcRootDir)\test\include;$(FreezeIncludePath);%(AdditionalIncludeDirectories) - - - $(FreezeLibraryPath) - - - - + + + + + + yes + cpp98 + + + + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + + + $(Platform)\$(Configuration);$(Ice_SrcRootDir)\test\include;%(AdditionalIncludeDirectories) + + + $(Ice_SrcRootDir)\test\Common\msbuild\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile deleted file mode 100644 index e86d0733..00000000 --- a/cpp/src/Freeze/Makefile +++ /dev/null @@ -1,93 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../.. - -LIBFILENAME = $(call mklibfilename,Freeze,$(VERSION)) -SONAME = $(call mksoname,Freeze,$(SOVERSION)) -LIBNAME = $(call mklibname,Freeze) - -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) - -SLICE_OBJS = BackgroundSaveEvictor.o \ - CatalogData.o \ - Connection.o \ - ConnectionF.o \ - DB.o \ - Evictor.o \ - EvictorF.o \ - EvictorStorage.o \ - Exception.o \ - Transaction.o \ - TransactionalEvictor.o \ - PingObject.o - -OBJS = BackgroundSaveEvictorI.o \ - Catalog.o \ - CatalogIndexList.o \ - ConnectionI.o \ - EvictorI.o \ - EvictorIteratorI.o \ - Index.o \ - IndexI.o \ - MapDb.o \ - MapI.o \ - ObjectStore.o \ - SharedDbEnv.o \ - TransactionalEvictorContext.o \ - TransactionalEvictorI.o \ - TransactionHolder.o \ - TransactionI.o \ - Util.o \ - $(SLICE_OBJS) - -HDIR = $(headerdir)/Freeze -SDIR = $(top_srcdir)/../slice/Freeze - -include $(top_srcdir)/make/Make.rules - -CPPFLAGS := -I.. $(CPPFLAGS) -DFREEZE_API_EXPORTS $(DB_FLAGS) -SLICE2CPPFLAGS := --ice --include-dir Freeze --dll-export FREEZE_API $(SLICE2CPPFLAGS) -LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(DB_RPATH_LINK) $(DB_LIBS) - -# The slice2freeze rules are structured like this to avoid issues with -# parallel make. -$(HDIR)/Catalog.h: Catalog.cpp -Catalog.cpp: $(SDIR)/CatalogData.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f $(HDIR)/Catalog.h Catalog.cpp - $(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::Catalog,string,Freeze::CatalogData \ - Catalog $(slicedir)/Freeze/CatalogData.ice - mv Catalog.h $(HDIR)/Catalog.h - -clean:: - -rm -f $(HDIR)/Catalog.h Catalog.cpp - -$(HDIR)/CatalogIndexList.h: CatalogIndexList.cpp -CatalogIndexList.cpp: $(ice_slicedir)/Ice/BuiltinSequences.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f $(HDIR)/CatalogIndexList.h CatalogIndexList.cpp - $(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::CatalogIndexList,string,Ice::StringSeq \ - CatalogIndexList $(ice_slicedir)/Ice/BuiltinSequences.ice - mv CatalogIndexList.h $(HDIR)/CatalogIndexList.h - -clean:: - -rm -f $(HDIR)/CatalogIndexList.h CatalogIndexList.cpp - -$(libdir)/$(LIBFILENAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) - @mkdir -p $(libdir)$(cpp11libdirsuffix) - rm -f $@ - ln -s $(cpp11sonamedir)$(SONAME) $@ - -install:: all - $(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff --git a/cpp/src/Freeze/Makefile.mk b/cpp/src/Freeze/Makefile.mk new file mode 100644 index 00000000..220926f1 --- /dev/null +++ b/cpp/src/Freeze/Makefile.mk @@ -0,0 +1,24 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# +# ********************************************************************** + +$(project)_libraries = Freeze +$(project)_generated_includedir := $(project)/generated/Freeze + +Freeze_targetdir := $(libdir) +Freeze_cppflags := -DFREEZE_API_EXPORTS +Freeze_sliceflags := --include-dir Freeze --dll-export FREEZE_API +Freeze_dependencies := Ice +Freeze_libs := db + +Freeze_slice2freeze := Catalog CatalogIndexList + +Freeze_Catalog := --dict Freeze::Catalog,string,Freeze::CatalogData +Freeze_Catalog_slice := $(slicedir)/Freeze/CatalogData.ice + +Freeze_CatalogIndexList := --dict Freeze::CatalogIndexList,string,Ice::StringSeq +Freeze_CatalogIndexList_slice := $(ice_slicedir)/Ice/BuiltinSequences.ice + +projects += $(project) diff --git a/cpp/src/Freeze/ObjectStore.cpp b/cpp/src/Freeze/ObjectStore.cpp index 0c40cefa..f9d742d5 100644 --- a/cpp/src/Freeze/ObjectStore.cpp +++ b/cpp/src/Freeze/ObjectStore.cpp @@ -363,7 +363,7 @@ Freeze::ObjectStoreBase::ValueMarshaler::ValueMarshaler(const ObjectRecord& rec, _os.write(rec.servant); } - _os.writePendingObjects(); + _os.writePendingValues(); _os.endEncapsulation(); } @@ -385,7 +385,7 @@ Freeze::ObjectStoreBase::unmarshal(ObjectRecord& v, bool keepStats) { Ice::InputStream stream(communicator, encoding, bytes); - stream.setSliceObjects(false); + stream.setSliceValues(false); stream.startEncapsulation(); if(keepStats) @@ -397,7 +397,7 @@ Freeze::ObjectStoreBase::unmarshal(ObjectRecord& v, stream.read(v.servant); } - stream.readPendingObjects(); + stream.readPendingValues(); stream.endEncapsulation(); } diff --git a/cpp/src/Freeze/msbuild/freeze/freeze.vcxproj b/cpp/src/Freeze/msbuild/freeze/freeze.vcxproj index a65e97b0..b5f9e291 100644 --- a/cpp/src/Freeze/msbuild/freeze/freeze.vcxproj +++ b/cpp/src/Freeze/msbuild/freeze/freeze.vcxproj @@ -1,771 +1,785 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {6B287579-8A55-4242-9AE8-A4BF2D75BF95} - yes - $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories)) - $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories)) - - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - DynamicLibrary - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(Ice_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ - Freeze - FREEZE_API - $(Ice_SrcRootDir)\..\slice;$(IceBuilderIncludeDirectories) - - - - FREEZE_API_EXPORTS;%(PreprocessorDefinitions) - - - %(AdditionalDependencies) - - - - - FREEZE_API_EXPORTS;%(PreprocessorDefinitions) - - - %(AdditionalDependencies) - - - - - FREEZE_API_EXPORTS;%(PreprocessorDefinitions) - - - %(AdditionalDependencies) - - - - - FREEZE_API_EXPORTS;%(PreprocessorDefinitions) - - - %(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - - - - - - - - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - - - - - - set PATH=$(IceHome)\cpp\bin\$(Platform)\$(Ice_Configuration);%PATH% -..\..\..\..\bin\$(Platform)\$(Configuration)\slice2freeze.exe --output-dir $(Platform)\$(Configuration) --ice --include-dir Freeze -I$(Ice_SrcRootDir)\..\slice\ --dll-export FREEZE_API --dict Freeze::Catalog,string,Freeze::CatalogData Catalog $(Ice_SrcRootDir)\..\slice\Freeze\CatalogData.ice -move $(Platform)\$(Configuration)\Catalog.h $(Ice_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ - set PATH=$(IceHome)\cpp\bin\$(Platform)\$(Ice_Configuration);%PATH% -..\..\..\..\bin\$(Platform)\$(Configuration)\slice2freeze.exe --output-dir $(Platform)\$(Configuration) --ice --include-dir Freeze -I$(Ice_SrcRootDir)\..\slice\ --dll-export FREEZE_API --dict Freeze::Catalog,string,Freeze::CatalogData Catalog $(Ice_SrcRootDir)\..\slice\Freeze\CatalogData.ice -move $(Platform)\$(Configuration)\Catalog.h $(Ice_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ - set PATH=$(IceHome)\cpp\bin\$(Platform)\$(Ice_Configuration);%PATH% -..\..\..\..\bin\$(Platform)\$(Configuration)\slice2freeze.exe --output-dir $(Platform)\$(Configuration) --ice --include-dir Freeze -I$(Ice_SrcRootDir)\..\slice\ --dll-export FREEZE_API --dict Freeze::Catalog,string,Freeze::CatalogData Catalog $(Ice_SrcRootDir)\..\slice\Freeze\CatalogData.ice -move $(Platform)\$(Configuration)\Catalog.h $(Ice_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ - set PATH=$(IceHome)\cpp\bin\$(Platform)\$(Ice_Configuration);%PATH% -..\..\..\..\bin\$(Platform)\$(Configuration)\slice2freeze.exe --output-dir $(Platform)\$(Configuration) --ice --include-dir Freeze -I$(Ice_SrcRootDir)\..\slice\ --dll-export FREEZE_API --dict Freeze::Catalog,string,Freeze::CatalogData Catalog $(Ice_SrcRootDir)\..\slice\Freeze\CatalogData.ice -move $(Platform)\$(Configuration)\Catalog.h $(Ice_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ - $(Platform)\$(Configuration)\Catalog.cpp;$(Ice_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Catalog.h - $(Platform)\$(Configuration)\Catalog.cpp;$(Ice_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Catalog.h - $(Platform)\$(Configuration)\Catalog.cpp;$(Ice_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Catalog.h - $(Platform)\$(Configuration)\Catalog.cpp;$(Ice_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Catalog.h - $(Ice_SrcRootDir)\bin\$(Platform)\$(Configuration)\slice2freeze.exe;$(Ice_SrcRootDir)\..\slice\Freeze\CatalogData.ice;%(AdditionalInputs) - $(Ice_SrcRootDir)\bin\$(Platform)\$(Configuration)\slice2freeze.exe;$(Ice_SrcRootDir)\..\slice\Freeze\CatalogData.ice;%(AdditionalInputs) - $(Ice_SrcRootDir)\bin\$(Platform)\$(Configuration)\slice2freeze.exe;$(Ice_SrcRootDir)\..\slice\Freeze\CatalogData.ice;%(AdditionalInputs) - $(Ice_SrcRootDir)\bin\$(Platform)\$(Configuration)\slice2freeze.exe;$(Ice_SrcRootDir)\..\slice\Freeze\CatalogData.ice;%(AdditionalInputs) - - - - - set PATH=$(IceHome)\cpp\bin\$(Platform)\$(Ice_Configuration);%PATH% -..\..\..\..\bin\$(Platform)\$(Configuration)\slice2freeze.exe --output-dir $(Platform)\$(Configuration) --ice --include-dir Freeze -I$(Ice_SrcRootDir)\..\slice\ -I"$(IceHome)\slice" --dll-export FREEZE_API --dict Freeze::CatalogIndexList,string,Ice::StringSeq CatalogIndexList "$(IceHome)\slice\Ice\BuiltinSequences.ice" -move $(Platform)\$(Configuration)\CatalogIndexList.h $(Ice_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ - set PATH=$(IceHome)\cpp\bin\$(Platform)\$(Ice_Configuration);%PATH% -..\..\..\..\bin\$(Platform)\$(Configuration)\slice2freeze.exe --output-dir $(Platform)\$(Configuration) --ice --include-dir Freeze -I$(Ice_SrcRootDir)\..\slice\ -I"$(IceHome)\slice" --dll-export FREEZE_API --dict Freeze::CatalogIndexList,string,Ice::StringSeq CatalogIndexList "$(IceHome)\slice\Ice\BuiltinSequences.ice" -move $(Platform)\$(Configuration)\CatalogIndexList.h $(Ice_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ - set PATH=$(IceHome)\cpp\bin\$(Platform)\$(Ice_Configuration);%PATH% -..\..\..\..\bin\$(Platform)\$(Configuration)\slice2freeze.exe --output-dir $(Platform)\$(Configuration) --ice --include-dir Freeze -I$(Ice_SrcRootDir)\..\slice\ -I"$(IceHome)\slice" --dll-export FREEZE_API --dict Freeze::CatalogIndexList,string,Ice::StringSeq CatalogIndexList "$(IceHome)\slice\Ice\BuiltinSequences.ice" -move $(Platform)\$(Configuration)\CatalogIndexList.h $(Ice_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ - set PATH=$(IceHome)\cpp\bin\$(Platform)\$(Ice_Configuration);%PATH% -..\..\..\..\bin\$(Platform)\$(Configuration)\slice2freeze.exe --output-dir $(Platform)\$(Configuration) --ice --include-dir Freeze -I$(Ice_SrcRootDir)\..\slice\ -I"$(IceHome)\slice" --dll-export FREEZE_API --dict Freeze::CatalogIndexList,string,Ice::StringSeq CatalogIndexList "$(IceHome)\slice\Ice\BuiltinSequences.ice" -move $(Platform)\$(Configuration)\CatalogIndexList.h $(Ice_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ - $(Platform)\$(Configuration)\CatalogIndexList.cpp;$(Ice_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\CatalogIndexList.h - $(Platform)\$(Configuration)\CatalogIndexList.cpp;$(Ice_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\CatalogIndexList.h - $(Platform)\$(Configuration)\CatalogIndexList.cpp;$(Ice_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\CatalogIndexList.h - $(Platform)\$(Configuration)\CatalogIndexList.cpp;$(Ice_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\CatalogIndexList.h - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {6B287579-8A55-4242-9AE8-A4BF2D75BF95} + yes + $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories)) + $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories)) + + + + DynamicLibrary + true + $(DefaultPlatformToolset) + + + DynamicLibrary + false + $(DefaultPlatformToolset) + + + DynamicLibrary + true + $(DefaultPlatformToolset) + + + DynamicLibrary + false + $(DefaultPlatformToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ + Freeze + FREEZE_API + $(Freeze_SrcRootDir)\..\slice;$(IceBuilderIncludeDirectories) + + + + FREEZE_API_EXPORTS;%(PreprocessorDefinitions) + + + %(AdditionalDependencies) + + + + + FREEZE_API_EXPORTS;%(PreprocessorDefinitions) + + + %(AdditionalDependencies) + + + + + FREEZE_API_EXPORTS;%(PreprocessorDefinitions) + + + %(AdditionalDependencies) + + + + + FREEZE_API_EXPORTS;%(PreprocessorDefinitions) + + + %(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + + + + + + + + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + true + true + true + + + + + Designer + + + + + $(Freeze_SrcRootDir)\bin\$(Platform)\$(Configuration)\slice2freeze.exe --output-dir $(Platform)\$(Configuration) --ice --include-dir Freeze -I$(Freeze_SrcRootDir)\..\slice --dll-export FREEZE_API --dict Freeze::Catalog,string,Freeze::CatalogData Catalog $(Freeze_SrcRootDir)\..\slice\Freeze\CatalogData.ice +mkdir $(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ +move $(Platform)\$(Configuration)\Catalog.h $(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ + $(Freeze_SrcRootDir)\bin\$(Platform)\$(Configuration)\slice2freeze.exe --output-dir $(Platform)\$(Configuration) --ice --include-dir Freeze -I$(Freeze_SrcRootDir)\..\slice --dll-export FREEZE_API --dict Freeze::Catalog,string,Freeze::CatalogData Catalog $(Freeze_SrcRootDir)\..\slice\Freeze\CatalogData.ice +mkdir $(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ +move $(Platform)\$(Configuration)\Catalog.h $(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ + $(Freeze_SrcRootDir)\bin\$(Platform)\$(Configuration)\slice2freeze.exe --output-dir $(Platform)\$(Configuration) --ice --include-dir Freeze -I$(Freeze_SrcRootDir)\..\slice --dll-export FREEZE_API --dict Freeze::Catalog,string,Freeze::CatalogData Catalog $(Freeze_SrcRootDir)\..\slice\Freeze\CatalogData.ice +mkdir $(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ +move $(Platform)\$(Configuration)\Catalog.h $(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ + $(Freeze_SrcRootDir)\bin\$(Platform)\$(Configuration)\slice2freeze.exe --output-dir $(Platform)\$(Configuration) --ice --include-dir Freeze -I$(Freeze_SrcRootDir)\..\slice --dll-export FREEZE_API --dict Freeze::Catalog,string,Freeze::CatalogData Catalog $(Freeze_SrcRootDir)\..\slice\Freeze\CatalogData.ice +mkdir $(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ +move $(Platform)\$(Configuration)\Catalog.h $(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ + $(Platform)\$(Configuration)\Catalog.cpp;$(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Catalog.h + $(Platform)\$(Configuration)\Catalog.cpp;$(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Catalog.h + $(Platform)\$(Configuration)\Catalog.cpp;$(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Catalog.h + $(Platform)\$(Configuration)\Catalog.cpp;$(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Catalog.h + $(Freeze_SrcRootDir)\bin\$(Platform)\$(Configuration)\slice2freeze.exe;$(Freeze_SrcRootDir)\..\slice\Freeze\CatalogData.ice;%(AdditionalInputs) + $(Freeze_SrcRootDir)\bin\$(Platform)\$(Configuration)\slice2freeze.exe;$(Freeze_SrcRootDir)\..\slice\Freeze\CatalogData.ice;%(AdditionalInputs) + $(Freeze_SrcRootDir)\bin\$(Platform)\$(Configuration)\slice2freeze.exe;$(Freeze_SrcRootDir)\..\slice\Freeze\CatalogData.ice;%(AdditionalInputs) + $(Freeze_SrcRootDir)\bin\$(Platform)\$(Configuration)\slice2freeze.exe;$(Freeze_SrcRootDir)\..\slice\Freeze\CatalogData.ice;%(AdditionalInputs) + Generating Catalog.h and Catalog.cpp with slice2freeze + false + Generating Catalog.h and Catalog.cpp with slice2freeze + false + Generating Catalog.h and Catalog.cpp with slice2freeze + false + Generating Catalog.h and Catalog.cpp with slice2freeze + false + + + + + $(Freeze_SrcRootDir)\bin\$(Platform)\$(Configuration)\slice2freeze.exe --output-dir $(Platform)\$(Configuration) --ice --include-dir Freeze -I$(Ice_SrcRootDir)\..\slice --dll-export FREEZE_API --dict Freeze::CatalogIndexList,string,Ice::StringSeq CatalogIndexList "$(Ice_SrcRootDir)\..\slice\Ice\BuiltinSequences.ice" +mkdir $(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ +move $(Platform)\$(Configuration)\CatalogIndexList.h $(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ + $(Freeze_SrcRootDir)\bin\$(Platform)\$(Configuration)\slice2freeze.exe --output-dir $(Platform)\$(Configuration) --ice --include-dir Freeze -I$(Ice_SrcRootDir)\..\slice --dll-export FREEZE_API --dict Freeze::CatalogIndexList,string,Ice::StringSeq CatalogIndexList "$(Ice_SrcRootDir)\..\slice\Ice\BuiltinSequences.ice" +mkdir $(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ +move $(Platform)\$(Configuration)\CatalogIndexList.h $(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ + $(Freeze_SrcRootDir)\bin\$(Platform)\$(Configuration)\slice2freeze.exe --output-dir $(Platform)\$(Configuration) --ice --include-dir Freeze -I$(Ice_SrcRootDir)\..\slice --dll-export FREEZE_API --dict Freeze::CatalogIndexList,string,Ice::StringSeq CatalogIndexList "$(Ice_SrcRootDir)\..\slice\Ice\BuiltinSequences.ice" +mkdir $(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ +move $(Platform)\$(Configuration)\CatalogIndexList.h $(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ + $(Freeze_SrcRootDir)\bin\$(Platform)\$(Configuration)\slice2freeze.exe --output-dir $(Platform)\$(Configuration) --ice --include-dir Freeze -I$(Ice_SrcRootDir)\..\slice --dll-export FREEZE_API --dict Freeze::CatalogIndexList,string,Ice::StringSeq CatalogIndexList "$(Ice_SrcRootDir)\..\slice\Ice\BuiltinSequences.ice" +mkdir $(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ +move $(Platform)\$(Configuration)\CatalogIndexList.h $(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\Freeze\ + $(Platform)\$(Configuration)\CatalogIndexList.cpp;$(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\CatalogIndexList.h + $(Platform)\$(Configuration)\CatalogIndexList.cpp;$(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\CatalogIndexList.h + $(Platform)\$(Configuration)\CatalogIndexList.cpp;$(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\CatalogIndexList.h + $(Platform)\$(Configuration)\CatalogIndexList.cpp;$(Freeze_SrcRootDir)\include\generated\$(Platform)\$(Configuration)\CatalogIndexList.h + Generating CatalogIndexList.h and CatalogIndexList.cpp with slice2freeze + Generating CatalogIndexList.h and CatalogIndexList.cpp with slice2freeze + Generating CatalogIndexList.h and CatalogIndexList.cpp with slice2freeze + Generating CatalogIndexList.h and CatalogIndexList.cpp with slice2freeze + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/cpp/src/Freeze/msbuild/freeze/freeze.vcxproj.filters b/cpp/src/Freeze/msbuild/freeze/freeze.vcxproj.filters index 5c0130eb..a3c374d7 100644 --- a/cpp/src/Freeze/msbuild/freeze/freeze.vcxproj.filters +++ b/cpp/src/Freeze/msbuild/freeze/freeze.vcxproj.filters @@ -1,509 +1,509 @@ - - - - - - - - {20c3e32c-3ef1-4519-9c00-b48166249fe3} - ice - - - {03e54d19-4649-4ea2-804b-131c5d7fee95} - - - {15ecd491-437e-417b-acf0-742e30432b03} - - - {252121b4-1229-4172-8c7d-b5a80c0ed1c7} - - - {85f1eb80-ab9d-4668-9b2f-546c78782036} - - - {e49a47d9-95d4-4f48-8165-59508882810e} - - - {e49a6045-721e-4808-b2ee-8ecdf083b62d} - - - {2c9814c3-0c45-46c9-a119-79774244d39e} - - - {ed12afbe-a8df-4749-9d36-aa90375baa0f} - - - {1ca4d1df-ba51-4f0e-93d1-37654154fedc} - - - {85573b70-fb6b-49ba-9bed-356abf848d68} - - - {c3714804-b803-4361-ab62-b289bd84bd41} - - - {fabe01ba-f0bf-4a8d-84d2-00990dc72976} - - - {1a50be5b-2a72-4b58-aec0-bbf51791cfac} - - - {c099c421-ef09-43d1-9772-d79a0b9202db} - - - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - Slice Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Win32\Debug - - - Source Files\x64\Debug - - - Source Files\Win32\Release - - - Source Files\x64\Release - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - Source Files\x64\Debug - - - Source Files\x64\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Debug - - - Source Files\Win32\Release - - - Source Files\Win32\Release - - - Source Files\x64\Release - - - Source Files\x64\Release - - - - - Header Files\Win32\Debug - - - Header Files\x64\Debug - - - Header Files\Win32\Release - - - Header Files\x64\Release - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\x64\Debug - - - Header Files\x64\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Debug - - - Header Files\Win32\Release - - - Header Files\Win32\Release - - - Header Files\x64\Release - - - Header Files\x64\Release - - - - - - - - Slice Files - - - Slice Files - - + + + + + + + + {20c3e32c-3ef1-4519-9c00-b48166249fe3} + ice + + + {03e54d19-4649-4ea2-804b-131c5d7fee95} + + + {15ecd491-437e-417b-acf0-742e30432b03} + + + {252121b4-1229-4172-8c7d-b5a80c0ed1c7} + + + {85f1eb80-ab9d-4668-9b2f-546c78782036} + + + {e49a47d9-95d4-4f48-8165-59508882810e} + + + {e49a6045-721e-4808-b2ee-8ecdf083b62d} + + + {2c9814c3-0c45-46c9-a119-79774244d39e} + + + {ed12afbe-a8df-4749-9d36-aa90375baa0f} + + + {1ca4d1df-ba51-4f0e-93d1-37654154fedc} + + + {85573b70-fb6b-49ba-9bed-356abf848d68} + + + {c3714804-b803-4361-ab62-b289bd84bd41} + + + {fabe01ba-f0bf-4a8d-84d2-00990dc72976} + + + {1a50be5b-2a72-4b58-aec0-bbf51791cfac} + + + {c099c421-ef09-43d1-9772-d79a0b9202db} + + + + + Slice Files + + + Slice Files + + + Slice Files + + + Slice Files + + + Slice Files + + + Slice Files + + + Slice Files + + + Slice Files + + + Slice Files + + + Slice Files + + + Slice Files + + + Slice Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\Win32\Debug + + + Source Files\x64\Debug + + + Source Files\Win32\Release + + + Source Files\x64\Release + + + Source Files\Win32\Debug + + + Source Files\Win32\Debug + + + Source Files\Win32\Debug + + + Source Files\Win32\Debug + + + Source Files\Win32\Debug + + + Source Files\Win32\Debug + + + Source Files\Win32\Debug + + + Source Files\Win32\Debug + + + Source Files\Win32\Debug + + + Source Files\Win32\Debug + + + Source Files\Win32\Debug + + + Source Files\x64\Debug + + + Source Files\x64\Debug + + + Source Files\x64\Debug + + + Source Files\x64\Debug + + + Source Files\x64\Debug + + + Source Files\x64\Debug + + + Source Files\x64\Debug + + + Source Files\x64\Debug + + + Source Files\x64\Debug + + + Source Files\x64\Debug + + + Source Files\x64\Debug + + + Source Files\Win32\Release + + + Source Files\Win32\Release + + + Source Files\Win32\Release + + + Source Files\Win32\Release + + + Source Files\Win32\Release + + + Source Files\Win32\Release + + + Source Files\Win32\Release + + + Source Files\Win32\Release + + + Source Files\Win32\Release + + + Source Files\Win32\Release + + + Source Files\Win32\Release + + + Source Files\x64\Release + + + Source Files\x64\Release + + + Source Files\x64\Release + + + Source Files\x64\Release + + + Source Files\x64\Release + + + Source Files\x64\Release + + + Source Files\x64\Release + + + Source Files\x64\Release + + + Source Files\x64\Release + + + Source Files\x64\Release + + + Source Files\x64\Release + + + Source Files\x64\Debug + + + Source Files\x64\Debug + + + Source Files\Win32\Debug + + + Source Files\Win32\Debug + + + Source Files\Win32\Release + + + Source Files\Win32\Release + + + Source Files\x64\Release + + + Source Files\x64\Release + + + + + Header Files\Win32\Debug + + + Header Files\x64\Debug + + + Header Files\Win32\Release + + + Header Files\x64\Release + + + Header Files\Win32\Debug + + + Header Files\Win32\Debug + + + Header Files\Win32\Debug + + + Header Files\Win32\Debug + + + Header Files\Win32\Debug + + + Header Files\Win32\Debug + + + Header Files\Win32\Debug + + + Header Files\Win32\Debug + + + Header Files\Win32\Debug + + + Header Files\Win32\Debug + + + Header Files\Win32\Debug + + + Header Files\x64\Debug + + + Header Files\x64\Debug + + + Header Files\x64\Debug + + + Header Files\x64\Debug + + + Header Files\x64\Debug + + + Header Files\x64\Debug + + + Header Files\x64\Debug + + + Header Files\x64\Debug + + + Header Files\x64\Debug + + + Header Files\x64\Debug + + + Header Files\x64\Debug + + + Header Files\Win32\Release + + + Header Files\Win32\Release + + + Header Files\Win32\Release + + + Header Files\Win32\Release + + + Header Files\Win32\Release + + + Header Files\Win32\Release + + + Header Files\Win32\Release + + + Header Files\Win32\Release + + + Header Files\Win32\Release + + + Header Files\Win32\Release + + + Header Files\Win32\Release + + + Header Files\x64\Release + + + Header Files\x64\Release + + + Header Files\x64\Release + + + Header Files\x64\Release + + + Header Files\x64\Release + + + Header Files\x64\Release + + + Header Files\x64\Release + + + Header Files\x64\Release + + + Header Files\x64\Release + + + Header Files\x64\Release + + + Header Files\x64\Release + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files\x64\Debug + + + Header Files\x64\Debug + + + Header Files\Win32\Debug + + + Header Files\Win32\Debug + + + Header Files\Win32\Release + + + Header Files\Win32\Release + + + Header Files\x64\Release + + + Header Files\x64\Release + + + + + + + + Slice Files + + + Slice Files + + \ No newline at end of file diff --git a/cpp/src/Freeze/msbuild/freeze/packages.config b/cpp/src/Freeze/msbuild/freeze/packages.config index e1f24fa8..abfb021c 100644 --- a/cpp/src/Freeze/msbuild/freeze/packages.config +++ b/cpp/src/Freeze/msbuild/freeze/packages.config @@ -1,5 +1,5 @@ - - - - + + + + \ No newline at end of file diff --git a/cpp/src/FreezeScript/Data.cpp b/cpp/src/FreezeScript/Data.cpp index 6fa9f0c0..ae8543f4 100644 --- a/cpp/src/FreezeScript/Data.cpp +++ b/cpp/src/FreezeScript/Data.cpp @@ -69,7 +69,7 @@ FreezeScript::ObjectWriter::ObjectWriter(const ObjectDataPtr& value) : void FreezeScript::ObjectWriter::__write(Ice::OutputStream* out) const { - out->startObject(0); + out->startValue(0); Slice::ClassDeclPtr decl = Slice::ClassDeclPtr::dynamicCast(_value->_type); Slice::ClassDefPtr type; @@ -99,7 +99,7 @@ FreezeScript::ObjectWriter::__write(Ice::OutputStream* out) const type = base; } - out->endObject(); + out->endValue(); } void @@ -133,7 +133,7 @@ FreezeScript::ObjectReader::__read(Ice::InputStream* in) type = decl->definition(); } - in->startObject(); + in->startValue(); while(type) { @@ -159,7 +159,7 @@ FreezeScript::ObjectReader::__read(Ice::InputStream* in) type = base; } - in->endObject(false); + in->endValue(false); } FreezeScript::ObjectDataPtr diff --git a/cpp/src/FreezeScript/DumpDescriptors.cpp b/cpp/src/FreezeScript/DumpDescriptors.cpp index e8c6e0f8..2f88afa4 100644 --- a/cpp/src/FreezeScript/DumpDescriptors.cpp +++ b/cpp/src/FreezeScript/DumpDescriptors.cpp @@ -1293,7 +1293,7 @@ FreezeScript::RecordDescriptor::execute(const SymbolTablePtr& /*sym*/, ExecuteIn valueData->unmarshal(&inValue); if(info->valueType->usesClasses()) { - inValue.readPendingObjects(); + inValue.readPendingValues(); } // diff --git a/cpp/src/FreezeScript/Grammar.cpp b/cpp/src/FreezeScript/FSGrammar.cpp similarity index 100% rename from cpp/src/FreezeScript/Grammar.cpp rename to cpp/src/FreezeScript/FSGrammar.cpp diff --git a/cpp/src/FreezeScript/Parser.cpp b/cpp/src/FreezeScript/FSParser.cpp similarity index 100% rename from cpp/src/FreezeScript/Parser.cpp rename to cpp/src/FreezeScript/FSParser.cpp diff --git a/cpp/src/FreezeScript/Scanner.cpp b/cpp/src/FreezeScript/FSScanner.cpp similarity index 100% rename from cpp/src/FreezeScript/Scanner.cpp rename to cpp/src/FreezeScript/FSScanner.cpp diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile deleted file mode 100644 index 3cb7180b..00000000 --- a/cpp/src/FreezeScript/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../.. - -TRANSFORMDB = $(bindir)/transformdb -DUMPDB = $(bindir)/dumpdb - -TARGETS = $(TRANSFORMDB) $(DUMPDB) - -COMMON_OBJS = AssignVisitor.o \ - Data.o \ - Error.o \ - Exception.o \ - Functions.o \ - Parser.o \ - Print.o \ - Scanner.o \ - Util.o \ - Grammar.o - -TRANSFORM_OBJS = TransformAnalyzer.o \ - TransformVisitor.o \ - Transformer.o \ - transformdb.o - -DUMP_OBJS = DumpDescriptors.o \ - DumpDB.o - -OBJS = $(COMMON_OBJS) $(TRANSFORM_OBJS) $(DUMP_OBJS) - -HDIR = $(headerdir)/FreezeScript - -RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) - -include $(top_srcdir)/make/Make.rules - -CPPFLAGS := -I.. $(CPPFLAGS) $(DB_FLAGS) -BISONFLAGS := --name-prefix "freeze_script_" $(BISONFLAGS) - -$(TRANSFORMDB): $(TRANSFORM_OBJS) $(COMMON_OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(TRANSFORM_OBJS) $(COMMON_OBJS) -lSlice $(EXPAT_RPATH_LINK) -lIceXML $(DB_RPATH_LINK) -lFreeze $(LIBS) $(DB_LIBS) - -$(DUMPDB): $(DUMP_OBJS) $(COMMON_OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(DUMP_OBJS) $(COMMON_OBJS) -lSlice $(EXPAT_RPATH_LINK) -lIceXML $(DB_RPATH_LINK) -lFreeze $(LIBS) $(DB_LIBS) - -install:: all - $(call installprogram,$(TRANSFORMDB),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/transformdb.1,$(DESTDIR)$(install_mandir)) - $(call installprogram,$(DUMPDB),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/dumpdb.1,$(DESTDIR)$(install_mandir)) diff --git a/cpp/src/FreezeScript/Makefile.mk b/cpp/src/FreezeScript/Makefile.mk new file mode 100644 index 00000000..74803561 --- /dev/null +++ b/cpp/src/FreezeScript/Makefile.mk @@ -0,0 +1,46 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# +# ********************************************************************** + +$(project)_programs = transformdb dumpdb + +$(project)_dependencies = Freeze IceXML Ice +$(project)_libs = db mcpp + +common_sources = AssignVisitor.cpp \ + Data.cpp \ + Error.cpp \ + Exception.cpp \ + Functions.cpp \ + Print.cpp \ + Util.cpp \ + FSParser.cpp \ + FSScanner.cpp \ + FSGrammar.cpp + +transformdb_sources = $(common_sources) \ + TransformAnalyzer.cpp \ + TransformVisitor.cpp \ + Transformer.cpp \ + transformdb.cpp + +dumpdb_sources = $(common_sources) \ + DumpDescriptors.cpp \ + DumpDB.cpp + +slice_sources := $(filter-out %Util.cpp %Ruby.cpp %Python.cpp %MD5.cpp %MD5I.cpp\ + %FileTracker.cpp %Checksum.cpp,\ + $(wildcard $(top_srcdir)/ice/cpp/src/Slice/*.cpp)) \ + $(top_srcdir)/cpp/src/Slice/SliceUtil.cpp \ + $(top_srcdir)/cpp/src/Slice/CPlusPlusUtil.cpp + + +transformdb_sources := $(addprefix $(project)/,$(transformdb_sources)) \ + $(slice_sources) + +dumpdb_sources := $(addprefix $(project)/,$(dumpdb_sources)) \ + $(slice_sources) + +projects += $(project) diff --git a/cpp/src/FreezeScript/Transformer.cpp b/cpp/src/FreezeScript/Transformer.cpp index 5f288421..3bb86912 100644 --- a/cpp/src/FreezeScript/Transformer.cpp +++ b/cpp/src/FreezeScript/Transformer.cpp @@ -1984,7 +1984,7 @@ FreezeScript::RecordDescriptor::transformRecord(const Ice::ByteSeq& inKeyBytes, _info->objectDataMap.clear(); if(_info->oldValueType->usesClasses()) { - inValue.readPendingObjects(); + inValue.readPendingValues(); ObjectVisitor visitor(_info->objectDataMap); oldValueData->visit(visitor); } @@ -2031,7 +2031,7 @@ FreezeScript::RecordDescriptor::transformRecord(const Ice::ByteSeq& inKeyBytes, if(_info->newValueType->usesClasses()) { - outValue.writePendingObjects(); + outValue.writePendingValues(); } outValue.endEncapsulation(); outValue.finished(outValueBytes); diff --git a/cpp/src/FreezeScript/msbuild/dumpdb/dumpdb.vcxproj b/cpp/src/FreezeScript/msbuild/dumpdb/dumpdb.vcxproj index 2320842d..13852fa6 100644 --- a/cpp/src/FreezeScript/msbuild/dumpdb/dumpdb.vcxproj +++ b/cpp/src/FreezeScript/msbuild/dumpdb/dumpdb.vcxproj @@ -1,113 +1,123 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {FCD2A68D-540F-4599-A7B0-5086057419EC} - yes - $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories)) - $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories)) - - - - Application - true - $(DefaultPlatformToolset) - - - Application - false - $(DefaultPlatformToolset) - - - Application - true - $(DefaultPlatformToolset) - - - Application - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {FCD2A68D-540F-4599-A7B0-5086057419EC} + yes + $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories)) + $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories)) + + + + Application + true + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + Application + true + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + diff --git a/cpp/src/FreezeScript/msbuild/dumpdb/dumpdb.vcxproj.filters b/cpp/src/FreezeScript/msbuild/dumpdb/dumpdb.vcxproj.filters index 3a551cfd..e8b95185 100644 --- a/cpp/src/FreezeScript/msbuild/dumpdb/dumpdb.vcxproj.filters +++ b/cpp/src/FreezeScript/msbuild/dumpdb/dumpdb.vcxproj.filters @@ -1,91 +1,91 @@ - - - - - - - - {07d52dc5-341d-4095-96af-c86f64db3f18} - ice - - - {41f37817-1dac-45e0-9a2e-811534ccf794} - - - {febf18b2-c807-43a3-b9a3-54336fe4eadc} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - + + + + + + + + {07d52dc5-341d-4095-96af-c86f64db3f18} + ice + + + {41f37817-1dac-45e0-9a2e-811534ccf794} + + + {febf18b2-c807-43a3-b9a3-54336fe4eadc} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + + + + + + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + \ No newline at end of file diff --git a/cpp/src/FreezeScript/msbuild/dumpdb/packages.config b/cpp/src/FreezeScript/msbuild/dumpdb/packages.config index e1f24fa8..baae3759 100644 --- a/cpp/src/FreezeScript/msbuild/dumpdb/packages.config +++ b/cpp/src/FreezeScript/msbuild/dumpdb/packages.config @@ -1,5 +1,7 @@ - - - - + + + + + + \ No newline at end of file diff --git a/cpp/src/FreezeScript/msbuild/transformdb/packages.config b/cpp/src/FreezeScript/msbuild/transformdb/packages.config index e1f24fa8..baae3759 100644 --- a/cpp/src/FreezeScript/msbuild/transformdb/packages.config +++ b/cpp/src/FreezeScript/msbuild/transformdb/packages.config @@ -1,5 +1,7 @@ - - - - + + + + + + \ No newline at end of file diff --git a/cpp/src/FreezeScript/msbuild/transformdb/transformdb.vcxproj b/cpp/src/FreezeScript/msbuild/transformdb/transformdb.vcxproj index 6bf0f9e7..8a70aae9 100644 --- a/cpp/src/FreezeScript/msbuild/transformdb/transformdb.vcxproj +++ b/cpp/src/FreezeScript/msbuild/transformdb/transformdb.vcxproj @@ -1,117 +1,127 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {7A3141F3-EE35-42F6-B602-42A3378431F1} - yes - $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories)) - $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories)) - - - - Application - true - $(DefaultPlatformToolset) - - - Application - false - $(DefaultPlatformToolset) - - - Application - true - $(DefaultPlatformToolset) - - - Application - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {7A3141F3-EE35-42F6-B602-42A3378431F1} + yes + $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories)) + $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories)) + + + + Application + true + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + Application + true + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + diff --git a/cpp/src/FreezeScript/msbuild/transformdb/transformdb.vcxproj.filters b/cpp/src/FreezeScript/msbuild/transformdb/transformdb.vcxproj.filters index 83ea95d3..d6a0b2f8 100644 --- a/cpp/src/FreezeScript/msbuild/transformdb/transformdb.vcxproj.filters +++ b/cpp/src/FreezeScript/msbuild/transformdb/transformdb.vcxproj.filters @@ -1,103 +1,114 @@ - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - {ffa50b8f-9bf7-4f6b-a2ba-9077971a3045} - - - {809b7b35-1d2a-4d05-8cd0-eb9ae6cf8c88} - - - {ef2d6ff5-28d8-4f1a-b549-113b29439300} - ice - - - - - - - - + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + {ffa50b8f-9bf7-4f6b-a2ba-9077971a3045} + + + {809b7b35-1d2a-4d05-8cd0-eb9ae6cf8c88} + + + {ef2d6ff5-28d8-4f1a-b549-113b29439300} + ice + + + + + + + + \ No newline at end of file diff --git a/cpp/src/Makefile b/cpp/src/Makefile deleted file mode 100644 index 4de22148..00000000 --- a/cpp/src/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = .. - -include $(top_srcdir)/make/Make.rules - -SUBDIRS = slice2freeze \ - slice2freezej \ - Freeze \ - FreezeScript - -.PHONY: $(EVERYTHING) $(SUBDIRS) - -# -# Dependencies for 'all' target when using -jx -# - -Freeze: slice2freeze - -FreezeScript: Freeze - -all:: $(SUBDIRS) - -$(SUBDIRS): - @echo "making all in $@" - @$(MAKE) all --directory=$@ - -$(EVERYTHING_EXCEPT_ALL):: - @for subdir in $(SUBDIRS); \ - do \ - if test -d $$subdir ; \ - then \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - fi; \ - done diff --git a/cpp/src/slice2freeze/Makefile b/cpp/src/slice2freeze/Makefile deleted file mode 100644 index 260fe947..00000000 --- a/cpp/src/slice2freeze/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../.. - -NAME = $(bindir)/slice2freeze - -TARGETS = $(NAME) - -OBJS = Main.o - -RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) - -include $(top_srcdir)/make/Make.rules - -CPPFLAGS := -I. $(CPPFLAGS) - -$(NAME): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) -lSlice -lIceUtil - -install:: all - $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/slice2freeze.1,$(DESTDIR)$(install_mandir)) diff --git a/cpp/src/slice2freeze/msbuild/packages.config b/cpp/src/slice2freeze/msbuild/packages.config new file mode 100644 index 00000000..88735dc0 --- /dev/null +++ b/cpp/src/slice2freeze/msbuild/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/cpp/src/slice2freeze/msbuild/slice2freeze.vcxproj b/cpp/src/slice2freeze/msbuild/slice2freeze.vcxproj index ae134ff4..cc7b4cb4 100644 --- a/cpp/src/slice2freeze/msbuild/slice2freeze.vcxproj +++ b/cpp/src/slice2freeze/msbuild/slice2freeze.vcxproj @@ -1,81 +1,125 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {492D5AEC-C982-44AB-A3E6-07C902512ECB} - yes - $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories)) - $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories)) - - - - Application - true - $(DefaultPlatformToolset) - - - Application - false - $(DefaultPlatformToolset) - - - Application - true - $(DefaultPlatformToolset) - - - Application - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {492D5AEC-C982-44AB-A3E6-07C902512ECB} + yes + $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories)) + $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories)) + + + + Application + true + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + Application + true + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + + + + + + + + + + + + + + + + + + + + + + ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions) + + + wsetargv.obj;sliceD.lib;iceutilD.lib;rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib + + + + + ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions) + + + wsetargv.obj;slice.lib;iceutil.lib;rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib + + + + + ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions) + + + wsetargv.obj;sliceD.lib;iceutilD.lib;rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib + + + + + ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions) + + + wsetargv.obj;slice.lib;iceutil.lib;rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib + + + + + + + + + + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + diff --git a/cpp/src/slice2freeze/msbuild/slice2freeze.vcxproj.filters b/cpp/src/slice2freeze/msbuild/slice2freeze.vcxproj.filters index 380bc219..c7033ab1 100644 --- a/cpp/src/slice2freeze/msbuild/slice2freeze.vcxproj.filters +++ b/cpp/src/slice2freeze/msbuild/slice2freeze.vcxproj.filters @@ -1,18 +1,21 @@ - - - - - - - - - - - - - - {3c69eb65-61c5-440d-8648-92a69c35799f} - ice - - + + + + + + + + + + + + + + {3c69eb65-61c5-440d-8648-92a69c35799f} + ice + + + + + \ No newline at end of file diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp index 27ac722c..69e33fd7 100644 --- a/cpp/src/slice2freezej/Main.cpp +++ b/cpp/src/slice2freezej/Main.cpp @@ -908,7 +908,7 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict) writeMarshalUnmarshalCode(out, "", type, OptionalNone, false, 0, valS, true, iter, false); if(type->usesClasses()) { - out << nl << "__os.writePendingObjects();"; + out << nl << "__os.writePendingValues();"; } if(encaps) { @@ -923,7 +923,7 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict) out << sb; if(type->usesClasses()) { - out << nl << "__is.setSliceObjects(false);"; + out << nl << "__is.setSliceValues(false);"; } if(encaps) { @@ -1004,7 +1004,7 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict) } if(type->usesClasses()) { - out << nl << "__is.readPendingObjects();"; + out << nl << "__is.readPendingValues();"; } if(encaps) { @@ -1214,9 +1214,9 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict) if((b && b->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(valueType)) { string typeS = typeToString(valueType, TypeModeIn); - out << sp << nl << "private static class Patcher implements Ice.ReadObjectCallback"; + out << sp << nl << "private static class Patcher implements Ice.ReadValueCallback"; out << sb; - out << sp << nl << "public void" << nl << "objectReady(Ice.Object v)"; + out << sp << nl << "public void" << nl << "valueReady(Ice.Object v)"; out << sb; if(b) { @@ -1401,7 +1401,7 @@ FreezeGenerator::generate(UnitPtr& u, const Index& index) writeMarshalUnmarshalCode(out, "", dataMember->type(), OptionalNone, false, 0, valueS, true, iter, false); if(dataMember->type()->usesClasses()) { - out << nl << "__os.writePendingObjects();"; + out << nl << "__os.writePendingValues();"; } out << nl << "return __os.prepareWrite().b;"; out << eb; diff --git a/cpp/src/slice2freezej/Makefile b/cpp/src/slice2freezej/Makefile deleted file mode 100644 index 883191a5..00000000 --- a/cpp/src/slice2freezej/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../.. - -NAME = $(bindir)/slice2freezej - -TARGETS = $(NAME) - -OBJS = Main.o - -RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) - -include $(top_srcdir)/make/Make.rules - -CPPFLAGS := -I. $(CPPFLAGS) - -$(NAME): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) -lSlice -lIceUtil - -install:: all - $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) - $(call installdata,$(top_srcdir)/../man/man1/slice2freezej.1,$(DESTDIR)$(install_mandir)) diff --git a/cpp/src/slice2freezej/msbuild/packages.config b/cpp/src/slice2freezej/msbuild/packages.config new file mode 100644 index 00000000..88735dc0 --- /dev/null +++ b/cpp/src/slice2freezej/msbuild/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/cpp/src/slice2freezej/msbuild/slice2freezej.vcxproj b/cpp/src/slice2freezej/msbuild/slice2freezej.vcxproj index 4222bff6..ebd8ab1a 100644 --- a/cpp/src/slice2freezej/msbuild/slice2freezej.vcxproj +++ b/cpp/src/slice2freezej/msbuild/slice2freezej.vcxproj @@ -1,81 +1,125 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {BE4039F1-979B-4492-9688-A70E2C4FAF3F} - yes - $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories)) - $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories)) - - - - Application - true - $(DefaultPlatformToolset) - - - Application - false - $(DefaultPlatformToolset) - - - Application - true - $(DefaultPlatformToolset) - - - Application - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {BE4039F1-979B-4492-9688-A70E2C4FAF3F} + yes + $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories)) + $([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories)) + + + + Application + true + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + Application + true + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + + + + + + + + + + + + + + + + + + + + + + ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions) + + + wsetargv.obj;sliceD.lib;iceutilD.lib;rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib + + + + + ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions) + + + wsetargv.obj;slice.lib;iceutil.lib;rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib + + + + + ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions) + + + wsetargv.obj;sliceD.lib;iceutilD.lib;rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib + + + + + ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions) + + + wsetargv.obj;slice.lib;iceutil.lib;rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib + + + + + + + + + + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + diff --git a/cpp/src/slice2freezej/msbuild/slice2freezej.vcxproj.filters b/cpp/src/slice2freezej/msbuild/slice2freezej.vcxproj.filters index b29581d6..60499369 100644 --- a/cpp/src/slice2freezej/msbuild/slice2freezej.vcxproj.filters +++ b/cpp/src/slice2freezej/msbuild/slice2freezej.vcxproj.filters @@ -1,18 +1,21 @@ - - - - - - - - - - - - - - {4d7a0ef0-d8aa-48ea-970f-a3380823d43c} - ice - - + + + + + + + + + + + + + + {4d7a0ef0-d8aa-48ea-970f-a3380823d43c} + ice + + + + + \ No newline at end of file diff --git a/cpp/test/Freeze/Makefile b/cpp/test/Freeze/Makefile deleted file mode 100644 index 36256b09..00000000 --- a/cpp/test/Freeze/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/make/Make.rules - -SUBDIRS = dbmap complex evictor fileLock - -.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/Freeze/complex/Makefile b/cpp/test/Freeze/complex/Makefile deleted file mode 100644 index 8767a18c..00000000 --- a/cpp/test/Freeze/complex/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client - -TARGETS = $(CLIENT) - -SLICE_OBJS = Complex.o - -OBJS = ComplexDict.o \ - Complex.o \ - Grammar.o \ - Scanner.o \ - Parser.o \ - Client.o - -all:: ComplexDict.cpp - -include $(top_srcdir)/make/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -# The slice2freeze rules are structured like this to avoid issues with -# parallel make. -ComplexDict.h: ComplexDict.cpp -ComplexDict.cpp: Complex.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f ComplexDict.h ComplexDict.cpp - $(SLICE2FREEZE) -I. -I$(slicedir) --dict Complex::ComplexDict,Complex::Key,Complex::Node ComplexDict Complex.ice - -clean:: - -rm -f ComplexDict.h ComplexDict.cpp - -rm -rf db/* diff --git a/cpp/test/Freeze/complex/Makefile.mk b/cpp/test/Freeze/complex/Makefile.mk new file mode 100644 index 00000000..aba16621 --- /dev/null +++ b/cpp/test/Freeze/complex/Makefile.mk @@ -0,0 +1,17 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# +# ********************************************************************** + +$(test)_client_sources := Complex.ice \ + Grammar.y \ + Scanner.l \ + Parser.cpp \ + Client.cpp + +$(test)_client_slice2freeze := ComplexDict +$(test)_client_ComplexDict := --dict Complex::ComplexDict,Complex::Key,Complex::Node +$(test)_client_ComplexDict_slice := $(test)/Complex.ice + +tests += $(test) diff --git a/cpp/test/Freeze/dbmap/Makefile b/cpp/test/Freeze/dbmap/Makefile deleted file mode 100644 index 0a32a8ac..00000000 --- a/cpp/test/Freeze/dbmap/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client - -TARGETS = $(CLIENT) - -OBJS = Client.o \ - ByteIntMap.o \ - IntIdentityMap.o \ - IntIdentityMapWithIndex.o \ - SortedMap.o \ - WstringWstringMap.o - -all:: ByteIntMap.cpp IntIdentityMap.cpp IntIdentityMapWithIndex.cpp SortedMap.cpp - -GENPIC = no - -include $(top_srcdir)/make/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -# The slice2freeze rules are structured like this to avoid issues with -# parallel make. -ByteIntMap.h: ByteIntMap.cpp -ByteIntMap.cpp: $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f ByteIntMap.h ByteIntMap.cpp - $(SLICE2FREEZE) --dict Test::ByteIntMap,byte,int --dict-index "Test::ByteIntMap,sort" ByteIntMap - -IntIdentityMap.h: IntIdentityMap.cpp -IntIdentityMap.cpp: $(ice_slicedir)/Ice/Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f IntIdentityMap.h IntIdentityMap.cpp - $(SLICE2FREEZE) --ice $(SLICE2CPPFLAGS) --dict Test::IntIdentityMap,int,Ice::Identity IntIdentityMap $(ice_slicedir)/Ice/Identity.ice - -IntIdentityMapWithIndex.h: IntIdentityMapWithIndex.cpp -IntIdentityMapWithIndex.cpp: $(ice_slicedir)/Ice/Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp - $(SLICE2FREEZE) --ice $(SLICE2CPPFLAGS) --dict Test::IntIdentityMapWithIndex,int,Ice::Identity --dict-index Test::IntIdentityMapWithIndex,category IntIdentityMapWithIndex $(ice_slicedir)/Ice/Identity.ice - -SortedMap.h: SortedMap.cpp -SortedMap.cpp: $(ice_slicedir)/Ice/Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f SortedMap.h SortedMap.cpp - $(SLICE2FREEZE) --ice $(SLICE2CPPFLAGS) --dict Test::SortedMap,int,Ice::Identity,sort SortedMap --dict-index "Test::SortedMap,category,sort,std::greater" $(ice_slicedir)/Ice/Identity.ice - -WstringWstringMap.h: WstringWstringMap.cpp -WstringWstringMap.cpp: $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f WstringWstringMap.h WstringWstringMap.cpp - $(SLICE2FREEZE) --dict 'Test::WstringWstringMap,["cpp:type:wstring"]string,["cpp:type:wstring"]string' --dict-index Test::WstringWstringMap WstringWstringMap - -clean:: - -rm -f ByteIntMap.h ByteIntMap.cpp - -rm -f IntIdentityMap.h IntIdentityMap.cpp - -rm -f IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp - -rm -f SortedMap.h SortedMap.cpp - -rm -f WstringWstringMap.h WstringWstringMap.cpp - -rm -rf db/* diff --git a/cpp/test/Freeze/dbmap/Makefile.mk b/cpp/test/Freeze/dbmap/Makefile.mk new file mode 100644 index 00000000..d9120614 --- /dev/null +++ b/cpp/test/Freeze/dbmap/Makefile.mk @@ -0,0 +1,27 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# +# ********************************************************************** + +$(test)_client_slice2freeze := ByteIntMap IntIdentityMap IntIdentityMapWithIndex SortedMap WstringWstringMap + +$(test)_client_ByteIntMap := --dict "Test::ByteIntMap,byte,int" --dict-index "Test::ByteIntMap,sort" + +$(test)_client_IntIdentityMap := --dict "Test::IntIdentityMap,int,Ice::Identity" +$(test)_client_IntIdentityMap_slice := $(ice_slicedir)/Ice/Identity.ice +$(test)_client_IntIdentityMap_flags := --ice + +$(test)_client_IntIdentityMapWithIndex := --dict "Test::IntIdentityMapWithIndex,int,Ice::Identity" \ + --dict-index "Test::IntIdentityMapWithIndex,category" +$(test)_client_IntIdentityMapWithIndex_slice := $(ice_slicedir)/Ice/Identity.ice +$(test)_client_IntIdentityMapWithIndex_flags := --ice + +$(test)_client_SortedMap := --dict "Test::SortedMap,int,Ice::Identity,sort" \ + --dict-index "Test::SortedMap,category,sort,std::greater" +$(test)_client_SortedMap_slice := $(ice_slicedir)/Ice/Identity.ice +$(test)_client_SortedMap_flags := --ice + +$(test)_client_WstringWstringMap := --dict 'Test::WstringWstringMap,["cpp:type:wstring"]string,["cpp:type:wstring"]string' \ + --dict-index "Test::WstringWstringMap" +tests += $(test) diff --git a/cpp/test/Freeze/evictor/Makefile b/cpp/test/Freeze/evictor/Makefile deleted file mode 100644 index 4759880e..00000000 --- a/cpp/test/Freeze/evictor/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/make/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -clean:: - -rm -rf db/__catalog db/__catalogIndexList db/Test db/log.* db/__Freeze diff --git a/cpp/test/Freeze/fileLock/Makefile b/cpp/test/Freeze/fileLock/Makefile deleted file mode 100644 index acfa5d99..00000000 --- a/cpp/test/Freeze/fileLock/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -CLIENTF = clientFail - -TARGETS = $(CLIENT) $(CLIENTF) - -COBJS = Client.o - -CFOBJS = ClientFail.o - -OBJS = $(COBJS) $(CFOBJS) - -GENPIC = no - -include $(top_srcdir)/make/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -$(CLIENTF): $(CFOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(CFOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - - -clean:: - -rm -rf db/* diff --git a/cpp/test/FreezeScript/Makefile b/cpp/test/FreezeScript/Makefile deleted file mode 100644 index 04c36498..00000000 --- a/cpp/test/FreezeScript/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/make/Make.rules - -SUBDIRS = dbmap evictor - -.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/FreezeScript/dbmap/Makefile b/cpp/test/FreezeScript/dbmap/Makefile deleted file mode 100644 index a378a381..00000000 --- a/cpp/test/FreezeScript/dbmap/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = makedb - -TARGETS = $(CLIENT) - -SLICE_OBJS = TestOld.o - -OBJS = $(SLICE_OBJS) \ - makedb.o \ - IntSMap.o - -all:: IntSMap.cpp - -include $(top_srcdir)/make/Make.rules - -CPPFLAGS := -I. $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -# The slice2freeze rules are structured like this to avoid issues with -# parallel make. -IntSMap.h: IntSMap.cpp -IntSMap.cpp: TestOld.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f IntSMap.h IntSMap.cpp - $(SLICE2FREEZE) -I. --dict IntSMap,int,::Test::S IntSMap TestOld.ice - -clean:: - -rm -f IntSMap.h IntSMap.cpp - -rm -rf db/* db_init db_check db_tmp diff --git a/cpp/test/FreezeScript/evictor/Makefile b/cpp/test/FreezeScript/evictor/Makefile deleted file mode 100644 index a2476bad..00000000 --- a/cpp/test/FreezeScript/evictor/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = makedb - -TARGETS = $(CLIENT) - -SLICE_OBJS = TestOld.o - -OBJS = $(SLICE_OBJS) \ - makedb.o - -include $(top_srcdir)/make/Make.rules - -CPPFLAGS := -I. $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -clean:: - -rm -rf db/* db_tmp db_check diff --git a/cpp/test/Makefile b/cpp/test/Makefile deleted file mode 100644 index 499bfe04..00000000 --- a/cpp/test/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# ********************************************************************** - -top_srcdir = .. - -include $(top_srcdir)/make/Make.rules - -SUBDIRS = Freeze \ - FreezeScript - -.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/java/gradle.properties b/java/gradle.properties index 52bb7152..cec0bd47 100644 --- a/java/gradle.properties +++ b/java/gradle.properties @@ -4,7 +4,7 @@ // // ********************************************************************** -iceVersion = 3.7.0 +iceVersion = 3.7.0-alpha0 // // The directory that contains Oracle Berkeley DB's db.jar file. When not diff --git a/java/src/Freeze/src/main/java/Freeze/MapInternal/MapI.java b/java/src/Freeze/src/main/java/Freeze/MapInternal/MapI.java index ebbe671e..ccb9e73d 100644 --- a/java/src/Freeze/src/main/java/Freeze/MapInternal/MapI.java +++ b/java/src/Freeze/src/main/java/Freeze/MapInternal/MapI.java @@ -1650,7 +1650,7 @@ public int compare(ByteBuffer b1, ByteBuffer b2) private final java.util.Comparator _comparator; } - public static class Patcher implements Ice.ReadObjectCallback + public static class Patcher implements Ice.ReadValueCallback { public Patcher(String type) @@ -1660,7 +1660,7 @@ public static class Patcher implements Ice.ReadObjectCallback @Override public void - objectReady(Ice.Object v) + valueReady(Ice.Object v) { value = v; } diff --git a/java/src/Freeze/src/main/java/Freeze/ObjectStore.java b/java/src/Freeze/src/main/java/Freeze/ObjectStore.java index 17facb72..77260d3c 100644 --- a/java/src/Freeze/src/main/java/Freeze/ObjectStore.java +++ b/java/src/Freeze/src/main/java/Freeze/ObjectStore.java @@ -293,7 +293,7 @@ else if(err == com.sleepycat.db.OperationStatus.NOTFOUND) marshalKey(Ice.Identity v, Ice.Communicator communicator, Ice.EncodingVersion encoding) { Ice.OutputStream os = new Ice.OutputStream(communicator, encoding, false); - v.ice_write(os); + v.__write(os); return new com.sleepycat.db.DatabaseEntry(os.prepareWrite().b); } @@ -310,7 +310,7 @@ else if(err == com.sleepycat.db.OperationStatus.NOTFOUND) is = new Ice.InputStream(communicator, encoding, e.getData()); } Ice.Identity key = new Ice.Identity(); - key.ice_read(is); + key.__read(is); return key; } @@ -322,13 +322,13 @@ else if(err == com.sleepycat.db.OperationStatus.NOTFOUND) if(keepStats) { - v.ice_write(os); + v.__write(os); } else { - os.writeObject(v.servant); + os.writeValue(v.servant); } - os.writePendingObjects(); + os.writePendingValues(); os.endEncapsulation(); return new com.sleepycat.db.DatabaseEntry(os.prepareWrite().b); } @@ -346,19 +346,19 @@ else if(err == com.sleepycat.db.OperationStatus.NOTFOUND) { is = new Ice.InputStream(communicator, encoding, e.getData()); } - is.setSliceObjects(false); + is.setSliceValues(false); ObjectRecord rec = new ObjectRecord(); is.startEncapsulation(); if(keepStats) { - rec.ice_read(is); - is.readPendingObjects(); + rec.__read(is); + is.readPendingValues(); } else { Ice.ObjectHolder holder = new Ice.ObjectHolder(); - is.readObject(holder); - is.readPendingObjects(); + is.readValue(holder); + is.readPendingValues(); rec.servant = holder.value; } is.endEncapsulation();