10 files changed, 52 insertions, 23 deletions

diff --git a/xdelta3/Makefile b/xdelta3/Makefile
index 0039f77..19afc42 100644
--- a/xdelta3/Makefile
+++ b/xdelta3/Makefile
@@ -48,7 +48,9 @@ EXTRA = Makefile COPYING linkxd3lib.c badcopy.c xdelta3.swig \
         xdelta3-regtest.py xdelta3-test.py setup.py \
         examples/Makefile examples/small_page_test.c \
         examples/README examples/encode_decode_test.c \
-        xdelta3.py xdelta3_wrap.c xdelta3.wxs xdelta3.wxi
+        examples/compare_test.c examples/speed_test.c \
+        xdelta3.py xdelta3_wrap.c xdelta3.wxs xdelta3.wxi \
+        README readme.txt
 
 SWIG_FLAGS = -DXD3_DEBUG=0 \
               -DEXTERNAL_COMPRESSION=0 \
@@ -59,7 +61,7 @@ SWIG_FLAGS = -DXD3_DEBUG=0 \
               -DSWIG_MODULE=1
 
 # $Format: "REL=$Xdelta3Version$" $
-REL=3.0s_pre0
+REL=3.0s
 RELDIR = xdelta$(REL)
 
 all: xdelta3-debug xdelta3
diff --git a/xdelta3/README b/xdelta3/README
index b139f7e..be7c6ce 100644
--- a/xdelta3/README
+++ b/xdelta3/README
@@ -1,7 +1,34 @@
-For more information about xdelta3, see:
+Xdelta 3.x readme.txt
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+<josh.macdonald@gmail.com>
 
-file://www/xdelta3.html
 
-http://xdelta.org/
+Thanks for downloading Xdelta!
 
-http://code.google.com/p/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/releases/xdelta3.0s.msi b/xdelta3/releases/xdelta3.0s.msi
new file mode 100644
index 0000000..6cd3869
--- /dev/null
+++ b/xdelta3/releases/xdelta3.0s.msi
diff --git a/xdelta3/releases/xdelta3.0s.tar.gz b/xdelta3/releases/xdelta3.0s.tar.gz
new file mode 100644
index 0000000..5593b3f
--- /dev/null
+++ b/xdelta3/releases/xdelta3.0s.tar.gz
diff --git a/xdelta3/releases/xdelta3.0s.x86-32.exe b/xdelta3/releases/xdelta3.0s.x86-32.exe
new file mode 100755
index 0000000..b6ca273
--- /dev/null
+++ b/xdelta3/releases/xdelta3.0s.x86-32.exe
diff --git a/xdelta3/setup.py b/xdelta3/setup.py
index f6c2484..7678d9a 100644
--- a/xdelta3/setup.py
+++ b/xdelta3/setup.py
@@ -49,7 +49,7 @@ xdelta3_ext = Extension('xdelta3main',
                                                ])
 
 # $Format: "REL='$Xdelta3Version$'" $
