You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by na...@apache.org on 2006/06/16 11:40:30 UTC

svn commit: r414790 - in /webservices/axis2/trunk/c: build/win32/makefile woden/include/woden_desc.h woden/include/woden_interface.h woden/include/woden_svc.h woden/include/woden_svc_element.h

Author: nandika
Date: Fri Jun 16 02:40:30 2006
New Revision: 414790

URL: http://svn.apache.org/viewvc?rev=414790&view=rev
Log:
makefile updated , warnings fixed

Modified:
    webservices/axis2/trunk/c/build/win32/makefile
    webservices/axis2/trunk/c/woden/include/woden_desc.h
    webservices/axis2/trunk/c/woden/include/woden_interface.h
    webservices/axis2/trunk/c/woden/include/woden_svc.h
    webservices/axis2/trunk/c/woden/include/woden_svc_element.h

Modified: webservices/axis2/trunk/c/build/win32/makefile
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/build/win32/makefile?rev=414790&r1=414789&r2=414790&view=diff
==============================================================================
--- webservices/axis2/trunk/c/build/win32/makefile (original)
+++ webservices/axis2/trunk/c/build/win32/makefile Fri Jun 16 02:40:30 2006
@@ -726,18 +726,64 @@
 	$(LD) $(LDFLAGS) test_schema.obj $(AXIS2_UTIL).lib $(AXIS2_PARSER).lib $(AXIOM).lib \
 	$(AXIS2_INSTALL_DIR)\lib\xml_schema.lib \
 	/OUT:test_schema.exe
-	if not exist $(AXIS2_INSTALL_DIR)\bin\system_tests mkdir $(AXIS2_INSTALL_DIR)\bin\system_tests
+	if not exist $(AXIS2_INSTALL_DIR)\bin\samples\xml_schema mkdir $(AXIS2_INSTALL_DIR)\bin\samples\xml_schema
 
-	copy test_schema.exe $(AXIS2_INSTALL_DIR)\bin\system_tests
+	copy test_schema.exe $(AXIS2_INSTALL_DIR)\bin\samples\xml_schema
 	del test*.*
 
 xml_schema_all: xml_schema xml_schema_sample xml_schema_copy_include
 
+########################################
+############## woden ###################
+
+WODEN_INCLUDE_PATH = /I$(AXIS2_SOURCE_DIR)\woden\include \
+		     /I$(AXIS2_SOURCE_DIR)\xml_schema\include \
+		     /I$(AXIS2_SOURCE_DIR)\woden\src\util 
+
+
+
+
+WODEN_SRC_DIR = $(AXIS2_SOURCE_DIR)\woden\src\builder\*.c \
+		$(AXIS2_SOURCE_DIR)\woden\src\schema\*.c \
+		$(AXIS2_SOURCE_DIR)\woden\src\types\*.c \
+		$(AXIS2_SOURCE_DIR)\woden\src\util\*.c \
+		$(AXIS2_SOURCE_DIR)\woden\src\wsdl20\*.c \
+		$(AXIS2_SOURCE_DIR)\woden\src\wsdl20\enumeration\*.c \
+		$(AXIS2_SOURCE_DIR)\woden\src\wsdl20\extensions\*.c \
+		$(AXIS2_SOURCE_DIR)\woden\src\wsdl20\extensions\soap\*.c \
+		$(AXIS2_SOURCE_DIR)\woden\src\wsdl20\xml\*.c \
+		$(AXIS2_SOURCE_DIR)\woden\src\xml\*.c 
+woden : 
+	$(CC) $(CFLAGS) $(WODEN_INCLUDE_PATH) $(WODEN_SRC_DIR) /c
+	$(LD) $(LDFLAGS) *.obj xml_schema.lib $(AXIS2_UTIL).lib $(AXIS2_PARSER).lib \
+	$(AXIOM).lib /DLL /OUT:woden.dll /IMPLIB:woden.lib 
 	
+	copy woden.lib $(AXIS2_INSTALL_DIR)\lib
+	copy woden.dll $(AXIS2_INSTALL_DIR)\lib
+	del *.obj
+	del woden.dll
+	del woden.lib
+	del woden.exp
+
+woden_copy_include:
+	xcopy /Y /I /E $(AXIS2_SOURCE_DIR)\woden\include $(AXIS2_INSTALL_DIR)\include 
+
+woden_sample:
+	$(CC) $(CFLAGS) $(WODEN_INCLUDE_PATH) $(AXIS2_SOURCE_DIR)\woden\samples\test_wsdl2.c /c
+	$(LD) $(LDFLAGS) test_wsdl2.obj $(AXIS2_UTIL).lib $(AXIS2_PARSER).lib $(AXIOM).lib \
+	$(AXIS2_INSTALL_DIR)\lib\woden.lib $(AXIS2_INSTALL_DIR)\lib\woden.lib\
+	/OUT:test_woden.exe
+	if not exist $(AXIS2_INSTALL_DIR)\bin\samples\woden mkdir $(AXIS2_INSTALL_DIR)\bin\samples\woden
+
+	copy test_woden.exe $(AXIS2_INSTALL_DIR)\bin\samples\woden
+	del test*.*
+	
+woden_all: woden woden_sample woden_copy_include
+ 
 ##############################################################################################
 
 all: clean_make_dir clean deploy all_core_modules all_services all_clients axis2_server   copy_include clean_make_dir 
  
 install: all
 
-dist: all axis2_apache_module mod_rampart_all xml_schema_all copy_extra copy_samples mv_dist
\ No newline at end of file
+dist: all axis2_apache_module mod_rampart_all xml_schema_all woden_all copy_extra copy_samples mv_dist

Modified: webservices/axis2/trunk/c/woden/include/woden_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_desc.h?rev=414790&r1=414789&r2=414790&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_desc.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_desc.h Fri Jun 16 02:40:30 2006
@@ -148,7 +148,7 @@
     add_to_all_interfaces) (
             void *desc,
             const axis2_env_t *env,
-            void *interface);
+            void *interface_);
 
     axis2_status_t (AXIS2_CALL *
     add_to_all_bindings) (

Modified: webservices/axis2/trunk/c/woden/include/woden_interface.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_interface.h?rev=414790&r1=414789&r2=414790&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_interface.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_interface.h Fri Jun 16 02:40:30 2006
@@ -53,53 +53,53 @@
      * @return status code
      */
     axis2_status_t (AXIS2_CALL *
-    free) (void *interface,
+    free) (void *woden_interface,
             const axis2_env_t *env);
 
     axis2_hash_t *(AXIS2_CALL *
-    super_objs) (void *interface,
+    super_objs) (void *woden_interface,
             const axis2_env_t *env);
 
     woden_obj_types_t (AXIS2_CALL *
-    type) (void *interface,
+    type) (void *woden_interface,
             const axis2_env_t *env);
     /**
      * @return the base implementation class
      */
     struct woden_configurable *(AXIS2_CALL *
     get_base_impl) (
-            void *interface,
+            void *woden_interface,
             const axis2_env_t *env);
 
     axis2_qname_t *(AXIS2_CALL *
     get_qname) (
-            void *interface,
+            void *woden_interface,
             const axis2_env_t *env);
 
     axis2_array_list_t *(AXIS2_CALL *
     get_extended_interfaces) (
-            void *interface,
+            void *woden_interface,
             const axis2_env_t *env);
 
     axis2_array_list_t *(AXIS2_CALL *
     get_interface_faults) (
-            void *interface,
+            void *woden_interface,
             const axis2_env_t *env);
 
     void *(AXIS2_CALL *
     get_interface_fault) (
-            void *interface,
+            void *woden_interface,
             const axis2_env_t *env,
             axis2_qname_t *qname);
 
     axis2_array_list_t *(AXIS2_CALL *
     get_interface_ops) (
-            void *interface,
+            void *woden_interface,
             const axis2_env_t *env);
 
     void *(AXIS2_CALL *
     to_element)  (
-            void *interface,
+            void *woden_interface,
             const axis2_env_t *env);
 
 };
@@ -124,32 +124,32 @@
 /***************************Woden C Internal Methods***************************/
 AXIS2_EXTERN woden_interface_t * AXIS2_CALL
 woden_interface_to_interface_element(
-        void *interface,
+        void *woden_interface,
         const axis2_env_t *env);
 
 AXIS2_EXTERN woden_interface_t * AXIS2_CALL
 woden_interface_to_documentable(
-        void *interface,
+        void *woden_interface,
         const axis2_env_t *env);
 
 AXIS2_EXTERN woden_interface_t * AXIS2_CALL
 woden_interface_to_configurable(
-        void *interface,
+        void *woden_interface,
         const axis2_env_t *env);
 
 AXIS2_EXTERN woden_interface_t * AXIS2_CALL
 woden_interface_to_attr_extensible(
-        void *interface,
+        void *woden_interface,
         const axis2_env_t *env);
 
 AXIS2_EXTERN woden_interface_t * AXIS2_CALL
 woden_interface_to_element_extensible(
-        void *interface,
+        void *woden_interface,
         const axis2_env_t *env);
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 woden_interface_resolve_methods(
-        woden_interface_t *interface,
+        woden_interface_t *woden_interface,
         const axis2_env_t *env,
         woden_interface_t *interface_impl,
         axis2_hash_t *methods);

Modified: webservices/axis2/trunk/c/woden/include/woden_svc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_svc.h?rev=414790&r1=414789&r2=414790&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_svc.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_svc.h Fri Jun 16 02:40:30 2006
@@ -99,7 +99,7 @@
     set_interface_element) (
             void *svc,
             const axis2_env_t *env,
-            void *interface);
+            void *winterface);
 
 
 };

Modified: webservices/axis2/trunk/c/woden/include/woden_svc_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_svc_element.h?rev=414790&r1=414789&r2=414790&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_svc_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_svc_element.h Fri Jun 16 02:40:30 2006
@@ -99,7 +99,7 @@
     add_endpoint_element) (
             void *svc_el,
             const axis2_env_t *env,
-            void *interface);
+            void *winterface);
 
     axis2_array_list_t *(AXIS2_CALL *
     get_endpoint_elements) (



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org