Changeset 215

Timestamp:

06/14/11 21:32:59 (12 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv

Files:

• Doxyfile (added)
• Makefile.wk (modified) (10 diffs)
• doc.tar.gz (added)
• src4 (added)
• src4/xmlio (added)
• src4/xmlio/exception.cpp (added)
• src4/xmlio/exception.hpp (added)
• src4/xmlio/exception_mac.hpp (added)
• src4/xmlio/main_server.cpp (added)
• src4/xmlio/object.cpp (added)
• src4/xmlio/object.hpp (added)
• src4/xmlio/xml (added)
• src4/xmlio/xml/xml_node.cpp (added)
• src4/xmlio/xml/xml_node.hpp (added)
• src4/xmlio/xml/xml_parser.cpp (added)
• src4/xmlio/xml/xml_parser.hpp (added)
• src4/xmlio/xmlioserver.hpp (added)
• src4/xmlio/xmlioserver_spl.hpp (added)

XMLIO_V2/dev/dev_rv/Makefile.wk

@@ -16 +16 @@
 GUI       = no
 NPROC     = 6
-VERSION   =
+VERSION   = 4
 CSUITE    = intel
 PFORME    = fedora-wk
@@ -125 +125 @@
         T2F    = $(A)txt2tags
         DOX    = $(A)doxygen -s
-        TAR    = $(A)tar -cvf
+        TAR    = $(A)tar -cf
         GZIP   = $(A)gzip -9 -q
         EXNET  = $(A)firefox
@@ -196 +196 @@
 FUNC_PATH = $(SRC_PATH)/functor
 DATE_PATH = $(SRC_PATH)/date
-GUI_PATH  = $(SRC_PATH)/qt
-VTK_PATH  = $(SRC_PATH)/vtk
 INPT_PATH = $(SRC_PATH)/input
 OUPT_PATH = $(SRC_PATH)/output
 MNGR_PATH = $(SRC_PATH)/manager
+GUI_PATH  = $(SRC_PATH)/qt
+VTK_PATH  = $(SRC_PATH)/vtk
+XML_PATH  = $(SRC_PATH)/xml
 
 FAKE_PATH = $(SRC_PATH)/fake_client
@@ -206 +207 @@
 ################################################################################
 
-VPATH = $(DEP_PATH):$(SRC_PATH):$(CSRC_PATH):$(NODE_PATH)\
+VPATH = $(DEP_PATH):$(SRC_PATH):$(CSRC_PATH):$(NODE_PATH) $(XML_PATH)\
 :$(FUNC_PATH):$(DATE_PATH):$(GUI_PATH):$(VTK_PATH):$(INPT_PATH)\
 :$(OUPT_PATH):$(MNGR_PATH):$(FAKE_PATH):$(FSRC_PATH):$(CONF_PATH)
@@ -301 +302 @@
 
 ifeq ($(DEBUG), yes)
-        CFLAGS += -D XIOS_DEBUG -g
+        CFLAGS += -D __XIOS_DEBUG -g
 endif
 
@@ -363 +364 @@
 COM_T2T = $(patsubst %.t2t,%.html,$(DOC_T2T))
 
+PREPROC = $(FSRC_PATH)/$(IFSOURCE)$(FORTEXT) $(CSRC_PATH)/$(ICSOURCE).cpp
+
+ifeq ($(VERSION), 4)
+        PREPROC = #vide
+endif
+
 ##############################  Modifications ##################################
 
@@ -373 +380 @@
 
 ELEMS_FOR = $(TSOURCE) $(IFSOURCE) 
+
+ifeq ($(VERSION), 4)
+        ELEMS_FOR = #vide
+endif
             
 ELEMS_CPP = $(ICSOURCE) $(OSOURCE) $(ISOURCE) $(LSOURCE) \
@@ -378 +389 @@
             $(NSOURCE)  $(MSOURCE) 
 
+ifeq ($(VERSION), 4)
+        ELEMS_CPP = object exception
+endif
+
 ELEMS_ALL = $(ELEMS_CPP) $(ELEMS_FOR)
               
 OBJECTS = $(addprefix $(OBJ_PATH)/, $(addsuffix .o, $(ELEMS_ALL))) $(OBJ_PATH)/impi_interface.o
+ifeq ($(VERSION), 4)
+        OBJECTS = $(addprefix $(OBJ_PATH)/, $(addsuffix .o, $(ELEMS_ALL)))
+endif
+
 DEPENDS = $(addprefix $(DEP_PATH)/, $(addsuffix .d, $(ELEMS_CPP)))
 
@@ -415 +434 @@
 
 .PHONY: preproc
-preproc : $(FSRC_PATH)/$(IFSOURCE)$(FORTEXT) $(CSRC_PATH)/$(ICSOURCE).cpp
+preproc : $(PREPROC)
 
 .PHONY: clean-depend
@@ -479 +498 @@
 doc: t2t
         $(DOX)
-        $(REMOVE) $(DOC_PATH)/doc.tar.gz
-        $(TAR)    $(DOC_PATH)/doc/doc.tar doc/html > $(DEV_PATH)/tar_output
+        $(REMOVE) $(DEV_PATH)/doc.tar.gz
+        $(TAR)    $(DEV_PATH)/doc.tar $(DOC_PATH)/html > $(DEV_PATH)/tar_output
         $(REMOVE) $(DEV_PATH)/tar_output
-        $(GZIP)   $(DOC_PATH)/doc/doc.tar
+        $(GZIP)   $(DEV_PATH)/doc.tar
 
 .PHONY: show-doc