summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Freeze/Makefile7
-rw-r--r--cpp/src/Freeze/Makefile.mak14
-rw-r--r--cpp/src/IceGrid/Makefile13
-rw-r--r--cpp/src/IceGrid/Makefile.mak12
-rw-r--r--cpp/src/IceStorm/Makefile15
-rw-r--r--cpp/src/IceStorm/Makefile.mak36
6 files changed, 46 insertions, 51 deletions
diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile
index a433bf0b777..827eebfe525 100644
--- a/cpp/src/Freeze/Makefile
+++ b/cpp/src/Freeze/Makefile
@@ -15,7 +15,6 @@ LIBNAME = $(call mklibname,Freeze)
TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
-
OBJS = BackgroundSaveEvictor.o \
BackgroundSaveEvictorI.o \
CatalogData.o \
@@ -62,15 +61,13 @@ SLICE_SRCS = $(SDIR)/BackgroundSaveEvictor.ice \
HDIR = $(headerdir)/Freeze
SDIR = $(slicedir)/Freeze
-
include $(top_srcdir)/config/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_LIBS)
-
-$(HDIR)/Catalog.h Catalog.cpp: $(SLICE2FREEZE) $(SDIR)/CatalogData.ice
+$(HDIR)/Catalog.h 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
@@ -79,7 +76,7 @@ $(HDIR)/Catalog.h Catalog.cpp: $(SLICE2FREEZE) $(SDIR)/CatalogData.ice
clean::
-rm -f $(HDIR)/Catalog.h Catalog.cpp
-$(HDIR)/CatalogIndexList.h CatalogIndexList.cpp: $(SLICE2FREEZE) $(slicedir)/Ice/BuiltinSequences.ice
+$(HDIR)/CatalogIndexList.h CatalogIndexList.cpp: $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f $(HDIR)/CatalogIndexList.h CatalogIndexList.cpp
$(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::CatalogIndexList,string,Ice::StringSeq \
CatalogIndexList ../../../slice/Ice/BuiltinSequences.ice
diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak
index 36064ee6749..525379f1b91 100644
--- a/cpp/src/Freeze/Makefile.mak
+++ b/cpp/src/Freeze/Makefile.mak
@@ -12,10 +12,8 @@ top_srcdir = ..\..
LIBNAME = $(top_srcdir)\lib\freeze$(LIBSUFFIX).lib
DLLNAME = $(top_srcdir)\bin\freeze$(SOVERSION)$(LIBSUFFIX).dll
-
TARGETS = $(LIBNAME) $(DLLNAME)
-
OBJS = BackgroundSaveEvictor.obj \
BackgroundSaveEvictorI.obj \
CatalogData.obj \
@@ -74,27 +72,27 @@ $(DLLNAME): $(OBJS) Freeze.res
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-$(HDIR)/Catalog.h Catalog.cpp: $(SLICE2FREEZE) $(SDIR)/CatalogData.ice
+$(HDIR)/Catalog.h Catalog.cpp: $(SDIR)/CatalogData.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
del /q $(HDIR)\Catalog.h Catalog.cpp
$(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::Catalog,string,Freeze::CatalogData \
Catalog $(slicedir)/Freeze/CatalogData.ice
move Catalog.h $(HDIR)
+
clean::
del /q $(HDIR)\Catalog.h Catalog.cpp
-
-$(HDIR)/CatalogIndexList.h CatalogIndexList.cpp: $(SLICE2FREEZE) $(slicedir)/Ice/BuiltinSequences.ice
+$(HDIR)/CatalogIndexList.h CatalogIndexList.cpp: $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
del /q $(HDIR)\CatalogIndexList.h CatalogIndexList.cpp
$(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::CatalogIndexList,string,Ice::StringSeq \
CatalogIndexList $(slicedir)/Ice/BuiltinSequences.ice
move CatalogIndexList.h $(HDIR)
-Freeze.res: Freeze.rc
- rc.exe $(RCFLAGS) Freeze.rc
-
clean::
del /q $(HDIR)\CatalogIndexList.h CatalogIndexList.cpp
+Freeze.res: Freeze.rc
+ rc.exe $(RCFLAGS) Freeze.rc
+
clean::
del /q $(DLLNAME:.dll=.*)
del /q DB.cpp $(HDIR)\DB.h
diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile
index 57a1ec5556d..dee8f1c5d9b 100644
--- a/cpp/src/IceGrid/Makefile
+++ b/cpp/src/IceGrid/Makefile
@@ -92,6 +92,7 @@ SRCS = $(ADMIN_OBJS:.o=.cpp) \
SLICE_SRCS = ../IceGrid/Internal.ice
HDIR = $(headerdir)/IceGrid
+SDIR = $(slicedir)/IceGrid
LOCAL_HDIR = ../IceGrid
LOCAL_SDIR = ../IceGrid
@@ -99,9 +100,9 @@ SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir IceGrid $(ICECPPFLAGS)
include $(top_srcdir)/config/Make.rules
-CPPFLAGS := $(CPPFLAGS) -I.. -DICE_GRID_API_EXPORTS $(OPENSSL_FLAGS) $(READLINE_FLAGS)
+CPPFLAGS := $(CPPFLAGS) -I.. $(OPENSSL_FLAGS) $(READLINE_FLAGS)
ICECPPFLAGS := $(ICECPPFLAGS) -I..
-SLICE2CPPFLAGS := --checksum --ice --include-dir IceGrid --dll-export ICE_GRID_API $(SLICE2CPPFLAGS)
+SLICE2CPPFLAGS := --checksum --ice --include-dir IceGrid $(SLICE2CPPFLAGS)
LINKWITH := -lGlacier2 $(BZIP2_RPATH_LINK) -lIce -lIceUtil
$(ADMIN): $(ADMIN_OBJS) $(LIBTARGETS)
@@ -119,7 +120,7 @@ $(NODE_SERVER): $(NODE_SVR_OBJS) $(LIBTARGETS)
$(CXX) $(LDFLAGS) -o $@ $(NODE_SVR_OBJS) -lIceGrid -lIceStormService -lIceBox -lGlacier2 -lIcePatch2 \
$(DB_RPATH_LINK) -lFreeze $(EXPAT_RPATH_LINK) -lIceXML -lIceSSL $(OPENSSL_LIBS) $(LIBS)
-$(LOCAL_HDIR)/StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(SLICE2FREEZE)
+$(LOCAL_HDIR)/StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(LOCAL_SDIR)/Internal.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f StringApplicationInfoDict.h StringApplicationInfoDict.cpp
$(SLICE2FREEZECMD) --dict IceGrid::StringApplicationInfoDict,string,IceGrid::ApplicationInfo \
StringApplicationInfoDict $(LOCAL_SDIR)/Internal.ice
@@ -127,7 +128,7 @@ $(LOCAL_HDIR)/StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(SLICE
clean::
-rm -f StringApplicationInfoDict.h StringApplicationInfoDict.cpp
-$(LOCAL_HDIR)/IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(SLICE2FREEZE)
+$(LOCAL_HDIR)/IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(slicedir)/Ice/Identity.ice $(LOCAL_SDIR)/Internal.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
$(SLICE2FREEZECMD) --dict IceGrid::IdentityObjectInfoDict,Ice::Identity,IceGrid::ObjectInfo \
--dict-index IceGrid::IdentityObjectInfoDict,type \
@@ -136,10 +137,10 @@ $(LOCAL_HDIR)/IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(SLICE2FREEZ
clean::
rm -f IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
-$(LOCAL_HDIR)/StringAdapterInfoDict.h StringAdapterInfoDict.cpp: $(SLICE2FREEZE)
+$(LOCAL_HDIR)/StringAdapterInfoDict.h StringAdapterInfoDict.cpp: $(SDIR)/Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f StringAdapterInfoDict.h StringAdapterInfoDict.cpp
$(SLICE2FREEZECMD) --dict IceGrid::StringAdapterInfoDict,string,IceGrid::AdapterInfo \
- --dict-index IceGrid::StringAdapterInfoDict,replicaGroupId StringAdapterInfoDict $(slicedir)/IceGrid/Admin.ice
+ --dict-index IceGrid::StringAdapterInfoDict,replicaGroupId StringAdapterInfoDict $(SDIR)/Admin.ice
clean::
rm -f StringAdapterInfoDict.h StringAdapterInfoDict.cpp
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak
index 350741cdd2a..0da6279acf5 100644
--- a/cpp/src/IceGrid/Makefile.mak
+++ b/cpp/src/IceGrid/Makefile.mak
@@ -91,6 +91,8 @@ SRCS = $(ADMIN_OBJS:.obj=.cpp) \
HDIR = $(headerdir)\IceGrid
SDIR = $(slicedir)\IceGrid
+LOCAL_HDIR = ..\IceGrid
+LOCAL_SDIR = ..\IceGrid
SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir IceGrid $(ICECPPFLAGS)
@@ -143,18 +145,18 @@ $(NODE_SERVER): $(NODE_SVR_OBJS) IceGridNode.res
@if exist $@.manifest \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(SLICE2FREEZE)
+StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(LOCAL_SDIR)\Internal.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp
$(SLICE2FREEZECMD) --dict IceGrid::StringApplicationInfoDict,string,IceGrid::ApplicationInfo \
- StringApplicationInfoDict Internal.ice
+ StringApplicationInfoDict $(LOCAL_SDIR)\Internal.ice
-IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(SLICE2FREEZE)
+IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(slicedir)\Ice\Identity.ice $(LOCAL_SDIR)\Internal.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
$(SLICE2FREEZECMD) --dict IceGrid::IdentityObjectInfoDict,Ice::Identity,IceGrid::ObjectInfo \
--dict-index IceGrid::IdentityObjectInfoDict,type \
- IdentityObjectInfoDict $(slicedir)\Ice\Identity.ice Internal.ice
+ IdentityObjectInfoDict $(slicedir)\Ice\Identity.ice $(LOCAL_SDIR)\Internal.ice
-StringAdapterInfoDict.h StringAdapterInfoDict.cpp: $(SLICE2FREEZE)
+StringAdapterInfoDict.h StringAdapterInfoDict.cpp: $(SDIR)\Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp
$(SLICE2FREEZECMD) --dict IceGrid::StringAdapterInfoDict,string,IceGrid::AdapterInfo \
--dict-index IceGrid::StringAdapterInfoDict,replicaGroupId StringAdapterInfoDict $(SDIR)\Admin.ice
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index f9caf5edd31..91302e95176 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -85,7 +85,7 @@ include $(top_srcdir)/config/Make.rules
CPPFLAGS := $(CPPFLAGS) -I.. $(READLINE_FLAGS)
ICECPPFLAGS := $(ICECPPFLAGS) -I..
-SLICE2CPPFLAGS := --checksum --ice --dll-export ICE_STORM_API --include-dir IceStorm $(SLICE2CPPFLAGS)
+SLICE2CPPFLAGS := --ice --include-dir IceStorm $(SLICE2CPPFLAGS)
LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil
SVCLINKWITH := $(DB_RPATH_LINK) -lIceGrid -lGlacier2 -lFreeze -lIceBox $(BZIP2_RPATH_LINK) -lIce -lIceUtil
@@ -121,28 +121,33 @@ $(MIGRATE): $(MOBJS) $(LIBTARGETS)
rm -f $@
$(CXX) $(LDFLAGS) -o $@ $(MOBJS) $(DB_RPATH_LINK) -lIceStorm -lFreeze $(LIBS)
-LLUMap.h LLUMap.cpp: $(SLICE2FREEZE) ../IceStorm/Election.ice
+LLUMap.h LLUMap.cpp: ../IceStorm/Election.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f LLUMap.h LLUMap.cpp
$(SLICE2FREEZECMD) --dict IceStorm::LLUMap,string,IceStormElection::LogUpdate \
LLUMap ../IceStorm/Election.ice
-SubscriberMap.h SubscriberMap.cpp: ../IceStorm/SubscriberRecord.ice $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE)
+SubscriberMap.h SubscriberMap.cpp: ../IceStorm/SubscriberRecord.ice $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f SubscriberMap.h SubscriberMap.cpp
$(SLICE2FREEZECMD) \
--dict IceStorm::SubscriberMap,IceStorm::SubscriberRecordKey,IceStorm::SubscriberRecord,sort \
SubscriberMap ../IceStorm/SubscriberRecord.ice
# Needed for migration.
-V32FormatDB.h V32FormatDB.cpp: ../IceStorm/V32Format.ice $(SLICE2FREEZE)
+V32FormatDB.h V32FormatDB.cpp: ../IceStorm/V32Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f V32FormatDB.h V32FormatDB.cpp
$(SLICE2FREEZECMD) --dict IceStorm::V32Format,Ice::Identity,IceStorm::LinkRecordSeq \
V32FormatDB ../IceStorm/V32Format.ice
-V31FormatDB.h V31FormatDB.cpp: ../IceStorm/V31Format.ice $(SLICE2FREEZE)
+V31FormatDB.h V31FormatDB.cpp: ../IceStorm/V31Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f V31FormatDB.h V31FormatDB.cpp
$(SLICE2FREEZECMD) --dict IceStorm::V31Format,string,IceStorm::LinkRecordDict \
V31FormatDB ../IceStorm/V31Format.ice
+IceStorm.cpp $(HDIR)/IceStorm.h: $(SDIR)/IceStorm.ice $(SLICE2CPP) $(SLICEPARSERLIB)
+ rm -f IceStorm.cpp $(HDIR)/IceStorm.h
+ $(SLICE2CPP) --checksum --dll-export ICE_STORM_LIB_API $(SLICE2CPPFLAGS) $(SDIR)/IceStorm.ice
+ mv IceStorm.h $(HDIR)
+
# Needed for make -jn to work.
../IceStorm/Grammar.y: Grammar.h
diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak
index 81cd57b80d3..c6baf07b4df 100644
--- a/cpp/src/IceStorm/Makefile.mak
+++ b/cpp/src/IceStorm/Makefile.mak
@@ -69,7 +69,8 @@ SDIR = $(slicedir)\IceStorm
!include $(top_srcdir)\config\Make.rules.mak
CPPFLAGS = -I.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-SLICE2CPPFLAGS = --ice --include-dir IceStorm $(SLICE2CPPFLAGS) -I..
+ICECPPFLAGS = $(ICECPPFLAGS) -I..
+SLICE2CPPFLAGS = --ice --include-dir IceStorm $(SLICE2CPPFLAGS)
LINKWITH = $(LIBS) icestorm$(LIBSUFFIX).lib icegrid$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib icebox$(LIBSUFFIX).lib
ALINKWITH = $(LIBS) icestorm$(LIBSUFFIX).lib
MLINKWITH = $(LIBS) icestorm$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib
@@ -123,47 +124,38 @@ $(MIGRATE): $(MOBJS) IceStormMigrate.res
@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-LLUMap.h LLUMap.cpp: $(SLICE2FREEZE) ..\IceStorm\Election.ice
+LLUMap.h LLUMap.cpp: ..\IceStorm\Election.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
del /q LLUMap.h LLUMap.cpp
$(SLICE2FREEZECMD) --dict IceStorm::LLUMap,string,IceStormElection::LogUpdate LLUMap ..\IceStorm\Election.ice
-..\IceStorm\SubscriberMap.h SubscriberMap.cpp: ..\IceStorm\SubscriberRecord.ice $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE)
+..\IceStorm\SubscriberMap.h SubscriberMap.cpp: ..\IceStorm\SubscriberRecord.ice $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
del /q SubscriberMap.h SubscriberMap.cpp
$(SLICE2FREEZECMD) \
--dict IceStorm::SubscriberMap,IceStorm::SubscriberRecordKey,IceStorm::SubscriberRecord,sort \
SubscriberMap ..\IceStorm\SubscriberRecord.ice
# Needed for migration.
-V32FormatDB.h V32FormatDB.cpp: ..\IceStorm\V32Format.ice $(SLICE2FREEZE)
+V32FormatDB.h V32FormatDB.cpp: ..\IceStorm\V32Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
del /q V32FormatDB.h V32FormatDB.cpp
$(SLICE2FREEZECMD) --dict IceStorm::V32Format,Ice::Identity,IceStorm::LinkRecordSeq \
V32FormatDB ..\IceStorm\V32Format.ice
-V31FormatDB.h V31FormatDB.cpp: ..\IceStorm\V31Format.ice $(SLICE2FREEZE)
+V31FormatDB.h V31FormatDB.cpp: ..\IceStorm\V31Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
del /q V31FormatDB.h V31FormatDB.cpp
$(SLICE2FREEZECMD) --dict IceStorm::V31Format,string,IceStorm::LinkRecordDict \
V31FormatDB ..\IceStorm\V31Format.ice
-V32Migrate.cpp ..\IceStorm\V32Migrate.h: ..\IceStorm\V32Migrate.ice
- $(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\V32Migrate.ice
-
-V31Migrate.cpp ..\IceStorm\V31Migrate.h: ..\IceStorm\V31Migrate.ice
- $(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\V31Migrate.ice
-
-LinkRecord.cpp ..\IceStorm\LinkRecord.h: ..\IceStorm\LinkRecord.ice
- $(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\LinkRecord.ice
-
-SubscriberRecord.cpp ..\IceStorm\SubscriberRecord.h: ..\IceStorm\SubscriberRecord.ice
- $(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\SubscriberRecord.ice
-
-IceStorm.cpp $(HDIR)\IceStorm.h: $(SDIR)\IceStorm.ice
- $(SLICE2CPP) --dll-export ICE_STORM_LIB_API $(SLICE2CPPFLAGS) $(SDIR)\IceStorm.ice
+IceStorm.cpp $(HDIR)\IceStorm.h: $(SDIR)\IceStorm.ice $(SLICE2CPP) $(SLICEPARSERLIB)
+ del /q $(HDIR)\IceStorm.h IceStorm.cpp
+ $(SLICE2CPP) --checksum --dll-export ICE_STORM_LIB_API $(SLICE2CPPFLAGS) $(SDIR)\IceStorm.ice
move IceStorm.h $(HDIR)
-Election.cpp ..\IceStorm\Election.h: ..\IceStorm\Election.ice
- $(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\Election.ice
+# Implicit rule to build the private IceStorm .ice files.
+{..\IceStorm\}.ice{..\IceStorm\}.h:
+ del /q $(*F).h $(*F).cpp
+ $(SLICE2CPP) $(SLICE2CPPFLAGS) $(*F).ice
-Scanner.cpp : Scanner.l
+Scanner.cpp: Scanner.l
flex Scanner.l
del /q $@
echo #include "IceUtil/Config.h" > Scanner.cpp
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 10:43:21 +0000