winsetup GNUmakefile, 1.11, 1.12 readme.txt, 1.4, 1.5 privoxy_winthreads.nsi, 1.8, 1.9

Update of /cvsroot/ijbswa/winsetup
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv32031

Modified Files:
        GNUmakefile readme.txt privoxy_winthreads.nsi 
Log Message:
updated for building v3.0.7;fixed nsis breakages;enabled building with zlib 
support;can now be build against a checked out current/;switched compressor 
settings to reduce installer size

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/ijbswa/winsetup/GNUmakefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- GNUmakefile 15 Aug 2006 20:53:02 -0000      1.11
+++ GNUmakefile 16 Dec 2007 16:26:54 -0000      1.12
@@ -29,6 +29,9 @@
 ##########################################################################
 #
 # $Log$
+# Revision 1.12  2007/12/16 16:26:54  gjmurphy
+# updated for building v3.0.7;fixed nsis breakages;enabled building with zlib 
support;can now be build against a checked out current/;switched compressor 
settings to reduce installer size
+#
 # Revision 1.11  2006/08/15 20:53:02  david__schmidt
 # Windows (Cygwin) wasn't building the text config files properly.
 #
@@ -80,7 +83,7 @@
 #DOSFILTER = $(PERL) -p -e 's/\n/\r\n/'
 
 # Path to NSIS
-MAKENSIS = ./nsis/makensis-bz2.exe
+MAKENSIS = ./nsis/nsis-2.30.exe
 
 
 ##########################################################################
@@ -110,10 +113,10 @@
 winbuild: $(DEST)/privoxy.exe templates inifiles doc webdoc
 
 clean:
-       rm -rf $(DEST)
+       rm -rf $(DEST) $(TARGET)
 
 clobber: clean
-       rm -f $(TARGET) $(SOURCE)/junkbuster.exe
+       rm -f $(TARGET) $(SOURCE)/privoxy.exe
 
 .PHONY: winrelease winbuild clean
 
@@ -158,7 +161,10 @@
 $(DEST)/default.filter: $(SOURCE)/default.filter $(DEST)
        $(DOSFILTER) < $< > $@ 
 
+#gjm hack: grab mgwz.dll from the mingw-zlib cygwin package.
+
 $(DEST)/privoxy.exe: $(SOURCE)/privoxy.exe $(DEST)
+       cp /bin/mgwz.dll $(DEST)
        $(STRIP) -o $@ $<
 
 $(SOURCE)/configure: $(SOURCE)/configure.in
@@ -168,7 +174,7 @@
        cd $(SOURCE) && $(AUTOHEADER)
 
 $(SOURCE)/config.h: $(SOURCE)/configure $(SOURCE)/config.h.in
-       cd $(SOURCE) && ./configure --enable-mingw32 --disable-pthread 
--disable-dynamic-pcre --disable-dynamic-pcrs
+       cd $(SOURCE) && ./configure --enable-mingw32 --disable-pthread 
--disable-dynamic-pcre --disable-dynamic-pcrs --enable-zlib
 
 $(SOURCE)/privoxy.exe: $(SOURCE)/configure $(SOURCE)/config.h
        cd $(SOURCE) && $(MAKE) clean
@@ -178,7 +184,7 @@
 templates: $(patsubst $(SOURCE)/%,$(DEST)/%,$(wildcard $(SOURCE)/templates/*))
 
 $(DEST)/templates/%: $(SOURCE)/templates/% $(DEST)/templates
-       $(DOSFILTER) < $< > $@ 
+       if test -f $< ; then $(DOSFILTER) < $< > $@ ; fi
 
 
 doc: $(DEST)/AUTHORS.txt $(DEST)/README.txt $(DEST)/LICENSE.txt \

Index: readme.txt
===================================================================
RCS file: /cvsroot/ijbswa/winsetup/readme.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- readme.txt  10 Aug 2006 15:59:41 -0000      1.4
+++ readme.txt  16 Dec 2007 16:26:54 -0000      1.5
@@ -9,9 +9,12 @@
 2) Run Make:
       cd windist
       make
+   If make fails with the following error:
+      cp: cannot stat `/bin/mgwz.dll': No such file or directory
+   then you need to install the mingw-zlib cygwin package.
 3) Rename "privoxy_setup.exe" to "privoxy_setup_x_y_z.exe" where x,y,z are
    the current version/release levels.
 4) Test and distribute "privoxy_setup_x_y_z.exe".
 
 The final product is a single file which is a self-extracting archive and 
-setup program.  Currently it's only 350kb, but YMMV.
+setup program.  Currently it's only 460kb, but YMMV.

Index: privoxy_winthreads.nsi
===================================================================
RCS file: /cvsroot/ijbswa/winsetup/privoxy_winthreads.nsi,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- privoxy_winthreads.nsi      19 Mar 2007 20:45:43 -0000      1.8
+++ privoxy_winthreads.nsi      16 Dec 2007 16:26:54 -0000      1.9
@@ -35,7 +35,7 @@
 ;   Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 ;
 
-!include WinMessages.nsh ; to send close message to Privoxy process
+!include nsis\WinMessages.nsh ; to send close message to Privoxy process
 
 Name "Privoxy"
 OutFile "privoxy_setup.exe"
@@ -45,6 +45,7 @@
 
 ; Some default compiler settings (uncomment and change at will):
 SetCompress auto ; (can be off or force)
+SetCompressor /FINAL /SOLID lzma
 SetDatablockOptimize on
 CRCCheck on
 AutoCloseWindow true ; (can be true for the window go away automatically at 
end)


-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace