From 000d39b5b36b618ac8a8cdd35346d43776c71881 Mon Sep 17 00:00:00 2001 From: "josh.macdonald" Date: Sun, 25 Mar 2007 20:41:46 +0000 Subject: Add MSI build, Makefile wix rules. --- xdelta3/Makefile | 27 +++++++--- xdelta3/readme.txt | 34 +++++++++++++ xdelta3/xdelta3-main.h | 2 + xdelta3/xdelta3.prj | 3 ++ xdelta3/xdelta3.vcproj | 1 + xdelta3/xdelta3.wxi | 7 +++ xdelta3/xdelta3.wxs | 131 +++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 199 insertions(+), 6 deletions(-) create mode 100644 xdelta3/readme.txt create mode 100644 xdelta3/xdelta3.wxi create mode 100644 xdelta3/xdelta3.wxs diff --git a/xdelta3/Makefile b/xdelta3/Makefile index d0faca3..13f19ff 100644 --- a/xdelta3/Makefile +++ b/xdelta3/Makefile @@ -35,17 +35,19 @@ TARGETS = xdelta3-debug \ PYTHON = python -SWIGTGT = xdelta3module.so -#SWIGTGT = xdelta3module.dll +WIXDIR = "/cygdrive/c/Program Files/wix2.0.4820" -PYTGT = build/lib.linux-i686-2.4/xdelta3main.so -#PYTGT = build/lib.cygwin-1.5.24-i686-2.4/xdelta3main.dll +#SWIGTGT = xdelta3module.so +SWIGTGT = xdelta3module.dll + +#PYTGT = build/lib.linux-i686-2.4/xdelta3main.so +PYTGT = build/lib.cygwin-1.5.24-i686-2.4/xdelta3main.dll EXTRA = Makefile COPYING linkxd3lib.c badcopy.c xdelta3.swig \ draft-korn-vcdiff.txt xdelta3.vcproj badcopy.vcproj \ xdelta3-regtest.py xdelta3-test.py setup.py \ examples/Makefile examples/small_page_test.c \ - xdelta3.py xdelta3_wrap.c + xdelta3.py xdelta3_wrap.c xdelta3.wxs xdelta3.wxi SWIG_FLAGS = -DXD3_DEBUG=0 \ -DEXTERNAL_COMPRESSION=0 \ @@ -83,10 +85,23 @@ tar: +tar -tzf ./$(RELDIR).tar.gz rm -rf /tmp/$(RELDIR) +zip: + tar --exclude ".svn" -czf /tmp/$(RELDIR)-tmp.tar.gz $(SOURCES) $(EXTRA) + rm -rf /tmp/$(RELDIR) + mkdir /tmp/$(RELDIR) + (cd /tmp/$(RELDIR) && tar -xzf ../$(RELDIR)-tmp.tar.gz) + tar -czf ./$(RELDIR).tar.gz -C /tmp $(RELDIR) + +zip -r $(RELDIR).zip /tmp/$(RELDIR) + rm -rf /tmp/$(RELDIR) + clean: rm -f $(TARGETS) rm -rf build Debug Release core cifs* *.stackdump *.exe \ - xdelta3.ncb xdelta3.suo xdelta3.sln + xdelta3.ncb xdelta3.suo xdelta3.sln xdelta3.wixobj xdelta3.msi + +wix: xdelta3.wxs xdelta3.wxi readme.txt Release\xdelta3.exe + $(WIXDIR)/candle.exe xdelta3.wxs -out xdelta3.wixobj + $(WIXDIR)/light.exe xdelta3.wixobj -out xdelta3.msi xdelta3: $(SOURCES) $(CC) -O3 -Wall -Wshadow xdelta3.c -lm -o xdelta3 \ diff --git a/xdelta3/readme.txt b/xdelta3/readme.txt new file mode 100644 index 0000000..be7c6ce --- /dev/null +++ b/xdelta3/readme.txt @@ -0,0 +1,34 @@ +Xdelta 3.x readme.txt +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 + + + +Thanks for downloading Xdelta! + +This directory contains the Xdelta3 command-line interface (CLI) and source +distribution for VCDIFF differential compression, a.k.a. delta +compression. The latest information and downloads are available here: + + http://xdelta.org/ + http://code.google.com/p/xdelta/ + +The command-line syntax: + + http://code.google.com/p/xdelta/wiki/CommandLineSyntax + +Run 'xdelta3 -h' for brief help. Run 'xdelta3 test' for built-in tests. + +Sample commands (like gzip, -e means encode, -d means decode) + + xdelta3 -9 -S djw -e -vfs OLD_FILE NEW_FILE DELTA_FILE + xdelta3 -d -vfs OLD_FILE DELTA_FILE DECODED_FILE + +File bug reports and browse open support issues here: + + http://code.google.com/p/xdelta/issues/list + +The source distribution contains the C/C++/Python APIs, Unix, Microsoft VC++ +and Cygwin builds. Xdelta3 is covered under the terms of the GPL, see +COPYING. + +Commercial inquiries welcome, please contact diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h index fb01e59..09a801a 100644 --- a/xdelta3/xdelta3-main.h +++ b/xdelta3/xdelta3-main.h @@ -3268,6 +3268,8 @@ main (int argc, char **argv) static int main_help (void) { + /* TODO: license info */ + /* Note: update wiki when command-line features change */ main_version (); DP(RINT "usage: xdelta3 [command/options] [input [output]]\n"); diff --git a/xdelta3/xdelta3.prj b/xdelta3/xdelta3.prj index 1e87fb2..130abed 100644 --- a/xdelta3/xdelta3.prj +++ b/xdelta3/xdelta3.prj @@ -48,6 +48,9 @@ (examples/small_page_test.c (xdelta3/b/35_small_page 1.2 744)) (plot.sh (xdelta3/b/36_plot.sh 1.1 744)) + + (xdelta3.wxs ()) + (xdelta3.wxi ()) ) (Merge-Parents) (New-Merge-Parents) diff --git a/xdelta3/xdelta3.vcproj b/xdelta3/xdelta3.vcproj index 76a0c24..9b53f72 100644 --- a/xdelta3/xdelta3.vcproj +++ b/xdelta3/xdelta3.vcproj @@ -94,6 +94,7 @@ OutputDirectory="Release" IntermediateDirectory="Release" ConfigurationType="1" + WholeProgramOptimization="1" > + + + + + + diff --git a/xdelta3/xdelta3.wxs b/xdelta3/xdelta3.wxs new file mode 100644 index 0000000..d525c65 --- /dev/null +++ b/xdelta3/xdelta3.wxs @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3