summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjosh.macdonald@gmail.com <josh.macdonald@gmail.com@a3eca27d-f21b-0410-9b4a-6511e771f64e>2010-08-03 04:21:38 +0000
committerjosh.macdonald@gmail.com <josh.macdonald@gmail.com@a3eca27d-f21b-0410-9b4a-6511e771f64e>2010-08-03 04:21:38 +0000
commitfa8eb3ec609c29455485dcde100b989ccd9ad99e (patch)
tree8459f4d18c222df576e02a3545afec9139c94060
parent0a2d5cd15a92c842dfba6b087b414b413961dc0d (diff)
release 3.0z
Diffstat
-rw-r--r--xdelta3/Makefile2
-rw-r--r--xdelta3/Makefile.mingw2
-rw-r--r--xdelta3/setup.py2
-rw-r--r--xdelta3/xdelta3-main.h8
-rw-r--r--xdelta3/xdelta3.vcproj152
5 files changed, 159 insertions, 7 deletions
diff --git a/xdelta3/Makefile b/xdelta3/Makefile
index 398c255..08f9a03 100644
--- a/xdelta3/Makefile
+++ b/xdelta3/Makefile
@@ -57,7 +57,7 @@ CFLAGS= -Wall -Wshadow -fno-builtin
57WFLAGS= -Wextra -Wsign-compare -Wconversion -Wextra -Wno-unused-parameter 57WFLAGS= -Wextra -Wsign-compare -Wconversion -Wextra -Wno-unused-parameter
58 58
59# $Format: "REL=$Xdelta3Version$" $ 59# $Format: "REL=$Xdelta3Version$" $
60REL=3.0y 60REL=3.0z
61 61
62RELDIR = xdelta$(REL) 62RELDIR = xdelta$(REL)
63 63
diff --git a/xdelta3/Makefile.mingw b/xdelta3/Makefile.mingw
index 22877b3..cfd034c 100644
--- a/xdelta3/Makefile.mingw
+++ b/xdelta3/Makefile.mingw
@@ -55,7 +55,7 @@ CFLAGS= -Wall -Wshadow -fno-builtin
55XDWINFLAGS:=-DXD3_STDIO=0 -DXD3_POSIX=0 -DXD3_WIN32=1 -DEXTERNAL_COMPRESSION=0 55XDWINFLAGS:=-DXD3_STDIO=0 -DXD3_POSIX=0 -DXD3_WIN32=1 -DEXTERNAL_COMPRESSION=0
56 56
57# $Format: "REL=$Xdelta3Version$" $ 57# $Format: "REL=$Xdelta3Version$" $
58REL=3.0y 58REL=3.0z
59 59
60RELDIR = xdelta$(REL) 60RELDIR = xdelta$(REL)
61 61
diff --git a/xdelta3/setup.py b/xdelta3/setup.py
index 53722bb..1d3fef5 100644
--- a/xdelta3/setup.py
+++ b/xdelta3/setup.py
@@ -50,7 +50,7 @@ xdelta3_ext = Extension('xdelta3main',
50 ]) 50 ])
51 51
52# $Format: "REL='$Xdelta3Version$'" $ 52# $Format: "REL='$Xdelta3Version$'" $
53REL='3.0y' 53REL='3.0z'
54 54
55# This provides xdelta3.main(), which calls the xdelta3 command-line main() 55# This provides xdelta3.main(), which calls the xdelta3 command-line main()
56# from python. 56# from python.
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index d2aa4e5..2234eaa 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -386,7 +386,7 @@ static int
386main_version (void) 386main_version (void)
387{ 387{
388 /* $Format: " DP(RINT \"Xdelta version $Xdelta3Version$, Copyright (C) 2007, 2008, 2009, 2010, Joshua MacDonald\n\");" $ */ 388 /* $Format: " DP(RINT \"Xdelta version $Xdelta3Version$, Copyright (C) 2007, 2008, 2009, 2010, Joshua MacDonald\n\");" $ */
389 DP(RINT "Xdelta version 3.0y, Copyright (C) 2007, 2008, 2009, 2010, Joshua MacDonald\n"); 389 DP(RINT "Xdelta version 3.0z, Copyright (C) 2007, 2008, 2009, 2010, Joshua MacDonald\n");
390 DP(RINT "Xdelta comes with ABSOLUTELY NO WARRANTY.\n"); 390 DP(RINT "Xdelta comes with ABSOLUTELY NO WARRANTY.\n");
391 DP(RINT "This is free software, and you are welcome to redistribute it\n"); 391 DP(RINT "This is free software, and you are welcome to redistribute it\n");
392 DP(RINT "under certain conditions; see \"COPYING\" for details.\n"); 392 DP(RINT "under certain conditions; see \"COPYING\" for details.\n");
@@ -2727,13 +2727,13 @@ main_set_appheader (xd3_stream *stream, main_file *input, main_file *sfile)
2727 2727
2728 iname = main_apphead_string (input->filename); 2728 iname = main_apphead_string (input->filename);
2729 icomp = (input->compressor == NULL) ? "" : input->compressor->ident; 2729 icomp = (input->compressor == NULL) ? "" : input->compressor->ident;
2730 len = (usize_t) strlen (iname) + strlen (icomp) + 2; 2730 len = (usize_t) strlen (iname) + (usize_t) strlen (icomp) + 2;
2731 2731
2732 if (sfile->filename != NULL) 2732 if (sfile->filename != NULL)
2733 { 2733 {
2734 sname = main_apphead_string (sfile->filename); 2734 sname = main_apphead_string (sfile->filename);
2735 scomp = (sfile->compressor == NULL) ? "" : sfile->compressor->ident; 2735 scomp = (sfile->compressor == NULL) ? "" : sfile->compressor->ident;
2736 len += (usize_t) strlen (sname) + strlen (scomp) + 2; 2736 len += (usize_t) strlen (sname) + (usize_t) strlen (scomp) + 2;
2737 } 2737 }
2738 else 2738 else
2739 { 2739 {
@@ -2791,7 +2791,7 @@ main_get_appheader_params (main_file *file, char **parsed,
2791 2791
2792 XD3_ASSERT(file->filename_copy == NULL); 2792 XD3_ASSERT(file->filename_copy == NULL);
2793 file->filename_copy = 2793 file->filename_copy =
2794 (char*) main_malloc(dlen + 2 + strlen(file->filename)); 2794 (char*) main_malloc(dlen + 2 + (usize_t) strlen(file->filename));
2795 2795
2796 strncpy(file->filename_copy, other->filename, dlen); 2796 strncpy(file->filename_copy, other->filename, dlen);
2797 file->filename_copy[dlen] = '/'; 2797 file->filename_copy[dlen] = '/';
diff --git a/xdelta3/xdelta3.vcproj b/xdelta3/xdelta3.vcproj
index c15ef55..dd4d6a2 100644
--- a/xdelta3/xdelta3.vcproj
+++ b/xdelta3/xdelta3.vcproj
@@ -11,6 +11,9 @@
11 <Platform 11 <Platform
12 Name="Win32" 12 Name="Win32"
13 /> 13 />
14 <Platform
15 Name="x64"
16 />
14 </Platforms> 17 </Platforms>
15 <ToolFiles> 18 <ToolFiles>
16 </ToolFiles> 19 </ToolFiles>
@@ -164,6 +167,155 @@
164 Name="VCPostBuildEventTool" 167 Name="VCPostBuildEventTool"
165 /> 168 />
166 </Configuration> 169 </Configuration>
170 <Configuration
171 Name="Debug|x64"
172 OutputDirectory="Debug"
173 IntermediateDirectory="Debug"
174 ConfigurationType="1"
175 >
176 <Tool
177 Name="VCPreBuildEventTool"
178 />
179 <Tool
180 Name="VCCustomBuildTool"
181 />
182 <Tool
183 Name="VCXMLDataGeneratorTool"
184 />
185 <Tool
186 Name="VCWebServiceProxyGeneratorTool"
187 />
188 <Tool
189 Name="VCMIDLTool"
190 />
191 <Tool
192 Name="VCCLCompilerTool"
193 AdditionalOptions="/DXD3_DEBUG=0 /DXD3_USE_LARGEFILE64=1 /DREGRESSION_TEST=1 /DSECONDARY_DJW=1 /DSECONDARY_FGK=1 /DXD3_MAIN=1 /DXD3_WIN32=1 /DEXTERNAL_COMPRESSION=0 /DXD3_STDIO=0 /DXD3_POSIX=0 /D_CRT_SECURE_NO_DEPRECATE"
194 Optimization="0"
195 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"
196 MinimalRebuild="true"
197 BasicRuntimeChecks="3"
198 RuntimeLibrary="3"
199 UsePrecompiledHeader="0"
200 WarningLevel="3"
201 Detect64BitPortabilityProblems="true"
202 DebugInformationFormat="4"
203 />
204 <Tool
205 Name="VCManagedResourceCompilerTool"
206 />
207 <Tool
208 Name="VCResourceCompilerTool"
209 />
210 <Tool
211 Name="VCPreLinkEventTool"
212 />
213 <Tool
214 Name="VCLinkerTool"
215 LinkIncremental="2"
216 GenerateDebugInformation="true"
217 SubSystem="1"
218 RandomizedBaseAddress="1"
219 DataExecutionPrevention="0"
220 TargetMachine="x64"
221 />
222 <Tool
223 Name="VCALinkTool"
224 />
225 <Tool
226 Name="VCManifestTool"
227 />
228 <Tool
229 Name="VCXDCMakeTool"
230 />
231 <Tool
232 Name="VCBscMakeTool"
233 />
234 <Tool
235 Name="VCFxCopTool"
236 />
237 <Tool
238 Name="VCAppVerifierTool"
239 />
240 <Tool
241 Name="VCPostBuildEventTool"
242 />
243 </Configuration>
244 <Configuration
245 Name="Release|x64"
246 OutputDirectory="Release"
247 IntermediateDirectory="Release"
248 ConfigurationType="1"
249 WholeProgramOptimization="1"
250 >
251 <Tool
252 Name="VCPreBuildEventTool"
253 />
254 <Tool
255 Name="VCCustomBuildTool"
256 />
257 <Tool
258 Name="VCXMLDataGeneratorTool"
259 />
260 <Tool
261 Name="VCWebServiceProxyGeneratorTool"
262 />
263 <Tool
264 Name="VCMIDLTool"
265 />
266 <Tool
267 Name="VCCLCompilerTool"
268 AdditionalOptions="/DXD3_DEBUG=0 /DXD3_USE_LARGEFILE64=1 /DREGRESSION_TEST=1 /DSECONDARY_DJW=1 /DSECONDARY_FGK=1 /DXD3_MAIN=1 /DXD3_WIN32=1 /DEXTERNAL_COMPRESSION=0 /DXD3_STDIO=0 /DXD3_POSIX=0 /D_CRT_SECURE_NO_DEPRECATE"
269 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
270 RuntimeLibrary="0"
271 BufferSecurityCheck="false"
272 UsePrecompiledHeader="0"
273 WarningLevel="3"
274 Detect64BitPortabilityProblems="true"
275 DebugInformationFormat="3"
276 />
277 <Tool
278 Name="VCManagedResourceCompilerTool"
279 />
280 <Tool
281 Name="VCResourceCompilerTool"
282 />
283 <Tool
284 Name="VCPreLinkEventTool"
285 />
286 <Tool
287 Name="VCLinkerTool"
288 LinkIncremental="2"
289 GenerateDebugInformation="true"
290 SubSystem="1"
291 OptimizeReferences="2"
292 EnableCOMDATFolding="2"
293 RandomizedBaseAddress="1"
294 DataExecutionPrevention="0"
295 TargetMachine="x64"
296 />
297 <Tool
298 Name="VCALinkTool"
299 />
300 <Tool
301 Name="VCManifestTool"
302 />
303 <Tool
304 Name="VCXDCMakeTool"
305 />
306 <Tool
307 Name="VCBscMakeTool"
308 />
309 <Tool
310 Name="VCFxCopTool"
311 />
312 <Tool
313 Name="VCAppVerifierTool"
314 />
315 <Tool
316 Name="VCPostBuildEventTool"
317 />
318 </Configuration>
167 </Configurations> 319 </Configurations>
168 <References> 320 <References>
169 </References> 321 </References>
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-14 18:32:57 +0000