Update of /cvsroot/mhonarc/mhonarc/MHonArc
In directory subversions:/tmp/cvs-serv32696
Modified Files:
dev.mk
Log Message:
Auto-generate RPM bundle along with other bundles.
Index: dev.mk
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/dev.mk,v
retrieving revision 2.7
retrieving revision 2.8
diff -C2 -r2.7 -r2.8
*** dev.mk 19 May 2003 09:37:12 -0000 2.7
--- dev.mk 20 Jul 2003 03:26:59 -0000 2.8
***************
*** 6,12 ****
.PHONY: release code-check version-check \
release-prep installation-doc pod2man relnotes autodoc \
! bugs clean clean_local distclean
! TOP = .
SUBDIRS = \
lib \
--- 6,12 ----
.PHONY: release code-check version-check \
release-prep installation-doc pod2man relnotes autodoc \
! bugs clean clean_local distclean create-bundles test-release
! TOP = $(shell pwd)
SUBDIRS = \
lib \
***************
*** 17,24 ****
##-----------------------------------------------------------------------##
! TAR_EXCLUDE = ./etc/tar-exclude
! DIST_DIR = ./dist
! INSTALL_ME = $(PROJECTS_RELEASES)/install.me/latest/install.me
! VERSION_NAME = MHonArc$(_RELEASE_VERSION)
PRGS = mhonarc mha-dbrecover mha-dbedit mha-decode
--- 17,36 ----
##-----------------------------------------------------------------------##
! ifeq ($(_RELEASE_VERSION),)
! _RELEASE_VERSION = $(shell date -u +"%Y%m%d")
! endif
! RPM_VERSION = $(subst -,,$(subst snap,,$(_RELEASE_VERSION)))
! RPM_RELEASE = 1
!
! TAR_EXCLUDE = $(TOP)/etc/tar-exclude
! DIST_DIR = $(TOP)/dist
!
! ifeq ($(INSTALL_ME),)
! INSTALL_ME = $(PROJECTS_RELEASES)/install.me/latest/install.me
! endif
!
! VERSION_NAME = MHonArc-$(_RELEASE_VERSION)
! EPM_LIST_FILE = $(TOP)/etc/mhonarc.list
! RPM_SPEC_FILE = $(TOP)/etc/MHonArc.spec
PRGS = mhonarc mha-dbrecover mha-dbedit mha-decode
***************
*** 30,36 ****
##-----------------------------------------------------------------------##
default: code-check
! release: version-check code-check
@$(RM) -rf $(DIST_DIR)
-(_at_)$(MKDIR) -p $(DIST_DIR)/$(VERSION_NAME)
--- 42,59 ----
##-----------------------------------------------------------------------##
+
default: code-check
! # Perform a release
! release: version-check code-check create-bundles
!
! # Do a release without doing a version check
! release-dev: code-check create-bundles
!
! # Create all bundles
! create-bundles: bundle-init tar-bundles rpm-bundle tar-nodoc-bundles
!
! # Initialization steps for creating bundles
! bundle-init:
@$(RM) -rf $(DIST_DIR)
-(_at_)$(MKDIR) -p $(DIST_DIR)/$(VERSION_NAME)
***************
*** 46,49 ****
--- 69,98 ----
`$(FIND) $(DIST_DIR)/$(VERSION_NAME) -name '_helper'` \
`$(FIND) $(DIST_DIR)/$(VERSION_NAME) -name 'Makefile'`
+
+ rpm-bundle:
+ @echo "Creating rpm..."
+ @$(RM) -rf $(DIST_DIR)/rpmbuild
+ $(MKDIR) -p $(DIST_DIR)/rpmbuild/BUILD \
+ $(DIST_DIR)/rpmbuild/SOURCES\
+ $(DIST_DIR)/rpmbuild/SPECS\
+ $(DIST_DIR)/rpmbuild/SRPMS\
+ $(DIST_DIR)/rpmbuild/RPMS\
+ $(DIST_DIR)/rpmbuild/RPMS/noarch \
+ $(DIST_DIR)/rpmbuild/buildroot
+
+ $(CP) $(RPM_SPEC_FILE) $(DIST_DIR)/rpmbuild/SPECS
+ (cd $(DIST_DIR)/rpmbuild/SOURCES && \
+ $(LN) -s ../../$(VERSION_NAME).tar.gz)
+
+ @(cd $(DIST_DIR)/rpmbuild && \
+ $(RPMBUILD) --define='_topdir $(DIST_DIR)/rpmbuild' \
+ --define='version $(RPM_VERSION)' \
+ --define='release $(RPM_RELEASE)' \
+ --buildroot $(DIST_DIR)/rpmbuild/buildroot \
+ -bb SPECS/MHonArc.spec)
+ $(MV) $(DIST_DIR)/rpmbuild/RPMS/noarch/*.rpm $(DIST_DIR)
+ @$(RM) -rf $(DIST_DIR)/rpmbuild
+
+ tar-bundles:
@(echo "Creating tar bundles..." && \
cd $(DIST_DIR) && \
***************
*** 57,60 ****
--- 106,110 ----
$(ZIP) -r $(VERSION_NAME).zip $(VERSION_NAME))
+ tar-nodoc-bundles:
$(MV) $(DIST_DIR)/$(VERSION_NAME) $(DIST_DIR)/$(VERSION_NAME)-nodoc
@$(RM) -rf $(DIST_DIR)/$(VERSION_NAME)-nodoc/doc
---------------------------------------------------------------------
To sign-off this list, send email to majordomo(_at_)mhonarc(_dot_)org with the
message text UNSUBSCRIBE MHONARC-DEV