hdt: Release 0.5.2

[profile/ivi/syslinux.git] / Makefile.private

diff --git a/Makefile.private b/Makefile.private
index 2028aba..92127e9 100644 (file)
--- a/Makefile.private
+++ b/Makefile.private
@@ -1,6 +1,6 @@
 ## -*- makefile -*- ------------------------------------------------------
-##   
-##   Copyright 2000-2005 H. Peter Anvin - All Rights Reserved
+##
+##   Copyright 2000-2008 H. Peter Anvin - All Rights Reserved
 ##
 ##   This program is free software; you can redistribute it and/or modify
 ##   it under the terms of the GNU General Public License as published by
@@ -9,7 +9,6 @@
 ##   (at your option) any later version; incorporated herein by reference.
 ##
 ## -----------------------------------------------------------------------
-# $Id$
 
 #
 # This should only be used by the maintainer to generate official binaries
@@ -18,10 +17,13 @@
 #
 .PHONY: official release
 
-PRIVATE = Makefile.private .depend */.depend
+# These files are removed when tarballs are generated.
+PRIVATE = Makefile.private mk/devel.mk
 
 GIT_DIR ?= .git
-ABS_GIT_DIR := $(shell cd '$(GIT_DIR)' && pwd)
+ABS_GIT_DIR := $(shell cd '$(GIT_DIR)' 2>/dev/null && pwd)
+
+-include release/Makefile.secret
 
 isolinux.iso: all
        cp isolinux-debug.bin isolinux-test/isolinux/isolinux.bin
@@ -34,18 +36,19 @@ burn: isolinux.iso
        cdrecord -v blank=fast isolinux.iso
 
 official:
-       $(MAKE) spotless
-       $(MAKE) all DATE=`date +'%Y-%m-%d'`
-       $(MAKE) dist
+       $(MAKE) spotless CC='$(CC) -m32'
+       $(MAKE) all CC='$(CC) -m32'
+       $(MAKE) strip CC='$(CC) -m32'
+       $(MAKE) dist CC='$(CC) -m32'
 
 release:
        test -d release
-       rm -f $(GIT_DIR)/refs/tags/syslinux-$(VERSION)
-       cg-tag syslinux-$(VERSION)
+       git tag -a -m syslinux-$(VERSION) -f syslinux-$(VERSION)
        -rm -rf release/syslinux-$(VERSION)
        -rm -f release/syslinux-$(VERSION).*
        mkdir -p release/syslinux-$(VERSION)
-       cd release && env GIT_DIR='$(ABS_GIT_DIR)' cg-export -r syslinux-$(VERSION) syslinux-$(VERSION)
+       git archive --format=tar syslinux-$(VERSION) | \
+               tar -x -f - -C release/syslinux-$(VERSION)
        find release/syslinux-$(VERSION) \
                \( -name '*~' -or -name '#*' \) -type f -print0 | \
                xargs -0rt rm -f
@@ -53,9 +56,8 @@ release:
                < release/syslinux-$(VERSION)/syslinux.spec.in \
                > release/syslinux-$(VERSION)/syslinux.spec
        rm -f release/syslinux-$(VERSION)/syslinux.spec.in
-       $(MAKE) -C release/syslinux-$(VERSION) spotless
-       $(MAKE) -C release/syslinux-$(VERSION) depend
-       $(MAKE) -C release/syslinux-$(VERSION) official
+       $(MAKE) -C release/syslinux-$(VERSION) official DATE=`date +%Y-%m-%d`
+
        cd release/syslinux-$(VERSION) && rm -rf $(PRIVATE)
        cd release && tar cvvf - syslinux-$(VERSION) | \
                gzip -9 > syslinux-$(VERSION).tar.gz
@@ -70,13 +72,12 @@ RPMPREREL := $(shell $(PERL) -e 'printf "%.2f.%d\n", $(VERSION)-0.01, $(PRERELNO
 
 prerel:
        test -d release
-       rm -f $(GIT_DIR)/refs/tags/syslinux-$(VERSION)
-       cg-tag $(PREREL)
-       mkdir -p $(PRERELDIR) $(PRERELDIR)/uu
+       git tag -a -m $(PREREL) -f $(PREREL)
        -rm -rf $(PRERELDIR)/$(PREREL)
        -rm -f $(PRERELDIR)/$(PREREL).*
        mkdir -p $(PRERELDIR)/$(PREREL)
-       cd $(PRERELDIR) && env GIT_DIR='$(ABS_GIT_DIR)' cg-export -r $(PREREL) $(PREREL)
+       git archive --format=tar $(PREREL) | \
+               tar -x -f - -C $(PRERELDIR)/$(PREREL)
        find $(PRERELDIR)/$(PREREL) \
                \( -name '*~' -or -name '#*' \) -type f -print0 | \
                xargs -0rt rm -f
@@ -85,19 +86,17 @@ prerel:
                < $(PRERELDIR)/$(PREREL)/syslinux.spec.in \
                > $(PRERELDIR)/$(PREREL)/syslinux.spec
        rm -f $(PRERELDIR)/$(PREREL)/syslinux.spec.in
-       $(MAKE) -C $(PRERELDIR)/$(PREREL) spotless
-       $(MAKE) -C $(PRERELDIR)/$(PREREL) depend
-       $(MAKE) -C $(PRERELDIR)/$(PREREL) all DATE=`printf '%s-pre%d          ' $(VERSION) $(PRERELNO) | dd bs=10 count=1 2>/dev/null`
-       $(MAKE) -C $(PRERELDIR)/$(PREREL) dist
+       $(MAKE) -C $(PRERELDIR)/$(PREREL) official DATE=`printf '%s-pre%d          ' $(VERSION) $(PRERELNO) | dd bs=10 count=1 2>/dev/null`
        cd $(PRERELDIR)/$(PREREL) && rm -rf $(PRIVATE)
        cd $(PRERELDIR) && tar cvvf - $(PREREL) | \
-               gzip -9 > $(PREREL).tar.gz 
-       cd $(PRERELDIR) && \
-               uuencode $(PREREL).tar.gz $(PREREL).tar.gz > uu/$(PREREL).uu
+               gzip -9 > $(PREREL).tar.gz
        cd $(PRERELDIR)/$(PREREL) && \
                zip -9r ../$(PREREL).zip *
        expr $(PRERELNO) + 1 > $(PRERELDIR)/.prerel
 
+LATEST_PRERELNO := $(shell expr $(PRERELNO) - 1)
+LATEST_PREREL   := syslinux-$(VERSION)-pre$(LATEST_PRERELNO)
+
 unprerel:
-       expr $(PRERELNO) - 1 > $(PRERELDIR)/.prerel
-       @echo Next release will be syslinux-$(VERSION)-pre`cat $(PRERELDIR)/.prerel`
+       echo $(LATEST_PRERELNO) > $(PRERELDIR)/.prerel
+       @echo Next release will be $(LATEST_PREREL)