X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=f457703c1c843010a75f72baf0dad89830132d0a;hp=fc3881b6cb44d32299b41628f8b3ab9cade631f4;hb=32ffc3b12582ab28c958dacea1131850972646ca;hpb=e03df26df8fdc0d26ef67814e799ba78bf650793 diff --git a/GNUmakefile.in b/GNUmakefile.in index fc3881b6..f457703c 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,8 +1,8 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.212 2013/01/09 15:05:20 fabiankeil Exp $ +# $Id: GNUmakefile.in,v 1.230 2015/01/24 16:40:07 fabiankeil Exp $ # -# Written by and Copyright (C) 2001-2011 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 @@ -130,7 +130,8 @@ CHMOD = chmod CHOWN = chown CHGRP = chgrp GROUPS = groups -WDUMP = @WDUMP@ -dump +W3M_DUMP = env -u LANG LC_ALL=C @W3M@ -dump +W3M_DUMP_UTF8 = @W3M@ -dump JADECAT = @JADECAT@ JADEBIN = @JADEBIN@ DB = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldp.dsl\#html @@ -143,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) @@ -158,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. @@ -503,9 +501,9 @@ groff2html: # readme page and INSTALL file dok-readme: dok-release cd doc/source && $(DB)-notoc -V nochunks readme.sgml > tmp.html &&\ - env -u LANG $(WDUMP) tmp.html > ../../README ;\ + $(W3M_DUMP) tmp.html > ../../README ;\ $(DB)-notoc -V nochunks install.sgml > tmp.html &&\ - env -u LANG $(WDUMP) tmp.html > ../../INSTALL ;\ + $(W3M_DUMP) tmp.html > ../../INSTALL ;\ $(RM) tmp.* # index.sgml is used to create both the Home Page, and a local index @@ -535,7 +533,7 @@ dok: dok-release dok-devel dok-user dok-faq dok-readme dok-webserver dok-authors ## Make AUTHORS file dok-authors: - cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && env -u LANG $(WDUMP) \ + cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && $(W3M_DUMP_UTF8) \ tmp.html > ../../AUTHORS && $(RM) tmp.html # Set doc entities for VERSION and CODE_STATUS in sgml docs. Toggle content @@ -564,20 +562,17 @@ dok-release: # 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 && $(WDUMP) announce.html > announce.txt +# 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 && $(WDUMP) announce-mini.html > announce-mini.txt &&\ +# 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 &&\ - env -u LANG LC_ALL=C 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!" @@ -587,14 +582,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 ############################################################################# # @@ -603,6 +594,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: @@ -628,40 +625,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: @@ -675,7 +664,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 @@ -740,7 +729,9 @@ $(PROGRAM): $(OBJS) $(W32_FILES) clean: $(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action \ - `find . -name TAGS -o -name tags | $(GREP) -v .git` config.base config.tmp + 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` clean-editor-files: $(RM) `find . -name "*~"`