From: František Dvořák <valtri@civ.zcu.cz>
Date: Tue, 3 Nov 2009 20:11:47 +0000 (+0000)
Subject: New module for build.
X-Git-Tag: glite-security-gss_R_2_0_1_1~20
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=3da8b525f5a85d626f922fcc10defe7d77d766fb;p=jra1mw.git

New module for build.
---

diff --git a/org.glite.lb.harvester/Makefile b/org.glite.lb.harvester/Makefile
index ca4eb31..5431f1a 100644
--- a/org.glite.lb.harvester/Makefile
+++ b/org.glite.lb.harvester/Makefile
@@ -1,7 +1,7 @@
 top_srcdir=..
 stagedir=.
 package=glite-lb-harvester
-version=0.0.0
+module.version=0.0.0
 PREFIX=/opt/glite
 
 archlib:=lib
@@ -14,6 +14,7 @@ endif
 
 -include Makefile.inc
 -include ../project/version.properties
+version:=${module.version}
 
 CC=gcc
 VPATH=${top_srcdir}/src
@@ -45,9 +46,9 @@ stage: compile
 	$(MAKE) install PREFIX=${stagedir}
 
 install: compile
-	-mkdir -p ${PREFIX}/bin ${PREFIX}/doc/${package}
+	-mkdir -p ${PREFIX}/bin ${PREFIX}/share/doc/${package}-${version}
 	${INSTALL} -m 755 harvester ${PREFIX}/bin/glite-lb-harvester
-	${INSTALL} -m 444 README ${PREFIX}/doc/${package}
+	${INSTALL} -m 444 ../doc/README ${PREFIX}/share/doc/${package}-${version}
 
 clean:
 	rm -rfv *.o *.lo .libs/ harvester harvester-dbg
diff --git a/org.glite.lb.harvester/project/glite-lb-harvester.spec b/org.glite.lb.harvester/project/glite-lb-harvester.spec
deleted file mode 100644
index 178eb28..0000000
--- a/org.glite.lb.harvester/project/glite-lb-harvester.spec
+++ /dev/null
@@ -1,36 +0,0 @@
-Summary: Enhanced L&B notification client.
-Name: glite-lb-harvester
-Version: 1.0
-Release: 1
-License: Unknown
-Group: Unknown
-Source: harvester.tar.gz
-URL: http://lindir.ics.muni.cz/dg_public/cvsweb.cgi/rtm/
-Vendor: CESNET
-Packager: František Dvořák <valtri@civ.zcu.cz>
-Prefix: /opt/glite
-BuildRoot: /tmp/rpm-harvester-root
-Requires: postgresql-libs glite-jobid-api-c glite-lbjp-common-trio glite-lb-common glite-lb-client
-BuildRequires: postgresql-devel
-
-%description
-L&B Harvester gathers information about jobs from L&B servers using effective L&B notification mechanism. It manages notifications and keeps them in a persistent storage (file or database table) to reuse later on next launch. It takes care about refreshing notifications and queries L&B servers back when some notification expires.
-
-The tool was initially written for Real Time Monitor (project at Imperial College in London), later was extended with messaging mechanism for WLCG.
-
-%prep
-%setup -n harvester
-
-%build
-make PREFIX=%{prefix}
-
-%install
-make install PREFIX="${RPM_BUILD_ROOT}%{prefix}"
-
-%clean
-[ -n "${RPM_BUILD_ROOT}" -a "${RPM_BUILD_ROOT}" != "/" ] && rm -rf "${RPM_BUILD_ROOT}"
-
-%files
-%dir %{prefix}/doc/glite-lb-harvester
-%{prefix}/doc/glite-lb-harvester/README
-%{prefix}/bin/glite-lb-harvester
diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index d1f8c4f..ff59db3 100755
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -27,7 +27,7 @@ my $jp_tag = '';
 my $sec_tag = '';
 my $jobid_tag = '';
 
-my @nodes = qw/client server logger utils client-java doc ws-test db jpprimary jpindex jpclient/;
+my @nodes = qw/client server logger utils client-java doc ws-test db jpprimary jpindex jpclient harvester/;
 my %enable_nodes;
 my %disable_nodes;
 
@@ -69,7 +69,7 @@ my %deps_type;
 my %topbuild;
 
 my %lbmodules = (
-	'lb' => [ qw/client client-java common doc logger server state-machine types utils ws-interface ws-test/], 
+	'lb' => [ qw/client client-java common doc logger server state-machine types utils ws-interface ws-test harvester/], 
 	'security' => [qw/gss gsoap-plugin/],
 	'lbjp-common' => [qw/db log maildir server-bones trio jp-interface/],
 	'jobid' => [qw/api-c api-cpp api-java/],
@@ -304,6 +304,7 @@ BEGIN{
 	'lb.ws-interface' => [],
 	'lb.ws-test' => [ qw/gsoap:B/ ],
 	'lb.types' => [ qw// ],
+	'lb.harvester' => [ qw/postgresql:R/ ],
 	'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ],
 	'lbjp-common.log' => [ qw// ],
 	'lbjp-common.maildir' => [ qw// ],
@@ -383,6 +384,7 @@ for my $jar (keys %need_jars) {
 	'lb.ws-test' => [ qw/security.gsoap-plugin lb.ws-interface/ ],
 	'lb.ws-interface' => [ qw/lb.types:B/ ],
 	'lb.types' => [ qw// ],
+	'lb.harvester' => [ qw/jobid.api-c lbjp-common.trio lbjp-common.db lb.common lb.client/ ],
 	'lbjp-common.db' => [ qw/lbjp-common.trio/ ],
 	'lbjp-common.maildir' => [ qw// ],
 	'lbjp-common.server-bones' => [ qw// ],
@@ -455,7 +457,7 @@ 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.ws-test lb.client-java
+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 lb.harvester
 security.gss security.gsoap-plugin
 jobid.api-c jobid.api-cpp jobid.api-java
 lbjp-common.db lbjp-common.log lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface