X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=d7a985d7b83983213c18a60c33fac40f2be7c6b0;hp=e3b21ec59afa5b0283461c2c3c0b1559dfc5ec53;hb=5fa30e9c838ec797b5ac1886ef0e2337b0134836;hpb=f82b06d9dd4c8a25437659dff457c8c60a529f32 diff --git a/GNUmakefile.in b/GNUmakefile.in index e3b21ec5..d7a985d7 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,9 +1,9 @@ # Note: GNUmakefile is built automatically from GNUmakefile.in # -# $Id: GNUmakefile.in,v 1.236 2016/03/17 10:40:53 fabiankeil Exp $ +# $Id: GNUmakefile.in,v 1.250 2016/05/08 12:46:05 fabiankeil Exp $ # -# Written by and Copyright (C) 2001-2014 members of the -# Privoxy team. http://www.privoxy.org/ +# Written by and Copyright (C) 2001-2016 members of the +# Privoxy team. https://www.privoxy.org/ # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -162,20 +162,24 @@ SOURCE_FORGE_NAME = '' ############################################################################# TAR_ARCH = /tmp/privoxy-$(VERSION).tar.gz +GEN_DIST_TAR_NAME = privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS).tar ############################################################################# # We include these files in our distributions ############################################################################# -CONFIGS = config trust default.action match-all.action user.action default.filter user.filter +CONFIGS = config trust default.action match-all.action \ + user.action default.filter user.filter \ + regression-tests.action + # take care that no CVS .cvsignore or other crappy files # are included here # and escape every '#' in the find. doh. CONFIG_FILES = $(CONFIGS) \ - `find templates/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS"` + `find templates/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS" | sort` DOC_FILES = AUTHORS LICENSE README ChangeLog INSTALL \ - `find doc/webserver/ -name "*.html" | grep -v "\(webserver\|team\)\/index\.html"` \ - `find doc/webserver/ -name "*.css"` \ + `find doc/webserver/ -name "*.html" | grep -v "\(webserver\|team\)\/index\.html" | sort` \ + `find doc/webserver/ -name "*.css" | sort` \ $(MAN_PAGE) ############################################################################# @@ -326,8 +330,8 @@ dist-check: # create tar.gz from CVS: # This make-target is usually called through 'create-archive'. If you # run 'make create-snapshot' without setting SNAPVERSION, you'll get a -# tar.gz with the current date in the name and as a releasenumber in the -# spec-file. But the main usage is to run it as follows (Red Hat example): +# tar.gz with the current date in the name. +# The main usage is to run it as follows (Red Hat example): # make SNAPVERSION=1.6x create-snapshot # This creates a tar.gz. ############################################################################# @@ -361,25 +365,27 @@ gen-dist: dist-check @$(ECHO) "" $(MAKE) $(PROGRAM) $(STRIP_PROG) $(PROGRAM) - $(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS) + $(LN) -s `pwd` ../privoxy-$(VERSION)-$(CODE_STATUS) # add program - (cd .. && $(TAR) -cvhf --exclude "PACKAGERS" privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$(PROGRAM)) + (cd .. && $(TAR) --exclude "PACKAGERS" -cvhf $(GEN_DIST_TAR_NAME) privoxy-$(VERSION)-$(CODE_STATUS)/$(PROGRAM)) # add config files for foo in $(CONFIG_FILES); do \ - (cd .. && $(TAR) -uvhf --exclude "PACKAGERS" privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \ + (cd .. && $(TAR) --exclude "PACKAGERS" -uvhf $(GEN_DIST_TAR_NAME) privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \ done; # add documentation for foo in $(DOC_FILES); do \ - (cd .. && $(TAR) -uvhf --exclude "PACKAGERS" privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \ + (cd .. && $(TAR) --exclude "PACKAGERS" -uvhf $(GEN_DIST_TAR_NAME) privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \ done; +# add tools + (cd .. && $(TAR) -uvhf $(GEN_DIST_TAR_NAME) privoxy-$(VERSION)-$(CODE_STATUS)/tools) # and zip the archive $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS) - $(GZIP_PROG) ../privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar + $(GZIP_PROG) ../$(GEN_DIST_TAR_NAME) @$(ECHO) Distribution with binary created. # anonymously ncftps the package to sourceforge gen-upload: - ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming ../privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar.gz + ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming ../$(GEN_DIST_TAR_NAME).gz @$(ECHO) ------------------------------------------------------- @$(ECHO) Now goto @$(ECHO) https://sourceforge.net/project/admin/editpackages.php?group_id=11118 @@ -388,7 +394,7 @@ gen-upload: # use with care gen-clean: - $(RM) privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar* + $(RM) ../$(GEN_DIST_TAR_NAME)* ############################################################################# # Tarball distribution: No CVS dirs, dotfiles, debian build dir, @@ -396,11 +402,11 @@ gen-clean: ############################################################################# tarball-dist: dist-check clean clobber - $(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS) + $(LN) -s `pwd` ../privoxy-$(VERSION)-$(CODE_STATUS) for i in `find . -type f -a -not \( -path "*/CVS*" -o -name ".*" \ -o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" -o \ - -name "PACKAGERS" \)`; do \ + -name "PACKAGERS" -o -path "*.git/*" \) | sort`; do \ files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \ done && \ cd .. && $(TAR) -cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \ @@ -518,7 +524,10 @@ dok-webserver: $(PERL) -pi.bak -e 's/..\/p_doc.css/p_doc.css/;\ s/<\/HEAD/\n<\/HEAD/;\ s/\.\d\. //;\ - s/__copy/©/'\ + s/__copy/©/;\ + s@(\1@; s@(ChameleonJohn Coupons@' \ doc/webserver/index.html && $(RM) doc/webserver/*.bak # privoxy-index.html for local documentation: @@ -722,8 +731,8 @@ $(PROGRAM): $(OBJS) $(W32_FILES) clean: $(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action \ config.base config.tmp \ - `find . \( -name TAGS -o -name tags \) -and -not -path "./.git/refs/tags"` \ - `find . -name "*.orig" -a -not -name rc.privoxy.orig` + `find . \( -name TAGS -o -name tags \) -a -not -path "./.git/*"` \ + `find . -name "*.orig" -a -not -name rc.privoxy.orig -a -not -path "./.git/*"` clean-editor-files: $(RM) `find . -name "*~"`