From: František Dvořák Date: Tue, 26 Jun 2012 14:29:42 +0000 (+0000) Subject: Simplified source tarball and packages distribution ("ETICS-less releases"): X-Git-Tag: gridsite-core_R_1_7_22~58 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=70bcdf8eae65e80f6800b804e2608c14659b36ee;p=jra1mw.git Simplified source tarball and packages distribution ("ETICS-less releases"): - list of the source files - using ${package} and ${version} in each module's Makefile - clean distribution files in 'clean' - update .PHONY targets - removed old dist, distsrc and distbin targets --- diff --git a/org.glite.px.emi-px/Makefile b/org.glite.px.emi-px/Makefile index c3f4183..68a9472 100644 --- a/org.glite.px.emi-px/Makefile +++ b/org.glite.px.emi-px/Makefile @@ -6,7 +6,11 @@ PREFIX=/opt/glite prefix= -include Makefile.inc --include ../project/version.properties +-include ${top_srcdir}/project/version.properties + +version=${module.version} + +SOURCES=Makefile default all: @@ -18,8 +22,9 @@ stage: check: clean: + rm -rvf dist ${package}-*.tar.gz distclean: rm -rvf Makefile.inc *.spec debian/ -.PHONY: default all check install stage clean distclean +.PHONY: default all check install stage clean distclean dist distcheck diff --git a/org.glite.px.glite-PX/Makefile b/org.glite.px.glite-PX/Makefile index fad7803..b028323 100644 --- a/org.glite.px.glite-PX/Makefile +++ b/org.glite.px.glite-PX/Makefile @@ -8,6 +8,10 @@ prefix= -include Makefile.inc -include ../project/version.properties +version=${module.version} + +SOURCES=Makefile + default all: install: @@ -18,8 +22,9 @@ stage: check: clean: + rm -rvf dist ${package}-*.tar.gz distclean: rm -rvf Makefile.inc *.spec debian/ -.PHONY: default all check install stage clean distclean +.PHONY: default all check install stage clean distclean dist distcheck diff --git a/org.glite.px.myproxy-yaim/Makefile b/org.glite.px.myproxy-yaim/Makefile index ad86914..3503a2b 100644 --- a/org.glite.px.myproxy-yaim/Makefile +++ b/org.glite.px.myproxy-yaim/Makefile @@ -7,13 +7,22 @@ yaim_prefix= sysconfdir=/opt/glite/etc -include Makefile.inc --include ../project/version.properties +-include ${top_srcdir}/project/version.properties + +version=${module.version} yaim_prefix=/opt/glite ifeq (${project},emi) yaim_project=/emi endif +SOURCES=\ + config/defaults/glite-px.pre \ + config/functions/* config/functions/emi/* \ + config/man/*.1 \ + config/node-info.d/emi/glite-px* config/node-info.d/glite-px* \ + config/services/glite-px \ + Makefile FILES=glite-px.pre LICENSE COPYRIGHT node-version arch service update all ${FILES}: @@ -26,7 +35,7 @@ all ${FILES}: # metapackage files echo -e "${gLiteCopyrightText}\n\n${gLiteLicenseText}" > LICENSE cp LICENSE COPYRIGHT - echo ${module.version}-${module.age} > node-version + echo ${version}-${module.age} > node-version echo ${platformArch} > arch echo "NA" > service echo "NA" > update @@ -44,7 +53,7 @@ install: ${FILES} install -m 0644 $(top_srcdir)/config/functions${yaim_project}/config_info_service_px ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/functions install -m 0644 ${top_srcdir}/config/node-info.d${yaim_project}/glite-px ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/node-info.d; \ install -m 0644 glite-px.pre ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/defaults - echo "$(package) $(module.version)-$(module.age)" > ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/etc/versions/$(package) + echo "$(package) $(version)-$(module.age)" > ${DESTDIR}${PREFIX}${yaim_prefix}/yaim/etc/versions/$(package) mkdir -p ${DESTDIR}${PREFIX}${yaim_prefix}/release/glite-PX cp -fp LICENSE COPYRIGHT node-version arch service update ${DESTDIR}${PREFIX}${yaim_prefix}/release/glite-PX/ @@ -55,8 +64,9 @@ check: clean: rm -rvf ${FILES} + rm -rvf dist ${package}-*.tar.gz distclean: rm -rvf Makefile.inc *.spec debian/ -.PHONY: default all check install stage clean +.PHONY: default all check install stage clean distclean dist distcheck diff --git a/org.glite.px.proxyrenewal/Makefile b/org.glite.px.proxyrenewal/Makefile index 9de1b85..02e9c97 100644 --- a/org.glite.px.proxyrenewal/Makefile +++ b/org.glite.px.proxyrenewal/Makefile @@ -41,6 +41,14 @@ version=${module.version} VPATH:=${top_srcdir}/src:${top_srcdir}/examples +SOURCES=\ + config/startup \ + examples/*.c interface/*.h \ + project/.post* project/.pre* project/doc_proxyrenewal.pl \ + src/*.1 src/*.8 src/*.c src/*.h \ + LICENSE Makefile README +SOURCES_EXEC=config/startup project/doc_proxyrenewal.pl + GLOBUS_NOTHR_INC:= -I${globus_prefix}/include/${nothrflavour} GLOBUS_THR_INC:= -I${globus_prefix}/include/${thrflavour} GLOBUS_NOTHR_LIBS:=-L${globus_prefix}/lib \ @@ -179,19 +187,6 @@ check: examples: ${EXAMPLES} -dist: distsrc distbin - -distsrc: - mkdir -p ${top_srcdir}/${package}-${version} - cd ${top_srcdir} && GLOBIGNORE="${package}-${version}" && cp -Rf * ${package}-${version} - cd ${top_srcdir} && tar -czf ${distdir}/${package}-${version}_src.tar.gz --exclude-from=project/tar_exclude ${package}-${version} - rm -rf ${top_srcdir}/${package}-${version} - -distbin: - $(MAKE) install PREFIX=`pwd`/tmpbuilddir - cd tmpbuilddir && tar -czf ../${top_srcdir}/${distdir}/${package}-${version}_bin.tar.gz * - rm -rf tmpbuilddir - install: -mkdir -p ${DESTDIR}${PREFIX}${prefix}/bin ${DESTDIR}${PREFIX}${prefix}/${libdir} ${DESTDIR}${PREFIX}${prefix}/include/glite/security/proxyrenewal ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} ${DESTDIR}${PREFIX}${sysconfdir}/init.d ${DESTDIR}${PREFIX}${prefix}/share/man/man1 ${DESTDIR}${PREFIX}${prefix}/share/man/man8 ${INSTALL} -m 755 ${lib_LTLIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir} @@ -206,8 +201,9 @@ clean: $(RM) ${lib_LTLIBRARIES} $(DAEMON) $(CLIENT) $(EXAMPLES) *.o *.lo core startup $(RM) ${MAN1_GZ} ${MAN8_GZ} $(RM) -rf .libs + $(RM) -rvf dist ${package}-*.tar.gz distclean: rm -rvf Makefile.inc *.spec debian/ -.PHONY: default all compile examples check stage dist distsrc distbin install clean distclean +.PHONY: default all compile examples check stage install clean distclean dist distcheck