-REL='0r'
+REL='3.0s'
 
 # This provides xdelta3.main(), which calls the xdelta3 command-line main()
 # from python.
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 76f225d..6be82dc 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -341,7 +341,7 @@ static int
 main_version (void)
 {
   /* $Format: "  DP(RINT \"Xdelta version $Xdelta3Version$, Copyright (C) 2007, Joshua MacDonald\n\");" $ */
-  DP(RINT "Xdelta version 3.0s_pre0, Copyright (C) 2007, Joshua MacDonald\n");
+  DP(RINT "Xdelta version 3.0s, Copyright (C) 2007, Joshua MacDonald\n");
   DP(RINT "Xdelta comes with ABSOLUTELY NO WARRANTY.\n");
   DP(RINT "This is free software, and you are welcome to redistribute it\n");
   DP(RINT "under certain conditions; see \"COPYING\" for details.\n");
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index 1be2fe6..197c7ed 100644
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -4312,7 +4312,7 @@ static int
 xd3_srcwin_setup (xd3_stream *stream)
 {
   xd3_source *src = stream->src;
-  xoff_t length;
+  xoff_t length, x;
 
   /* Check the undecided state. */
   XD3_ASSERT (src->srclen == 0 && src->srcbase == 0);
@@ -4335,7 +4335,7 @@ xd3_srcwin_setup (xd3_stream *stream)
    * use smaller windows. */
   length = stream->match_maxaddr - stream->match_minaddr;
 
-  xoff_t x = (xoff_t) USIZE_T_MAX;
+  x = (xoff_t) USIZE_T_MAX;
   if (length > x)
     {
       stream->msg = "source window length overflow (not 64bit)";
diff --git a/xdelta3/xdelta3.prj b/xdelta3/xdelta3.prj
index b63aa37..6ebaf1c 100644
--- a/xdelta3/xdelta3.prj
+++ b/xdelta3/xdelta3.prj
@@ -9,7 +9,7 @@
 (Checkin-Login jmacd)
 (Populate-Ignore ("\\.svn"))
 (Project-Keywords
- (Xdelta3Version "3.0s_pre0")
+ (Xdelta3Version "3.0s")
  )
 (Files
   (COPYING (xdelta3/b/29_COPYING 1.1 744))
diff --git a/xdelta3/xdelta3.wxs b/xdelta3/xdelta3.wxs
index 8227877..e8e92b4 100644
--- a/xdelta3/xdelta3.wxs
+++ b/xdelta3/xdelta3.wxs
@@ -3,7 +3,7 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
    <Product Id='$(var.PRODUCT_ID)'
-            Name='Xdelta 3.0q'
+            Name='Xdelta 3.0s'
             Language='1033'
             Codepage='1252'
             Version='3.0.1.1'
@@ -11,7 +11,7 @@
 
             <Package Id='$(var.PACKAGE_ID)'
                      Keywords='Installer'
-                     Description='Xdelta 3.0q'
+                     Description='Xdelta 3.0s'
                      Comments='http://xdelta.org'
                      Manufacturer='Josh.MacDonald@Gmail.Com'
                      InstallerVersion='300'
@@ -19,7 +19,7 @@
                      Compressed='yes' />
 
             <Media Id='1'
-                   Cabinet='xdelta30q.cab'
+                   Cabinet='xdelta30s.cab'
                    EmbedCab='yes' />
 
             <Directory Id='TARGETDIR' Name='SourceDir'>
@@ -30,8 +30,8 @@
             <Component Id='Main'
                        Guid='$(var.COMPONENT_ID)'>
               <File Id='XdeltaEXE'
-                    Name='xdelt30q'
-                    LongName='xdelta30q.exe'
+                    Name='xdelt30s'
+                    LongName='xdelta30s.exe'
                     DiskId='1'
                     Source='G:\jmacd\svn\xdelta3\Release\xdelta3.exe'
                     Vital='yes'>
@@ -73,15 +73,15 @@
             <Component Id='Source'
                        Guid='$(var.SOURCE_ID)'>
               <File Id='Source'
-                    Name='xdelt30q.zip'
-                    LongName='xdelta30q.zip'
+                    Name='xdelt30s.zip'
+                    LongName='xdelta3.0s.zip'
                     DiskId='1'
-                    Source='G:\jmacd\svn\xdelta3\xdelta30q.zip'
+                    Source='G:\jmacd\svn\xdelta3\xdelta3.0s.zip'
                     Vital='yes'>
                 <Shortcut Id="startupmenuSource"
                           Directory="ProgramMenuDir"
-                          Name="xdelt30q.zip"
-                          LongName="xdelta30q.zip"
+                          Name="xdelt30s.zip"
+                          LongName="xdelta3.0s.zip"
                           />
               </File>
             </Component>
@@ -91,8 +91,8 @@
 
               <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
                 <Directory Id="ProgramMenuDir"
-                           Name="xdelt30q"
-                           LongName="Xdelta 3.0q">
+                           Name="xdelt30s"
+                           LongName="Xdelta 3.0s">
                 </Directory>
               </Directory>