diff options
-rw-r--r-- | xdelta3/Makefile | 27 | ||||
-rw-r--r-- | xdelta3/readme.txt | 34 | ||||
-rw-r--r-- | xdelta3/xdelta3-main.h | 2 | ||||
-rw-r--r-- | xdelta3/xdelta3.prj | 3 | ||||
-rw-r--r-- | xdelta3/xdelta3.vcproj | 1 | ||||
-rw-r--r-- | xdelta3/xdelta3.wxi | 7 | ||||
-rw-r--r-- | xdelta3/xdelta3.wxs | 131 |
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 \ | |||
35 | 35 | ||
36 | PYTHON = python | 36 | PYTHON = python |
37 | 37 | ||
38 | SWIGTGT = xdelta3module.so | 38 | WIXDIR = "/cygdrive/c/Program Files/wix2.0.4820" |
39 | #SWIGTGT = xdelta3module.dll | ||
40 | 39 | ||
41 | PYTGT = build/lib.linux-i686-2.4/xdelta3main.so | 40 | #SWIGTGT = xdelta3module.so |
42 | #PYTGT = build/lib.cygwin-1.5.24-i686-2.4/xdelta3main.dll | 41 | SWIGTGT = xdelta3module.dll |
42 | |||
43 | #PYTGT = build/lib.linux-i686-2.4/xdelta3main.so | ||
44 | PYTGT = build/lib.cygwin-1.5.24-i686-2.4/xdelta3main.dll | ||
43 | 45 | ||
44 | EXTRA = Makefile COPYING linkxd3lib.c badcopy.c xdelta3.swig \ | 46 | EXTRA = Makefile COPYING linkxd3lib.c badcopy.c xdelta3.swig \ |
45 | draft-korn-vcdiff.txt xdelta3.vcproj badcopy.vcproj \ | 47 | draft-korn-vcdiff.txt xdelta3.vcproj badcopy.vcproj \ |
46 | xdelta3-regtest.py xdelta3-test.py setup.py \ | 48 | xdelta3-regtest.py xdelta3-test.py setup.py \ |
47 | examples/Makefile examples/small_page_test.c \ | 49 | examples/Makefile examples/small_page_test.c \ |
48 | xdelta3.py xdelta3_wrap.c | 50 | xdelta3.py xdelta3_wrap.c xdelta3.wxs xdelta3.wxi |
49 | 51 | ||
50 | SWIG_FLAGS = -DXD3_DEBUG=0 \ | 52 | SWIG_FLAGS = -DXD3_DEBUG=0 \ |
51 | -DEXTERNAL_COMPRESSION=0 \ | 53 | -DEXTERNAL_COMPRESSION=0 \ |
@@ -83,10 +85,23 @@ tar: | |||
83 | +tar -tzf ./$(RELDIR).tar.gz | 85 | +tar -tzf ./$(RELDIR).tar.gz |
84 | rm -rf /tmp/$(RELDIR) | 86 | rm -rf /tmp/$(RELDIR) |
85 | 87 | ||
88 | zip: | ||
89 | tar --exclude ".svn" -czf /tmp/$(RELDIR)-tmp.tar.gz $(SOURCES) $(EXTRA) | ||
90 | rm -rf /tmp/$(RELDIR) | ||
91 | mkdir /tmp/$(RELDIR) | ||
92 | (cd /tmp/$(RELDIR) && tar -xzf ../$(RELDIR)-tmp.tar.gz) | ||
93 | tar -czf ./$(RELDIR).tar.gz -C /tmp $(RELDIR) | ||
94 | +zip -r $(RELDIR).zip /tmp/$(RELDIR) | ||
95 | rm -rf /tmp/$(RELDIR) | ||
96 | |||
86 | clean: | 97 | clean: |
87 | rm -f $(TARGETS) | 98 | rm -f $(TARGETS) |
88 | rm -rf build Debug Release core cifs* *.stackdump *.exe \ | 99 | rm -rf build Debug Release core cifs* *.stackdump *.exe \ |
89 | xdelta3.ncb xdelta3.suo xdelta3.sln | 100 | xdelta3.ncb xdelta3.suo xdelta3.sln xdelta3.wixobj xdelta3.msi |
101 | |||
102 | wix: xdelta3.wxs xdelta3.wxi readme.txt Release\xdelta3.exe | ||
103 | $(WIXDIR)/candle.exe xdelta3.wxs -out xdelta3.wixobj | ||
104 | $(WIXDIR)/light.exe xdelta3.wixobj -out xdelta3.msi | ||
90 | 105 | ||
91 | xdelta3: $(SOURCES) | 106 | xdelta3: $(SOURCES) |
92 | $(CC) -O3 -Wall -Wshadow xdelta3.c -lm -o xdelta3 \ | 107 | $(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 @@ | |||
1 | Xdelta 3.x readme.txt | ||
2 | Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 | ||
3 | <josh.macdonald@gmail.com> | ||
4 | |||
5 | |||
6 | Thanks for downloading Xdelta! | ||
7 | |||
8 | This directory contains the Xdelta3 command-line interface (CLI) and source | ||
9 | distribution for VCDIFF differential compression, a.k.a. delta | ||
10 | compression. The latest information and downloads are available here: | ||
11 | |||
12 | http://xdelta.org/ | ||
13 | http://code.google.com/p/xdelta/ | ||
14 | |||
15 | The command-line syntax: | ||
16 | |||
17 | http://code.google.com/p/xdelta/wiki/CommandLineSyntax | ||
18 | |||
19 | Run 'xdelta3 -h' for brief help. Run 'xdelta3 test' for built-in tests. | ||
20 | |||
21 | Sample commands (like gzip, -e means encode, -d means decode) | ||
22 | |||
23 | xdelta3 -9 -S djw -e -vfs OLD_FILE NEW_FILE DELTA_FILE | ||
24 | xdelta3 -d -vfs OLD_FILE DELTA_FILE DECODED_FILE | ||
25 | |||
26 | File bug reports and browse open support issues here: | ||
27 | |||
28 | http://code.google.com/p/xdelta/issues/list | ||
29 | |||
30 | The source distribution contains the C/C++/Python APIs, Unix, Microsoft VC++ | ||
31 | and Cygwin builds. Xdelta3 is covered under the terms of the GPL, see | ||
32 | COPYING. | ||
33 | |||
34 | 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) | |||
3268 | static int | 3268 | static int |
3269 | main_help (void) | 3269 | main_help (void) |
3270 | { | 3270 | { |
3271 | /* TODO: license info */ | ||
3272 | |||
3271 | /* Note: update wiki when command-line features change */ | 3273 | /* Note: update wiki when command-line features change */ |
3272 | main_version (); | 3274 | main_version (); |
3273 | DP(RINT "usage: xdelta3 [command/options] [input [output]]\n"); | 3275 | 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 @@ | |||
48 | (examples/small_page_test.c (xdelta3/b/35_small_page 1.2 744)) | 48 | (examples/small_page_test.c (xdelta3/b/35_small_page 1.2 744)) |
49 | 49 | ||
50 | (plot.sh (xdelta3/b/36_plot.sh 1.1 744)) | 50 | (plot.sh (xdelta3/b/36_plot.sh 1.1 744)) |
51 | |||
52 | (xdelta3.wxs ()) | ||
53 | (xdelta3.wxi ()) | ||
51 | ) | 54 | ) |
52 | (Merge-Parents) | 55 | (Merge-Parents) |
53 | (New-Merge-Parents) | 56 | (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 @@ | |||
94 | OutputDirectory="Release" | 94 | OutputDirectory="Release" |
95 | IntermediateDirectory="Release" | 95 | IntermediateDirectory="Release" |
96 | ConfigurationType="1" | 96 | ConfigurationType="1" |
97 | WholeProgramOptimization="1" | ||
97 | > | 98 | > |
98 | <Tool | 99 | <Tool |
99 | Name="VCPreBuildEventTool" | 100 | 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 @@ | |||
1 | <Include> | ||
2 | <?define PRODUCT_ID=60131be5-be4d-4975-9108-dd0be735890d ?> | ||
3 | <?define PACKAGE_ID=82bf21ca-ee08-4701-ab78-37210dac82ce ?> | ||
4 | <?define COMPONENT_ID=85bc3206-05f8-41f8-b500-6ea32e5d6a8f ?> | ||
5 | <?define MANUAL_ID=07f387bc-a0c5-4af9-88db-1a84443f1fc5 ?> | ||
6 | <?define SOURCE_ID=4e1503a9-3ed1-4e06-b0c0-890462b1a4fd ?> | ||
7 | </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 @@ | |||
1 | <?xml version='1.0'?> | ||
2 | <?include $(sys.SOURCEFILEDIR)\xdelta3.wxi ?> | ||
3 | |||
4 | <Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'> | ||
5 | <Product Id='$(var.PRODUCT_ID)' | ||
6 | Name='Xdelta 3.0q' | ||
7 | Language='1033' | ||
8 | Codepage='1252' | ||
9 | Version='3.0.1.1' | ||
10 | Manufacturer='Josh.MacDonald@Gmail.Com'> | ||
11 | |||
12 | <Package Id='$(var.PACKAGE_ID)' | ||
13 | Keywords='Installer' | ||
14 | Description='Xdelta 3.0q' | ||
15 | Comments='http://xdelta.org' | ||
16 | Manufacturer='Josh.MacDonald@Gmail.Com' | ||
17 | InstallerVersion='300' | ||
18 | Languages='1033' | ||
19 | Compressed='yes' /> | ||
20 | |||
21 | <Media Id='1' | ||
22 | Cabinet='xdelta30q.cab' | ||
23 | EmbedCab='yes' /> | ||
24 | |||
25 | <Directory Id='TARGETDIR' Name='SourceDir'> | ||
26 | <Directory Id='ProgramFilesFolder' Name='PFiles'> | ||
27 | <Directory Id='Xdelta' | ||
28 | Name='Xdelta'> | ||
29 | |||
30 | <Component Id='Main' | ||
31 | Guid='$(var.COMPONENT_ID)'> | ||
32 | <File Id='XdeltaEXE' | ||
33 | Name='xdelt30q' | ||
34 | LongName='xdelta30q.exe' | ||
35 | DiskId='1' | ||
36 | Source='G:\jmacd\svn\xdelta3\Release\xdelta3.exe' | ||
37 | Vital='yes'> | ||
38 | </File> | ||
39 | </Component> | ||
40 | |||
41 | <Component Id='Readme' | ||
42 | Guid='$(var.MANUAL_ID)'> | ||
43 | <File Id='Readme' | ||
44 | Name='readme.txt' | ||
45 | LongName='readme.txt' | ||
46 | DiskId='1' | ||
47 | Source='G:\jmacd\svn\xdelta3\readme.txt' | ||
48 | Vital='yes'> | ||
49 | <Shortcut Id="startupmenuReadme" | ||
50 | Directory="ProgramMenuDir" | ||
51 | Name="readme.txt" | ||
52 | LongName="Xdelta3 readme.txt" | ||
53 | /> | ||
54 | </File> | ||
55 | </Component> | ||
56 | |||
57 | <Component Id='Copyright' | ||
58 | Guid='$(var.MANUAL_ID)'> | ||
59 | <File Id='Copyright' | ||
60 | Name='COPYING' | ||
61 | LongName='COPYING' | ||
62 | DiskId='1' | ||
63 | Source='G:\jmacd\svn\xdelta3\COPYING' | ||
64 | Vital='yes'> | ||
65 | <Shortcut Id="startupmenuCopyright" | ||
66 | Directory="ProgramMenuDir" | ||
67 | Name="COPYING" | ||
68 | LongName="GNU Public License" | ||
69 | /> | ||
70 | </File> | ||
71 | </Component> | ||
72 | |||
73 | <Component Id='Source' | ||
74 | Guid='$(var.SOURCE_ID)'> | ||
75 | <File Id='Source' | ||
76 | Name='xdelt30q.zip' | ||
77 | LongName='xdelta30q.zip' | ||
78 | DiskId='1' | ||
79 | Source='G:\jmacd\svn\xdelta3\xdelta30q.zip' | ||
80 | Vital='yes'> | ||
81 | <Shortcut Id="startupmenuSource" | ||
82 | Directory="ProgramMenuDir" | ||
83 | Name="xdelt30q.zip" | ||
84 | LongName="xdelta30q.zip" | ||
85 | /> | ||
86 | </File> | ||
87 | </Component> | ||
88 | |||
89 | </Directory> | ||
90 | </Directory> | ||
91 | |||
92 | <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs"> | ||
93 | <Directory Id="ProgramMenuDir" | ||
94 | Name="xdelt30q" | ||
95 | LongName="Xdelta 3.0q"> | ||
96 | </Directory> | ||
97 | </Directory> | ||
98 | |||
99 | <Merge Id='CRT' | ||
100 | Language='0' | ||
101 | DiskId='1' | ||
102 | src='C:\Program Files\Common Files\Merge Modules\microsoft_vc80_crt_x86.msm' | ||
103 | /> | ||
104 | <Merge Id='CRT Policy' | ||
105 | Language='0' | ||
106 | DiskId='1' | ||
107 | src='C:\Program Files\Common Files\Merge Modules\policy_8_0_Microsoft_VC80_CRT_x86.msm' | ||
108 | /> | ||
109 | </Directory> | ||
110 | |||
111 | <Feature Id='Complete' | ||
112 | Level='1'> | ||
113 | <ComponentRef Id='Main' /> | ||
114 | <ComponentRef Id='Readme' /> | ||
115 | <ComponentRef Id='Copyright' /> | ||
116 | <ComponentRef Id='Source' /> | ||
117 | </Feature> | ||
118 | |||
119 | <Feature Id='CRT_WinSXS' Title='CRT WinSXS' Level='1'> | ||
120 | <MergeRef Id='CRT' /> | ||
121 | <MergeRef Id='CRT Policy' /> | ||
122 | </Feature> | ||
123 | |||
124 | <InstallExecuteSequence> | ||
125 | <RemoveRegistryValues/> | ||
126 | <RemoveFiles/> | ||
127 | <InstallFiles/> | ||
128 | <WriteRegistryValues/> | ||
129 | </InstallExecuteSequence> | ||
130 | </Product> | ||
131 | </Wix> | ||