From da1d3e54da30fae687c886783ebc00a71ab04e82 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Tue, 16 Dec 2008 11:48:53 +0000 Subject: [PATCH] working eticless build on sl4 (except of ws-test yet) --- org.glite.jobid.api-java/Makefile | 4 +++- org.glite.lb.client-java/Makefile | 15 +++++++++++++++ org.glite.lb.ws-test/Makefile | 10 +++------- org.glite.lb.ws-test/examples/ws_getversion.c | 2 +- org.glite.lb.ws-test/examples/ws_jobstat.c | 2 +- org.glite.lb/configure | 27 ++++++++++++++++++++++++--- 6 files changed, 47 insertions(+), 13 deletions(-) create mode 100644 org.glite.lb.client-java/Makefile diff --git a/org.glite.jobid.api-java/Makefile b/org.glite.jobid.api-java/Makefile index da7e0af..9cbba59 100644 --- a/org.glite.jobid.api-java/Makefile +++ b/org.glite.jobid.api-java/Makefile @@ -1,5 +1,7 @@ +-include Makefile.inc + all compile: - ant + ant -Dfile.reference.commons-codec.jar=${commons-codec_jar} install: mkdir -p ${PREFIX}/share/java diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile new file mode 100644 index 0000000..a8d3328 --- /dev/null +++ b/org.glite.lb.client-java/Makefile @@ -0,0 +1,15 @@ +-include Makefile.inc + +all compile: + ant -Dno.deps=yes -Dreference.jobid-api-java.jar=${stagedir}/share/java/jobid-api-java.jar -DstageDir=${stagedir} + cd src_c && make PREFIX=${PREFIX} + +install: + mkdir -p ${PREFIX}/share/java + cp dist/lb-client-java.jar ${PREFIX}/share/java + cd src_c && make install PREFIX=${PREFIX} + +clean: + echo TODO + + diff --git a/org.glite.lb.ws-test/Makefile b/org.glite.lb.ws-test/Makefile index 0ea151b..5bf6426 100644 --- a/org.glite.lb.ws-test/Makefile +++ b/org.glite.lb.ws-test/Makefile @@ -1,10 +1,6 @@ -top_srcdir=. +top_srcdir=.. stagedir=. -distdir=. -globalprefix=glite -lbprefix=lb -package=glite-lb-server -version=0.2.0 +version=0.0.0 PREFIX=/opt/glite glite_location=/opt/glite @@ -36,7 +32,7 @@ COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib ${LDFLAGS} GSOAP_FILES_PREFIX:= bk_ws_ -dotless_gsoap_ver:=${shell echo ${gsoap_version} | tr -d . } +dotless_gsoap_ver:=${shell echo ${gsoap_default_version} | tr -d . } GSOAP_LIB:=-L${stagedir}/lib -lglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour} WS_CLIENT_OBJS:= $(GSOAP_FILES_PREFIX)C.o $(GSOAP_FILES_PREFIX)Client.o ws_fault.o diff --git a/org.glite.lb.ws-test/examples/ws_getversion.c b/org.glite.lb.ws-test/examples/ws_getversion.c index dcd3ae7..83a6172 100644 --- a/org.glite.lb.ws-test/examples/ws_getversion.c +++ b/org.glite.lb.ws-test/examples/ws_getversion.c @@ -2,7 +2,7 @@ #include #include "glite/security/glite_gsplugin.h" -#include "glite/lb/consumer.h" +#include "glite/lb/context.h" #include "bk_ws_H.h" #include "ws_fault.h" diff --git a/org.glite.lb.ws-test/examples/ws_jobstat.c b/org.glite.lb.ws-test/examples/ws_jobstat.c index 2336b46..1c83ebb 100644 --- a/org.glite.lb.ws-test/examples/ws_jobstat.c +++ b/org.glite.lb.ws-test/examples/ws_jobstat.c @@ -7,7 +7,7 @@ #include "glite/lb/consumer.h" #include "bk_ws_H.h" -#include "ws_typeref.h" +// #include "ws_typeref.h" #include "ws_fault.h" #if GSOAP_VERSION <= 20602 diff --git a/org.glite.lb/configure b/org.glite.lb/configure index de5507c..e5e12f8 100755 --- a/org.glite.lb/configure +++ b/org.glite.lb/configure @@ -28,9 +28,14 @@ my %extern_prefix = ( lcas => '/opt/glite', ); +my %jar = ( + 'commons-codec' => '/usr/share/java/commons-codec-1.3.jar', +); + my %glite_prefix; my %need_externs; +my %need_jars; my %extrafull; my %extranodmod; my %deps; @@ -58,6 +63,7 @@ for (@nodes) { } push @opts,"with-$_=s",\$extern_prefix{$_} for keys %extern_prefix; +push @opts,"with-$_=s",\$jar{$_} for keys %jar; my @keeparg = @ARGV; @@ -128,11 +134,15 @@ sub mode_build { print "\nBuilding modules: @modules\n"; my @ext = map @{$need_externs{$_}},@modules; + my @myjars = map @{$need_jars{$_}},@modules; undef %aux; @aux{@ext} = 1; @ext = keys %aux; + undef %aux; @aux{@myjars} = (1) x $#myjars; + @myjars = keys %aux; print "\nRequired externals:\n"; print "\t$_: $extern_prefix{$_}\n" for @ext; + print "\t$_: $jar{$_}\n" for @myjars; print "\nThis is a poor-man configure, it's up to you to have sources and externals there\n\n"; mkinc($_) for @modules; @@ -206,6 +216,10 @@ BEGIN{ 'jobid.api-java' => [ qw// ], ); +%need_jars = ( + 'jobid.api-java' => [ qw/commons-codec/ ], +); + %build_only = ( 'security.gsoap-plugin' => [ qw/gsoap/ ], ); @@ -245,7 +259,7 @@ BEGIN{ lbjp-common.trio lbjp-common.maildir lb.client lb.state-machine / ], - 'lb.ws-test' => [ qw/security.gsoap-plugin lb.ws-interface/ ], + 'lb.ws-test' => [ qw/security.gsoap-plugin lb.ws-interface lb.client/ ], 'lb.ws-interface' => [ qw/lb.types/ ], 'lb.types' => [ qw// ], 'lbjp-common.db' => [ qw/lbjp-common.trio/ ], @@ -281,9 +295,9 @@ sub mkinc my %aux; undef %aux; my @m=qw/ -lb.client lb.doc lb.state-machine lb.ws-interface lb.logger lb.types lb.common lb.server lb.utils +lb.client lb.doc lb.state-machine lb.ws-interface lb.logger lb.types lb.common lb.server lb.utils lb.ws-test lb.client-java security.gss security.gsoap-plugin -jobid.api-c jobid.api-cpp +jobid.api-c jobid.api-cpp jobid.api-java lbjp-common.db lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio jp.common/; @aux{@m} = (1) x ($#m+1); @@ -323,6 +337,10 @@ nothrflavour = $nothrflavour print MKINC "${_}_prefix = $extern_prefix{$_}\n" } + for (@{$need_jars{$short}}) { + print MKINC "${_}_jar = $jar{$_}\n" + } + my $need_gsoap = 0; for (@{$need_externs{$short}}) { $need_gsoap = 1 if $_ eq 'gsoap'; } @@ -348,6 +366,7 @@ sub gsoap_version { sub usage { my @ext = keys %extern_prefix; + my @myjars, keys %jar; print STDERR qq{ usage: $0 options @@ -371,6 +390,8 @@ Dependencies: --with-EXTERNAL=PATH where to look for an external. Required externals (not all for all modules) are: @ext + --with-JAR=JAR where to look for jars. Required jars are: + @myjars Summary of what will be used is always printed }; -- 1.8.2.3