X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=5ba88eb850f89818a4d1fb0b413874eb3b3f7d54;hp=99a9e67e3749dab3669cdda4b5ed363c913e8b29;hb=f9f4fc05cd99f78e3002a378578924fa873dcfeb;hpb=5c6e6e02171bc7ab75e626d97e4deba5c4c322ad diff --git a/GNUmakefile.in b/GNUmakefile.in index 99a9e67e..5ba88eb8 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,8 +1,8 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.217 2013/01/25 14:17:15 fabiankeil Exp $ +# $Id: GNUmakefile.in,v 1.231 2015/12/27 12:50:57 fabiankeil Exp $ # -# Written by and Copyright (C) 2001-2013 members of the +# Written by and Copyright (C) 2001-2014 members of the # Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written @@ -144,14 +144,9 @@ DOC_DIR = doc/source DOC_TMP = $(DOC_DIR)/tmp DOC_STATUS = @DOC_STATUS@ TIDY = tidy -modify -indent -wrap 78 --tidy-mark no +RSYNC = rsync -av # Program to do LF->CRLF -# -# The sed version should be the most portable, but it doesn't for for me, -# the other two do. FIXME. -# - Jon -#DOSFILTER = $(SED) -e $$'s,$$,\r,' -#DOSFILTER = gawk -v ORS='\r\n' '{print $0;}' DOSFILTER = $(PERL) -p -e 's/\n/\r\n/' CVSROOT = :pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa #TMPDIR := $(shell mktemp -d /tmp/$(PROGRAM).XXXXXX) @@ -159,6 +154,8 @@ CVSROOT = :pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa # change this to "ssh -l sf-username" SSH = ssh WWW_ROOT = /home/project-web/ijbswa +# SourceForge login name used by the 'sf-shell' target (optional) +SOURCE_FORGE_NAME = '' ############################################################################# # Setup for make distribution for now. @@ -560,25 +557,11 @@ dok-release: fi; $(RM) -r doc/source/*bak doc/source/*/*bak; -# Create release announcement in text and html, with short and long versions. -# This is a standalone target, and must be invoked directly. -# announce: dok-release -# mkdir -p $(DOC_TMP) -# cd $(DOC_TMP) && cp -f ../announce.sgml . && $(DB) -iannounce-big announce.sgml &&\ -# mv -f index.html announce.html && $(W3M_DUMP) announce.html > announce.txt -# cd $(DOC_TMP) && $(DB) announce.sgml &&\ -# mv -f index.html announce-mini.html && $(W3M_DUMP) announce-mini.html > announce-mini.txt &&\ -# mv -f *html *txt ../../.. -# rm -fr $(DOC_TMP) - # The main Privoxy config file, generated from sgml sources. # NOTE: This will require some hand editing. -config-file: dok-release - cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > __tmp.html &&\ - $(W3M_DUMP) -cols 67 __tmp.html > ../../config && $(RM) __tmp.* - $(PERL) -i.bak utils/prepare-configfile.pl config +config-file: dok-release generate-config-file - $(RM) *.bak + $(RM) config.bak config.html @$(ECHO) "****************************************************" @$(ECHO) "The config file has been optimistically updated" @$(ECHO) "Now -- you may need to hand edit the results!" @@ -588,14 +571,10 @@ config-file: dok-release @$(ECHO) "might have gotten hammered." @$(ECHO) "****************************************************" -# config file, alternate version using lynx (perl stuff unfinished). Lynx -# does not do so good a job. -config-file-alt: - cd doc/source && $(ECHO) -e ".h2 JUSTIFY\\nJUSTIFY:FALSE" > __tmp.lynx_cfg &&\ - $(DB)-notoc -iconfig-file -V nochunks config.sgml > __tmp.html &&\ - lynx -cfg=__tmp.lynx_cfg -width=78 -dump __tmp.html > ../../config.new && $(RM) -r __tmp.* - $(PERL) -pi -e 's/^( )//;\ - s/:$\/:\n/' config.new +generate-config-file: + cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > ../../config.html + $(W3M_DUMP) -cols 67 config.html > config + $(PERL) -i.bak utils/prepare-configfile.pl config ############################################################################# # @@ -604,6 +583,12 @@ config-file-alt: # moves dokumentation to webserver # ############################################################################# +sf-shell: + @sf_name=$(SOURCE_FORGE_NAME); \ + [ -n "$${sf_name}" ] || read -p "Enter SourceForge username: " sf_name || exit 1; \ + echo "Opening shell for $${sf_name} ..."; \ + ssh -t $${sf_name},ijbswa@shell.sourceforge.net create + webserver: clean-editor-files @$(ECHO) ------------------------------------------------------- @$(ECHO) You will need to "create" a SF shell first: @@ -629,40 +614,32 @@ webserver: clean-editor-files @$(SSH) shell.sourceforge.net 'chmod -R 775 $(WWW_ROOT)/htdocs 2>/dev/null; true' @$(SSH) shell.sourceforge.net 'find $(WWW_ROOT)/htdocs/ -type f | xargs chmod 664 2>/dev/null; true' -web-actions: clean-editor-files - @$(ECHO) Uploading - @cd doc/webserver/actions; \ - upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \ - $(TAR) cf - $$upload | $(SSH) ijbswa.sourceforge.net 'cd $(WWW_ROOT)/htdocs/actions; tar xvm' +web-actions: + @$(ECHO) Updating the actions on the webserver ... + @$(RSYNC) doc/webserver/actions/*.php shell.sourceforge.net:$(WWW_ROOT)/htdocs/actions + @$(ECHO) Enforcing reasonable permissions ... + @$(SSH) shell.sourceforge.net 'find $(WWW_ROOT)/htdocs/actions/ -type f | xargs chmod 664 2>/dev/null' - @$(ECHO) Fixing permissions - @$(SSH) ijbswa.sourceforge.net 'find $(WWW_ROOT)/htdocs/actions/ -type f | xargs chmod 664 2>/dev/null' - @$(SSH) ijbswa.sourceforge.net 'chmod 666 $(WWW_ROOT)/htdocs/actions/results/actions-feedback.txt 2>/dev/null' - -## -dok-put: - tar --exclude ".cvsignore" --exclude "CVS" --exclude "source" --exclude ".htaccess" \ - --exclude "obsolete" --exclude "actions" --exclude "*.zip" --exclude "robots.txt"\ - doc/* INSTALL LICENSE AUTHORS README \ - -czf $(DOC_FILE) ;\ - $(ECHO) "Uploading doc package ..." ;\ - scp $(DOC_FILE) ijbswa.sourceforge.net:$(WWW_ROOT)/htdocs/docs/ - @$(SSH) ijbswa.sourceforge.net 'chmod 775 $(WWW_ROOT)/htdocs/docs/*gz 2>/dev/null; true' - $(RM) $(DOC_FILE) - -dok-get: - cd /tmp ;\ - $(WGET) http://www.privoxy.org/docs/$(DOC_FILE) ;\ - $(TAR) -zxvf $(DOC_FILE) +web-faq: + @$(ECHO) Updating the FAQ on the webserver ... + @$(RSYNC) doc/webserver/faq/*.html shell.sourceforge.net:$(WWW_ROOT)/htdocs/faq + @$(ECHO) Enforcing reasonable permissions ... + @$(SSH) shell.sourceforge.net 'find $(WWW_ROOT)/htdocs/faq/ -type f | xargs chmod 664 2>/dev/null' + +web-user-manual: + @$(ECHO) Updating the user manual on the webserver (do not use in case of version changes) ... + @$(RSYNC) doc/webserver/user-manual/*.html shell.sourceforge.net:$(WWW_ROOT)/htdocs/user-manual/ + @$(ECHO) Enforcing reasonable permissions ... + @$(SSH) shell.sourceforge.net 'find $(WWW_ROOT)/htdocs/user-manual/ -type f | xargs chmod 664 2>/dev/null' ############################################################################# # # Try to clean up the generated HTML files. # -# The files are a such a mess that some of them require two tidy runs -# in row as the first abort prematurely. The vanilla tidy output renders -# poorly as it contains a bit too much white-space, so we additionally run -# the files through perl to fix this again. +# The files are such a mess that some of them require two tidy runs in a +# row as the first one aborts prematurely. The vanilla tidy output renders +# poorly because it contains a bit too much whitespace, so we additionally +# run the files through perl to fix this again. # ############################################################################# dok-tidy: @@ -676,7 +653,7 @@ dok-tidy: # Source file dependencies ############################################################################# -actions.@OBJEXT@: actions.c actions.h config.h $(PROJECT_H_DEPS) errlog.h jcc.h list.h loaders.h miscutil.h actionlist.h ssplit.h +actions.@OBJEXT@: actions.c actions.h config.h $(PROJECT_H_DEPS) errlog.h filters.h jcc.h list.h loaders.h miscutil.h actionlist.h ssplit.h cgi.@OBJEXT@: cgi.c cgi.h config.h $(PROJECT_H_DEPS) cgiedit.h cgisimple.h jbsockets.h list.h pcrs.h encode.h ssplit.h jcc.h filters.h actions.h errlog.h miscutil.h cgiedit.@OBJEXT@: cgiedit.c cgiedit.h config.h $(PROJECT_H_DEPS) cgi.h list.h pcrs.h encode.h ssplit.h jcc.h filters.h actionlist.h actions.h errlog.h miscutil.h cgisimple.@OBJEXT@: cgisimple.c cgisimple.h config.h $(PROJECT_H_DEPS) cgi.h list.h pcrs.h encode.h ssplit.h jcc.h filters.h actions.h errlog.h miscutil.h urlmatch.h