From: František Dvořák Date: Tue, 26 Feb 2013 13:39:41 +0000 (+0000) Subject: Build, install and package java doc for gLite jobid and java L&B client. Rename jobid... X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=ab6195fc61668b87d022d8b196d3836b1f18e8e4;p=jra1mw.git Build, install and package java doc for gLite jobid and java L&B client. Rename jobid package on Debian. --- diff --git a/org.glite.jobid.api-java/Makefile b/org.glite.jobid.api-java/Makefile index cc8dedc..0636042 100644 --- a/org.glite.jobid.api-java/Makefile +++ b/org.glite.jobid.api-java/Makefile @@ -17,15 +17,16 @@ SOURCES=\ nbproject/private/*.properties nbproject/private/*.xml \ src/org/glite/jobid/*.java -all compile: +all compile doc: ${ant_prefix}/bin/ant ${ANT_ARGS} stage: $(MAKE) install PREFIX=${stagedir} install: - mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/java + mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/java ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/api cp dist/glite-jobid-api-java.jar ${DESTDIR}${PREFIX}${prefix}/share/java + cp -rp dist/javadoc/* ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/api check: diff --git a/org.glite.jobid.api-java/project/debian.control b/org.glite.jobid.api-java/project/debian.control index a81cd56..b11454e 100644 --- a/org.glite.jobid.api-java/project/debian.control +++ b/org.glite.jobid.api-java/project/debian.control @@ -4,14 +4,24 @@ Maintainer: @MAINTAINER@ Uploaders: @UPLOADERS@ Build-Depends: debhelper (>= 7.0.50~), ant, libcommons-codec-java, default-jdk Standards-Version: 3.9.1 -Section: libs +Section: java Homepage: @URL@ DM-Upload-Allowed: yes @DEBIAN_VCS@ -Package: glite-jobid-api-java -Section: libs +Package: libglite-jobid-api-java +Section: java Architecture: all Depends: libcommons-codec-java, ${misc:Depends} +Replaces: glite-jobid-api-java +Provides: glite-jobid-api-java Description: @SUMMARY@ @DEBIAN_DESCRIPTION@ + +Package: libglite-jobid-api-java-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Suggests: libglite-jobid-api-java, default-jdk-doc +Description: Java API documentation for gLite jobid java library + This package contains java API documentation for gLite jobid java library. diff --git a/org.glite.jobid.api-java/project/debian.libglite-jobid-api-java-doc.doc-base.api b/org.glite.jobid.api-java/project/debian.libglite-jobid-api-java-doc.doc-base.api new file mode 100644 index 0000000..3fcd266 --- /dev/null +++ b/org.glite.jobid.api-java/project/debian.libglite-jobid-api-java-doc.doc-base.api @@ -0,0 +1,8 @@ +Document: libglite-jobid-api-java +Title: Programmer API for gLite jobid java library +Abstract: JAVA implementation of library handling gLite jobid. +Section: Network/Monitoring + +Format: HTML +Index: /usr/share/doc/libglite-jobid-api-java/api/index.html +Files: /usr/share/doc/libglite-jobid-api-java/api/* diff --git a/org.glite.jobid.api-java/project/debian.glite-jobid-api-java.dirs b/org.glite.jobid.api-java/project/debian.libglite-jobid-api-java.dirs similarity index 100% rename from org.glite.jobid.api-java/project/debian.glite-jobid-api-java.dirs rename to org.glite.jobid.api-java/project/debian.libglite-jobid-api-java.dirs diff --git a/org.glite.jobid.api-java/project/debian.glite-jobid-api-java.install b/org.glite.jobid.api-java/project/debian.libglite-jobid-api-java.install similarity index 100% rename from org.glite.jobid.api-java/project/debian.glite-jobid-api-java.install rename to org.glite.jobid.api-java/project/debian.libglite-jobid-api-java.install diff --git a/org.glite.jobid.api-java/project/debian.rules b/org.glite.jobid.api-java/project/debian.rules index 37e1be3..6549350 100644 --- a/org.glite.jobid.api-java/project/debian.rules +++ b/org.glite.jobid.api-java/project/debian.rules @@ -3,6 +3,10 @@ -include /usr/share/dpkg/buildflags.mk +p_base=glite-jobid-api-java +p_lib=libglite-jobid-api-java +p_doc=libglite-jobid-api-java-doc + # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 @@ -36,6 +40,9 @@ install: build-stamp dh_prep dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + mkdir -p debian/$(p_doc)/usr/share/doc + mkdir -p debian/$(p_lib)/usr/share/doc + mv debian/tmp/usr/share/doc/$(p_base)-@MAJOR@.@MINOR@.@REVISION@ debian/$(p_doc)/usr/share/doc/$(p_lib) binary-indep: install dh_testdir diff --git a/org.glite.jobid.api-java/project/glite-jobid-api-java.spec b/org.glite.jobid.api-java/project/glite-jobid-api-java.spec index 4e641d7..77e0396 100644 --- a/org.glite.jobid.api-java/project/glite-jobid-api-java.spec +++ b/org.glite.jobid.api-java/project/glite-jobid-api-java.spec @@ -27,6 +27,9 @@ Summary: Java API documentation for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} Requires: jpackage-utils +%if 0%{?rhel} >= 6 +BuildArch: noarch +%endif %description javadoc This package contains java API documentation for java implementation of gLite @@ -50,8 +53,8 @@ make check rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -rp dist/javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name} +mkdir -p $RPM_BUILD_ROOT%{_javadocdir} +mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/api $RPM_BUILD_ROOT%{_javadocdir}/%{name} %clean diff --git a/org.glite.jobid.api-java/project/package.description b/org.glite.jobid.api-java/project/package.description index 860d7dd..f94d719 100644 --- a/org.glite.jobid.api-java/project/package.description +++ b/org.glite.jobid.api-java/project/package.description @@ -1 +1 @@ -JAVA implementation of handling gLite jobid +JAVA implementation of library handling gLite jobid. diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile index 3c87a8d..ab213ee 100644 --- a/org.glite.lb.client-java/Makefile +++ b/org.glite.lb.client-java/Makefile @@ -34,6 +34,7 @@ VPATH := ${top_srcdir}/src/org/glite/lb ${top_srcdir}/examples ${top_srcdir}/exa JAVAC:=${jdk_prefix}/bin/javac JAVAH:=${jdk_prefix}/bin/javah JAVA:=${jdk_prefix}/bin/java +JAVADOC:=${jdk_prefix}/bin/javadoc GEN:=${stagedir}${prefix}/bin/glite-lb-at3 ${top_srcdir}/project/genEventTypes.pl AT3DIR:=${stagedir}${prefix}/share/glite-lb/at3 @@ -41,7 +42,7 @@ jobid_classpath:=${stagedir}${prefix}/share/java/glite-jobid-api-java.jar axis_classpath:=$(shell ${top_srcdir}/project/list-jars.sh ${axis_prefix}/lib ${axis_prefix}/share/java ${axis_prefix}/share/java/axis /usr/share/java /usr/lib/java /usr/lib/java/axis) trustmanager_classpath:=$(shell ls -1 ${trustmanager_prefix}/share/java/glite-security-trustmanager.jar ${trustmanager_prefix}/share/java/trustmanager.jar ${trustmanager_prefix}/share/java/trustmanager-axis.jar ${stagedir}${prefix}/share/java/trustmanager.jar ${stagedir}${prefix}/share/java/trustmanager-axis.jar 2>/dev/null | tr '\012' :) -all compile: compile-java-axis compile-java-lb compile-java-gen compile-java-lb2 build-jar examples build-c +all compile: compile-java-axis compile-java-lb compile-java-gen compile-java-lb2 build-jar examples doc build-c wtf: echo "axis_classpath: ${axis_classpath}" @@ -118,18 +119,24 @@ genws: build/axis build/axis: ${JAVA} -classpath ${axis_classpath} org.apache.axis.wsdl.WSDL2Java -o build/axis ${stagedir}${prefix}/share/wsdl/glite-lb/LB.wsdl +build/javadoc: build/gen + ${JAVADOC} -d build/javadoc -classpath ${jobid_classpath} src/org/glite/lb/*.java build/gen/*.java examples/*.java examples/*/*.java + check: @echo "No check" stage: $(MAKE) install PREFIX=${stagedir} +doc: build/javadoc + install: - mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/java + mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/java ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/api cp build/glite-lb-client-java.jar ${DESTDIR}${PREFIX}${prefix}/share/java cp build/glite-lb-client-java-axis.jar ${DESTDIR}${PREFIX}${prefix}/share/java cp build/classes/examples/glite-lb-client-java-examples.jar ${DESTDIR}${PREFIX}${prefix}/share/java cd build/c && $(MAKE) install PREFIX=${PREFIX} + cp -rp build/javadoc/* ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/api clean: rm -rf build @@ -138,4 +145,4 @@ clean: distclean: rm -rvf project/changelog Makefile.inc *.spec debian/ -.PHONY: default all compile compile-java-axis compile-java-lb compile-java-gen compile-java-lb2 build-jar build-c examples genevents genws check stage install clean distclean wtf dist distcheck +.PHONY: default all compile compile-java-axis compile-java-lb compile-java-gen compile-java-lb2 build-jar build-c doc examples genevents genws check stage install clean distclean wtf dist distcheck diff --git a/org.glite.lb.client-java/project/debian.control b/org.glite.lb.client-java/project/debian.control index cef50d5..5d663ec 100644 --- a/org.glite.lb.client-java/project/debian.control +++ b/org.glite.lb.client-java/project/debian.control @@ -2,7 +2,7 @@ Source: glite-lb-client-java Priority: extra Maintainer: @MAINTAINER@ Uploaders: @UPLOADERS@ -Build-Depends: debhelper (>= 7.0.50~), ant, default-jdk, emi-trustmanager, emi-trustmanager-axis, glite-jobid-api-java, glite-lb-types, glite-lb-ws-interface, libaxis-java, libcommons-lang-java, libtool +Build-Depends: debhelper (>= 7.0.50~), ant, default-jdk, emi-trustmanager, emi-trustmanager-axis, libglite-jobid-api-java, glite-lb-types, glite-lb-ws-interface, libaxis-java, libcommons-lang-java, libtool Standards-Version: 3.9.1 Section: java Homepage: @URL@ @@ -12,21 +12,29 @@ DM-Upload-Allowed: yes Package: libglite-lb-client-java Section: java Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, glite-jobid-api-java, libcommons-lang-java +Depends: ${misc:Depends}, ${shlibs:Depends}, libglite-jobid-api-java, libcommons-lang-java Description: @SUMMARY@ @DEBIAN_DESCRIPTION@ Package: libglite-lb-client-axis-java Section: java Architecture: all -Depends: ${misc:Depends}, emi-trustmanager-axis, emi-trustmanager, glite-jobid-api-java, libcommons-lang-java, libglite-lb-client-java +Depends: ${misc:Depends}, emi-trustmanager-axis, emi-trustmanager, libglite-jobid-api-java, libcommons-lang-java, libglite-lb-client-java Description: Axis 1.4 flavor of Java L&B client This package contains java L&B client library based on Axis 1.4. Package: glite-lb-client-java-examples Section: java Architecture: all -Depends: ${misc:Depends}, emi-trustmanager-axis, emi-trustmanager, glite-jobid-api-java, libglite-lb-client-java, libglite-lb-client-axis +Depends: ${misc:Depends}, emi-trustmanager-axis, emi-trustmanager, libglite-jobid-api-java, libglite-lb-client-java, libglite-lb-client-axis Description: Java L&B client examples This package contains java L&B client examples for Axis 1.4. For the communication is used trustmanager or pure SSL. + +Package: libglite-lb-client-java-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Suggests: libglite-lb-client-java, default-jdk-doc +Description: Java API documentation for Java L&B client + This package contains java API documentation for Java L&B client. diff --git a/org.glite.lb.client-java/project/debian.libglite-lb-client-java-doc.doc-base.api b/org.glite.lb.client-java/project/debian.libglite-lb-client-java-doc.doc-base.api new file mode 100644 index 0000000..2109137 --- /dev/null +++ b/org.glite.lb.client-java/project/debian.libglite-lb-client-java-doc.doc-base.api @@ -0,0 +1,8 @@ +Document: libglite-lb-client-java +Title: Programmer API for Java L&B service client +Abstract: JAVA implementation of the L&B service client supports producing (logging) events into L&B, event and job status queries, and receiving notifications. +Section: Network/Monitoring + +Format: HTML +Index: /usr/share/doc/libglite-lb-client-java/api/index.html +Files: /usr/share/doc/libglite-lb-client-java/api/* diff --git a/org.glite.lb.client-java/project/debian.rules b/org.glite.lb.client-java/project/debian.rules index 035e595..d58c694 100644 --- a/org.glite.lb.client-java/project/debian.rules +++ b/org.glite.lb.client-java/project/debian.rules @@ -3,8 +3,10 @@ -include /usr/share/dpkg/buildflags.mk +p_base=glite-lb-client-java p_lib=libglite-lb-client-java p_axis=libglite-lb-client-axis-java +p_doc=libglite-lb-client-java-doc p_examples=glite-lb-client-java-examples # Uncomment this to turn on verbose mode. @@ -41,7 +43,10 @@ install: build-stamp dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp mkdir -p debian/$(p_axis)/usr/share/doc + mkdir -p debian/$(p_doc)/usr/share/doc mkdir -p debian/$(p_examples)/usr/share/doc + mkdir -p debian/$(p_lib)/usr/share/doc + mv debian/tmp/usr/share/doc/$(p_base)-@MAJOR@.@MINOR@.@REVISION@ debian/$(p_doc)/usr/share/doc/$(p_lib) ln -s $(p_lib) debian/$(p_axis)/usr/share/doc/$(p_axis) ln -s $(p_lib) debian/$(p_examples)/usr/share/doc/$(p_examples) rm -vf debian/tmp/usr/lib/*.la diff --git a/org.glite.lb.client-java/project/glite-lb-client-java.spec b/org.glite.lb.client-java/project/glite-lb-client-java.spec index 758feb2..2bc7226 100644 --- a/org.glite.lb.client-java/project/glite-lb-client-java.spec +++ b/org.glite.lb.client-java/project/glite-lb-client-java.spec @@ -69,6 +69,20 @@ This package contains java L&B client examples for Axis 1.4. For the communication is used trustmanager or pure SSL. +%package javadoc +Summary: Java API documentation for %{name} +Group: Documentation +Requires: %{name} = %{version}-%{release} +Requires: jpackage-utils +%if 0%{?rhel} >= 6 +BuildArch: noarch +%endif + +%description javadoc +This package contains java API documentation for java implementation of gLite +L&B client. + + %prep %setup -q @@ -86,6 +100,9 @@ CFLAGS="%{?optflags}" LDFLAGS="%{?__global_ldflags}" make check rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_javadocdir} +mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/api $RPM_BUILD_ROOT%{_javadocdir}/%{name} +rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \; find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \; find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH' @@ -117,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_javadir}/%{name}-examples.jar +%files javadoc +%defattr(-,root,root) +%{_javadocdir}/%{name} %changelog * @SPEC_DATE@ @MAINTAINER@ - @MAJOR@.@MINOR@.@REVISION@-@AGE@