[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wsf-c-commits
Subject:    [Wsf-commits] svn commit r53714 - trunk/wsf/c/adminservices
From:       nandika () wso2 ! com
Date:       2010-01-27 18:39:21
Message-ID: E1NaCnR-0001RB-Li () wso2 ! org
[Download RAW message or body]

Author: nandika
Date: Wed Jan 27 10:39:21 2010
New Revision: 53714
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=53714

Log:
adminservices.mk updated

Modified:
   trunk/wsf/c/adminservices/adminservices.mk

Modified: trunk/wsf/c/adminservices/adminservices.mk
URL: http://wso2.org/svn/browse/wso2/trunk/wsf/c/adminservices/adminservices.mk?rev=53714&r1=53713&r2=53714&view=diff
 ==============================================================================
--- trunk/wsf/c/adminservices/adminservices.mk	(original)
+++ trunk/wsf/c/adminservices/adminservices.mk	Wed Jan 27 10:39:21 2010
@@ -13,7 +13,7 @@
 
 AUTH_SERVICE=AuthenticationAdminService
 SERVER_ADMIN_SERVICE=ServerAdmin
-ENDPOINT_ADMIN_SERVICE=EndpointAdmin
+OP_ADMIN_SERVICE=OperationAdmin
 SERVICE_ADMIN_SERVICE=ServiceAdmin
 SERVICE_GRP_ADMIN_SERVICE=ServiceGroupAdmin
 
@@ -21,7 +21,8 @@
 AUTH_SVC_SRC=$(ADMIN_SVC_SRCDIR)\authentication
 SERVER_ADMIN_SRC=$(ADMIN_SVC_SRCDIR)\server_admin
 SERVICE_ADMIN_SRC=$(ADMIN_SVC_SRCDIR)\service_admin
-SERVICE_GRP_ADMIN_SRC=$(ADMIN_SVC_SRCDIR)\service_group_admin
+SERVICE_ADMIN_UTIL_SRC=$(ADMIN_SVC_SRCDIR)\util
+
 ##################### compiler options
 
 CC = cl.exe 
@@ -73,7 +74,8 @@
 	if not exist $(ADMIN_SVC_DISTDIR)\$(SERVER_ADMIN_SERVICE) mkdir \
$(ADMIN_SVC_DISTDIR)\$(SERVER_ADMIN_SERVICE)  if not exist \
$(ADMIN_SVC_DISTDIR)\$(SERVICE_ADMIN_SERVICE) mkdir \
$(ADMIN_SVC_DISTDIR)\$(SERVICE_ADMIN_SERVICE)  if not exist \
$(ADMIN_SVC_DISTDIR)\$(SERVICE_GRP_ADMIN_SERVICE) mkdir \
                $(ADMIN_SVC_DISTDIR)\$(SERVICE_GRP_ADMIN_SERVICE)
-	
+	if not exist $(ADMIN_SVC_DISTDIR)\$(OP_ADMIN_SERVICE) mkdir \
$(ADMIN_SVC_DISTDIR)\$(OP_ADMIN_SERVICE) +
 
 clean: 
 	if exist $(ADMIN_SVC_DISTDIR) rmdir /S /Q $(ADMIN_SVC_DISTDIR)
@@ -85,6 +87,8 @@
 	if not exist $(ADMIN_SVC_INTDIR)\$(SERVER_ADMIN_SERVICE) mkdir \
$(ADMIN_SVC_INTDIR)\$(SERVER_ADMIN_SERVICE)  if not exist \
$(ADMIN_SVC_INTDIR)\$(SERVICE_ADMIN_SERVICE) mkdir \
$(ADMIN_SVC_INTDIR)\$(SERVICE_ADMIN_SERVICE)  if not exist \
$(ADMIN_SVC_INTDIR)\$(SERVICE_GRP_ADMIN_SERVICE) mkdir \
$(ADMIN_SVC_INTDIR)\$(SERVICE_GRP_ADMIN_SERVICE) +	if not exist \
$(ADMIN_SVC_INTDIR)\$(OP_ADMIN_SERVICE) mkdir $(ADMIN_SVC_INTDIR)\$(OP_ADMIN_SERVICE) \
+  
 $(ADMIN_SVC_DISTDIR)\$(AUTH_SERVICE)\$(AUTH_SERVICE).dll: \
$(AUTH_SVC_SRC)\codegen\*.c $(AUTH_SVC_SRC)\*.c  $(CC) $(CFLAGS) /I $(AUTH_SVC_SRC) \
$(AUTH_SVC_SRC)\codegen\*.c \ @@ -148,18 +152,26 @@
 	copy $(ADMIN_SVC_SRCDIR)\keystore_admin\resources\services.xml \
$(KEYSTORE_ADMIN_DISTDIR)  
 #==============================================================================================
 +OP_ADMIN_SRC=$(ADMIN_SVC_SRCDIR)\operation_admin
 
-endpoint_admin_service: $(ADMIN_SVC_SRCDIR)\endpoint_admin\codegen\*.c \
                $(ADMIN_SVC_SRCDIR)\endpoint_admin\*.c	
-	$(CC) $(CFLAGS) $(ADMIN_SVC_SRCDIR)\endpoint_admin\codegen\*.c \
-		$(ADMIN_SVC_SRCDIR)\endpoint_admin\*.c \
                /Fo$(ADMIN_SVC_INTDIR)\$(ENDPOINT_ADMIN_SERVICE)\ /c
-	$(LD) $(LDFLAGS) $(ADMIN_SVC_INTDIR)\$(ENDPOINT_ADMIN_SERVICE)\*.obj $(LIBS) /DLL \
-		/OUT:$(ADMIN_SVC_DISTDIR)\$(ENDPOINT_ADMIN_SERVICE)\$(ENDPOINT_ADMIN_SERVICE).dll
+$(ADMIN_SVC_DISTDIR)\$(OP_ADMIN_SERVICE)\$(OP_ADMIN_SERVICE).dll : 
+	$(CC) $(CFLAGS) $(OP_ADMIN_SRC)\codegen\*.c $(OP_ADMIN_SRC)\*.c \
$(SERVICE_ADMIN_UTIL_SRC)\*.c /Fo$(ADMIN_SVC_INTDIR)\$(OP_ADMIN_SERVICE)\ /c +	$(LD) \
$(LDFLAGS) $(ADMIN_SVC_INTDIR)\$(OP_ADMIN_SERVICE)\*.obj $(LIBS) /DLL \ \
                +		/OUT:$(ADMIN_SVC_DISTDIR)\$(OP_ADMIN_SERVICE)\$(OP_ADMIN_SERVICE).dll
                
 	-@$(_VC_MANIFEST_EMBED_DLL)
-	copy $(ADMIN_SVC_SRCDIR)\endpoint_admin\resources\services.xml \
                $(ADMIN_SVC_DISTDIR)\$(ENDPOINT_ADMIN_SERVICE)\
-	
-$(ADMIN_SVC_DISTDIR)\$(SERVICE_ADMIN_SERVICE)\$(SERVICE_ADMIN_SERVICE).dll: \
$(SERVICE_ADMIN_SRC)\codegen\*.c $(SERVICE_ADMIN_SRC)\*.c	 +	copy \
$(OP_ADMIN_SRC)\resources\services.xml $(ADMIN_SVC_DISTDIR)\$(OP_ADMIN_SERVICE)\ +
+	copy $(OP_ADMIN_SRC)\resources\$(OP_ADMIN_SERVICE).wsdl \
$(ADMIN_SVC_DISTDIR)\$(OP_ADMIN_SERVICE)\ +
+op_admin_service: $(ADMIN_SVC_DISTDIR)\$(OP_ADMIN_SERVICE)\$(OP_ADMIN_SERVICE).dll
+
+#=====================================================================================================
 +
+
+#=====================================================================================================
 +$(ADMIN_SVC_DISTDIR)\$(SERVICE_ADMIN_SERVICE)\$(SERVICE_ADMIN_SERVICE).dll: 	
 	$(CC) $(CFLAGS) $(SERVICE_ADMIN_SRC)\codegen\*.c \
-		$(SERVICE_ADMIN_SRC)\*.c /Fo$(ADMIN_SVC_INTDIR)\$(SERVICE_ADMIN_SERVICE)\ /c
+		$(SERVICE_ADMIN_SRC)\*.c $(SERVICE_ADMIN_UTIL_SRC)\*.c \
/Fo$(ADMIN_SVC_INTDIR)\$(SERVICE_ADMIN_SERVICE)\ /c  $(LD) $(LDFLAGS) \
$(ADMIN_SVC_INTDIR)\$(SERVICE_ADMIN_SERVICE)\*.obj $(LIBS) /DLL \  \
                /OUT:$(ADMIN_SVC_DISTDIR)\$(SERVICE_ADMIN_SERVICE)\$(SERVICE_ADMIN_SERVICE).dll
                
 	-@$(_VC_MANIFEST_EMBED_DLL)
@@ -167,8 +179,11 @@
 
 service_admin_service : \
$(ADMIN_SVC_DISTDIR)\$(SERVICE_ADMIN_SERVICE)\$(SERVICE_ADMIN_SERVICE).dll  
+#=====================================================================================================
 +SERVICE_GRP_ADMIN_SRC=$(ADMIN_SVC_SRCDIR)\service_group_admin
+
 $(ADMIN_SVC_DISTDIR)\$(SERVICE_GRP_ADMIN_SERVICE)\$(SERVICE_GRP_ADMIN_SERVICE).dll: \
                
-	$(CC) $(CFLAGS) $(SERVICE_GRP_ADMIN_SRC)\codegen\*.c $(SERVICE_GRP_ADMIN_SRC)\*.c \
+	$(CC) $(CFLAGS) $(SERVICE_GRP_ADMIN_SRC)\codegen\*.c $(SERVICE_ADMIN_UTIL_SRC)\*.c \
$(SERVICE_GRP_ADMIN_SRC)\*.c \  /Fo$(ADMIN_SVC_INTDIR)\$(SERVICE_GRP_ADMIN_SERVICE)\ \
/c  $(LD) $(LDFLAGS) $(ADMIN_SVC_INTDIR)\$(SERVICE_GRP_ADMIN_SERVICE)\*.obj $(LIBS) \
/DLL \  /OUT:$(ADMIN_SVC_DISTDIR)\$(SERVICE_GRP_ADMIN_SERVICE)\$(SERVICE_GRP_ADMIN_SERVICE).dll
 @@ -195,8 +210,8 @@
 	
 #==============================================================================================
  
-admin_svc_all: authentication_service server_admin_service service_admin_service \
                service_grp_admin_service
-#admin_svc_all: authentication_service server_admin_service proxy_admin \
endpoint_admin_service service_admin_service keystore_admin +admin_svc_all: \
authentication_service server_admin_service service_admin_service \
service_grp_admin_service op_admin_service +#admin_svc_all: authentication_service \
server_admin_service proxy_admin op_admin_service service_admin_service \
keystore_admin  
 install: distdir intdirs admin_svc_all
 

_______________________________________________
Wsf-commits mailing list
Wsf-commits@wso2.org
https://mail.wso2.org/cgi-bin/mailman/listinfo/wsf-commits


[prev in list] [next in list] [prev in thread] [next in thread]