From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Mon, 25 Apr 2005 15:37:59 +0000 (+0000)
Subject: change gsoap version detection to work also with gsoap 2.7.1
X-Git-Tag: glite-security-gsoap-plugin_R_1_1_0~22
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=68cc0c0ca24e42dc53efd7a0034ea11d4c209b77;p=jra1mw.git

change gsoap version detection to work also with gsoap 2.7.1
---

diff --git a/org.glite.jp.primary/Makefile b/org.glite.jp.primary/Makefile
index b6070d4..e2f1c60 100644
--- a/org.glite.jp.primary/Makefile
+++ b/org.glite.jp.primary/Makefile
@@ -49,10 +49,6 @@ is_prefix:=jpis_
 
 plugins:=glite-jp-tags.la
 
-gsoap_version=`${gsoap_prefix}/bin/soapcpp2 -version 2>&1 | cut -d' ' -f4 | perl -F\\\\. -nae '$$F[2] =~ s/\D*$$//; print $$F[2]+100*$$F[1]+10000*$$F[0]'`
-
-CFLAGS+=-DGSOAP_VERSION=${gsoap_version}
-
 HDRS_I=file_plugin.h
 HDRS_S=builtin_plugins.h backend.h
 
@@ -166,3 +162,10 @@ glite-jp-tags.la: tags_plugin.lo
 
 %.lo: %.c
 	${LTCOMPILE} -o $@ -c $<
+
+soap_ops.o: soap_version.h
+
+soap_version.h:
+	${gsoap_prefix}/bin/soapcpp2 /dev/null
+	perl -ne '$$. == 2 && /.*([0-9])\.([0-9])\.([0-9]).*/ && printf "#define GSOAP_VERSION %d%02d%02d\n",$$1,$$2,$$3' soapH.h >$@
+	-rm soapC.cpp soapH.h soapStub.h soapClient.cpp soapServer.cpp soapClientLib.cpp soapServerLib.cpp 
diff --git a/org.glite.jp.primary/src/bones_server.c b/org.glite.jp.primary/src/bones_server.c
index 1a8cef3..0a54d8e 100644
--- a/org.glite.jp.primary/src/bones_server.c
+++ b/org.glite.jp.primary/src/bones_server.c
@@ -15,7 +15,7 @@
 #include "backend.h"
 #include "file_plugin.h"
 
-
+#include "soap_version.h"
 #include "jpps_H.h"
 
 #define CONN_QUEUE	20
@@ -246,6 +246,7 @@ static int request(int conn,struct timeval *to,void *data)
 	}
 
 	glite_jp_run_deferred(ctx);
+	return 0;
 }
 
 static int reject(int conn)
diff --git a/org.glite.jp.primary/src/jptype_map.h b/org.glite.jp.primary/src/jptype_map.h
index 6df0828..a6f97ba 100644
--- a/org.glite.jp.primary/src/jptype_map.h
+++ b/org.glite.jp.primary/src/jptype_map.h
@@ -1,3 +1,5 @@
+#include "soap_version.h"
+
 #if GSOAP_VERSION >= 20700
 #define INPUT_SANDBOX	jptype__UploadClass__INPUT_SANDBOX
 #define OUTPUT_SANDBOX	jptype__UploadClass__OUTPUT_SANDBOX