X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2FautoMakefile.am.toplevel;h=9806d8d17112dc30947228f946019df5d846dd7c;hp=3547b400b011653c49a04667a3b7d79d70331ab2;hb=5478f5729ee45da557617a5578fb7adea3fa3746;hpb=2f38694f0e7dd171f6b9be0fb205463c0c7f442f diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel index 3547b40..9806d8d 100644 --- a/build/autoMakefile.am.toplevel +++ b/build/autoMakefile.am.toplevel @@ -3,6 +3,10 @@ AUTOMAKE_OPTIONS = foreign +FIND_TAG_FILES_CMD = find $(top_srcdir) \ + -path $(top_srcdir)/ldiskfs/ldiskfs/linux-stage -prune -false -o\ + -type f -name '*.[hc]' + # these empty rules are needed so that automake doesn't add its own # recursive rules etags-recursive: @@ -11,18 +15,37 @@ ctags-recursive: tags-recursive: -TAGS: +TAGS: etags + +tags: ctags etags -tags: - rm -f $(top_srcdir)/TAGS +etags: + $(RM) $(top_srcdir)/TAGS ETAGSF=`etags --version | grep -iq exuberant && \ echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \ - find $(top_srcdir) -name '*.[hc]' |grep -v linux-stage |xargs etags $$ETAGSF -a + $(FIND_TAG_FILES_CMD) | xargs etags $$ETAGSF -a - rm -f $(top_srcdir)/tags +ctags: + $(RM) $(top_srcdir)/tags CTAGSF=`ctags --version | grep -iq exuberant && \ echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \ - find $(top_srcdir) -name '*.[hc]' |grep -v linux-stage |xargs ctags $$CTAGSF -a + $(FIND_TAG_FILES_CMD) | xargs ctags $$CTAGSF -a + +cscope-recursive: + +cscope: + $(RM) $(top_srcdir)/cscope*.out $(top_srcdir)/cscope.files + $(FIND_TAG_FILES_CMD) > cscope.files + cscope -bRq + +mkid: + $(FIND_TAG_FILES_CMD) | xargs mkid + + +doxygen: doxygen-api doxygen-ref + +doxygen-%: build/doxyfile.% + doxygen $< if MODULES sources: all-sources @@ -51,7 +74,7 @@ endif # !LINUX25 modules: $(DEP) all-sources $(MAKE) $(ARCH_UM) CC="$(CC)" -C $(LINUX_OBJ) \ -f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \ - LINUXINCLUDE='$(EXTRA_LNET_INCLUDE) -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -include include/linux/autoconf.h' \ + LINUXINCLUDE='$(EXTRA_LNET_INCLUDE) -I$$(srctree)/arch/$$(SRCARCH)/include -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -include include/linux/autoconf.h' \ $(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \ include/config/MARKER $@ endif # LINUX @@ -59,36 +82,45 @@ endif # LINUX endif # MODULES dist-hook: - rm -f $(distdir)/ldiskfs/*.spec - rm -f $(distdir)/lustre-iokit/*.spec + $(RM) $(distdir)/ldiskfs/*.spec + $(RM) $(distdir)/lustre-iokit/*.spec find $(distdir) -name .deps -o \ -name CVS -o \ -name .svn -o \ + -name .git -o \ -name .#* | xargs rm -rf + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + module-dist-hook EXTRA_DIST = @PACKAGE_TARNAME@.spec \ build/Makefile build/autoMakefile.am.toplevel build/lbuild \ - build/linux-merge-config.awk build/linux-merge-modules.awk \ - build/linux-rhconfig.h build/lmake build/Rules.in \ - build/lustre-kernel-2.4.spec.in build/suse-functions.sh \ - build/suse-post.sh build/suse-postun.sh \ - build/suse-trigger-script.sh.in build/README.kernel-source \ - build/sles8-post.sh build/sles8-postun.sh build/sles8-pre.sh \ - build/sles8-update_INITRD_MODULES.sh \ - build/sles8-update_rcfile_setting.sh build/update_oldconfig \ + build/Rules.in \ + build/update_oldconfig \ build/autoconf/lustre-build-linux.m4 \ - build/autoconf/lustre-build.m4 + build/autoconf/lustre-build-darwin.m4 \ + build/autoconf/lustre-build.m4 build/rdac_spec \ + build/mptlinux.spec.patch build/patches rpms-real: @PACKAGE_TARNAME@.spec dist Makefile - rpmbuild -ta $(distdir).tar.gz + CONFIGURE_ARGS=$$(echo $$(eval echo $(ac_configure_args)) | sed -re 's/--(en|dis)able-tests//'); \ + RPMARGS="--define \"configure_args $$CONFIGURE_ARGS\""; \ + if ! $(BUILD_TESTS); then \ + RPMARGS="$$RPMARGS --define \"build_lustre_tests 0\""; \ + fi; \ + eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz srpm-real: @PACKAGE_TARNAME@.spec dist Makefile - rpmbuild -ts $(distdir).tar.gz + if ! $(BUILD_TESTS); then \ + RPMARGS="--define \"build_lustre_tests 0\""; \ + fi; \ + eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz rpms: for subdir in $(RPM_SUBDIRS) ; do \ echo "Making rpms in $$subdir"; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) rpms); \ + echo "Finished rpms in $$subdir"; \ done; \ $(MAKE) $(AM_MAKEFLAGS) rpms-real @@ -96,6 +128,92 @@ srpm: for subdir in $(RPM_SUBDIRS) ; do \ echo "Making srpm in $$subdir"; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) srpm); \ + echo "Finished srpms in $$subdir"; \ done; \ $(MAKE) $(AM_MAKEFLAGS) srpm-real +# In the debs target, first make sure what's in the changelog reflects +# the software version. Here's how we could dig the version out of the +# autoconf version file directly: +# lversion=$$(sed -ne 's/m4_define(\[LUSTRE_[A-Z][A-Z]*\],\[\([0-9][0-9]*\)\])$$/\1/p' +# lustre/autoconf/lustre-version.ac | tr '\n' '.' | sed -e 's/.$//'); +# +# However, one cannot really run "make debs" without having done a +# configure first, so we could use the easier method of digging the +# version out of the config.h file. +debs: + lversion=$$(sed -ne 's/^#define VERSION "\(.*\)"$$/\1/p' config.h); \ + cversion=$$(sed -ne '1s/^lustre (\(.*\)-[0-9][0-9]*).*$$/\1/p' debian/changelog); \ + if [ "$$lversion" != "$$cversion" ]; then \ + echo -e "1i\nlustre ($$lversion-1) unstable; urgency=low\n\n * Automated changelog entry update\n\n -- Brian J. Murrell $$(date -R)\n\n.\nwq" | ed debian/changelog; \ + fi; \ + if [ -d .git ]; then \ + ver=$$(git describe --match [0-9v]\* --tags); \ + if [[ $$ver = *-*-* ]]; then \ + hash=$${ver##*-}; \ + ffw=$${ver#*-}; \ + ffw=$${ffw%-*}; \ + ver=$${ver%%-*}; \ + fi; \ + if [ $$ffw -gt 0 ]; then \ + tag=$$ver; \ + if [[ $$ver =~ ^v([0-9]+_)+([0-9]+|RC[0-9]+)$$ ]]; then \ + ver=$$(echo $$ver | \ + sed -e 's/^v\(.*\)/\1/' \ + -e 's/_RC[[0-9]].*$$//' \ + -e 's/_/./g'); \ + fi; \ + pdir="debian/patches"; \ + if [ -d $$pdir ]; then \ + rm -rf $$pdir; \ + fi; \ + mkdir $$pdir; \ + git format-patch -o $$pdir $$tag..HEAD; \ + pushd $$pdir; \ + if [ -d ../patched ]; then \ + rm -rf ../patched; \ + fi; \ + mkdir ../patched; \ + rm -f 00list *.dpatch; \ + for file in [0-9][0-9][0-9][0-9]-*.patch; do \ + if ! grep -q "^ debian/changelog" $$file; then \ + desc=$$(cat $$file | sed -e '1,/^$$/d' \ + -e '/^---$$/,$$d'); \ + dpatch_file=$${file/.patch/.dpatch}; \ + sed -e '1,/^---$$/d' $$file | \ + dpatch patch-template -p "$${file%.patch}" \ + "$$desc" > $$dpatch_file; \ + echo "faked by make debs run from git" > \ + ../patched/$$dpatch_file; \ + echo $$dpatch_file >> 00list; \ + fi; \ + rm -f $$file; \ + done; \ + fi; \ + fi + rm -rf debs + dpkg-buildpackage || { \ + rc=$${PIPESTATUS[0]}; \ + [ $${rc} -gt 1 ] && exit $${rc}; \ + exit 0; \ + } + export KPKG_DEST_DIR="$$(pwd)/.." && \ + version=$$(sed -ne '1s/^lustre (\(.*\)).*$$/\1/p' debian/changelog) && \ + rm -rf debian/tmp/modules-deb && \ + mkdir debian/tmp/modules-deb && \ + pushd debian/tmp/modules-deb && \ + dpkg -x ../../../../lustre-source_$${version}_all.deb $$(pwd) && \ + mkdir usr_src/ && \ + tar -C usr_src/ -xjf usr/src/lustre.tar.bz2 && \ + chmod 755 usr_src/modules/lustre/debian/rules && \ + mkdir -p usr_share_modass && \ + ln -s /usr/share/modass/include/ usr_share_modass/ && \ + ln -s /usr/share/modass/packages/ usr_share_modass/ && \ + echo "lustre" > usr_share_modass/compliant.list && \ + export MA_DIR=$$(pwd)/usr_share_modass && \ + KVERS=$${KVERS:-$(LINUXRELEASE)}; \ + m-a build $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre && \ + popd && \ + VER=$$(sed -ne '1s/^lustre (\(.*-[0-9][0-9]*\)).*$$/\1/p' debian/changelog); \ + mkdir -p debs && \ + mv ../liblustre_$${VER}_*.deb ../linux-patch-lustre_$${VER}_all.deb ../lustre-dev_$${VER}_*.deb ../lustre-source_$${VER}_all.deb ../lustre-tests_$${VER}_*.deb ../lustre-utils_$${VER}_*.deb ../lustre_$${VER}.dsc ../lustre_$${VER}_*.changes ../lustre_$${VER}.tar.gz ../lustre-client-modules-$${KVERS}_$${VER}_*.deb debs/