Add MSI build, Makefile wix rules.

7 files changed, 199 insertions, 6 deletions

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
+<josh.macdonald@gmail.com>
+
+
+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 <josh.macdonald@gmail.com>
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"

                         >

                         <Tool

                                 Name="VCPreBuildEventTool"

diff --git a/xdelta3/xdelta3.wxi b/xdelta3/xdelta3.wxi
new file mode 100644
index 0000000..2ef8426
--- /dev/null
+++ b/xdelta3/xdelta3.wxi
@@ -0,0 +1,7 @@
+<Include>
+            <?define PRODUCT_ID=60131be5-be4d-4975-9108-dd0be735890d ?>
+            <?define PACKAGE_ID=82bf21ca-ee08-4701-ab78-37210dac82ce ?>
+            <?define COMPONENT_ID=85bc3206-05f8-41f8-b500-6ea32e5d6a8f ?>
+            <?define MANUAL_ID=07f387bc-a0c5-4af9-88db-1a84443f1fc5 ?>
+            <?define SOURCE_ID=4e1503a9-3ed1-4e06-b0c0-890462b1a4fd ?>
+</Include>
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 @@
+<?xml version='1.0'?>
+<?include $(sys.SOURCEFILEDIR)\xdelta3.wxi ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
+   <Product Id='$(var.PRODUCT_ID)'
+            Name='Xdelta 3.0q'
+            Language='1033'
+            Codepage='1252'
+            Version='3.0.1.1'
+            Manufacturer='Josh.MacDonald@Gmail.Com'>
+
+            <Package Id='$(var.PACKAGE_ID)'
+                     Keywords='Installer'
+                     Description='Xdelta 3.0q'
+                     Comments='http://xdelta.org'
+                     Manufacturer='Josh.MacDonald@Gmail.Com'
+                     InstallerVersion='300'
+                     Languages='1033'
+                     Compressed='yes' />
+
+            <Media Id='1'
+                   Cabinet='xdelta30q.cab'
+                   EmbedCab='yes' />
+
+            <Directory Id='TARGETDIR' Name='SourceDir'>
+              <Directory Id='ProgramFilesFolder' Name='PFiles'>
+                <Directory Id='Xdelta' 
+                           Name='Xdelta'>
+
+            <Component Id='Main'
+                       Guid='$(var.COMPONENT_ID)'>
+              <File Id='XdeltaEXE'
+                    Name='xdelt30q'
+                    LongName='xdelta30q.exe'
+                    DiskId='1'
+                    Source='G:\jmacd\svn\xdelta3\Release\xdelta3.exe'
+                    Vital='yes'>
+              </File>
+            </Component>
+
+            <Component Id='Readme'
+                       Guid='$(var.MANUAL_ID)'>
+              <File Id='Readme'
+                    Name='readme.txt'
+                    LongName='readme.txt'
+                    DiskId='1'
+                    Source='G:\jmacd\svn\xdelta3\readme.txt'
+                    Vital='yes'>
+                <Shortcut Id="startupmenuReadme"
+                          Directory="ProgramMenuDir"
+                          Name="readme.txt"
+                          LongName="Xdelta3 readme.txt"
+                          />
+              </File>
+            </Component>
+
+            <Component Id='Copyright'
+                       Guid='$(var.MANUAL_ID)'>
+              <File Id='Copyright'
+                    Name='COPYING'
+                    LongName='COPYING'
+                    DiskId='1'
+                    Source='G:\jmacd\svn\xdelta3\COPYING'
+                    Vital='yes'>
+                <Shortcut Id="startupmenuCopyright"
+                          Directory="ProgramMenuDir"
+                          Name="COPYING"
+                          LongName="GNU Public License"
+                          />
+              </File>
+            </Component>
+
+            <Component Id='Source'
+                       Guid='$(var.SOURCE_ID)'>
+              <File Id='Source'
+                    Name='xdelt30q.zip'
+                    LongName='xdelta30q.zip'
+                    DiskId='1'
+                    Source='G:\jmacd\svn\xdelta3\xdelta30q.zip'
+                    Vital='yes'>
+                <Shortcut Id="startupmenuSource"
+                          Directory="ProgramMenuDir"
+                          Name="xdelt30q.zip"
+                          LongName="xdelta30q.zip"
+                          />
+              </File>
+            </Component>
+
+                </Directory>
+              </Directory>
+
+              <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
+                <Directory Id="ProgramMenuDir"
+                           Name="xdelt30q"
+                           LongName="Xdelta 3.0q">
+                </Directory>
+              </Directory>
+
+              <Merge Id='CRT'
+                     Language='0'
+                     DiskId='1'
+src='C:\Program Files\Common Files\Merge Modules\microsoft_vc80_crt_x86.msm'
+/>
+              <Merge Id='CRT Policy'
+                     Language='0'
+                     DiskId='1'
+src='C:\Program Files\Common Files\Merge Modules\policy_8_0_Microsoft_VC80_CRT_x86.msm'
+/>
+            </Directory>
+
+            <Feature Id='Complete'
+                     Level='1'>
+              <ComponentRef Id='Main' />
+              <ComponentRef Id='Readme' />
+              <ComponentRef Id='Copyright' />
+              <ComponentRef Id='Source' />
+            </Feature>
+
+            <Feature Id='CRT_WinSXS' Title='CRT WinSXS' Level='1'>
+                        <MergeRef Id='CRT' />
+                        <MergeRef Id='CRT Policy' />
+            </Feature>
+
+            <InstallExecuteSequence>
+                        <RemoveRegistryValues/>
+                        <RemoveFiles/>
+                        <InstallFiles/>
+                        <WriteRegistryValues/>
+            </InstallExecuteSequence>
+   </Product>
+</Wix>