Fix bug in DeflaterOutputStream were occasionally encrypted data woul…

…d be corrupted. Tidy up more summary comments. Move to Sandcastle Help File builder for documentation.
icsharpcode · Sep 7, 2007 · 53b0daa · 53b0daa
1 parent 60087ad
commit 53b0daa
Show file tree

Hide file tree

Showing 22 changed files with 229 additions and 145 deletions.
diff --git a/SharpZipLib.shfb b/SharpZipLib.shfb
@@ -0,0 +1,50 @@
+<project schemaVersion="1.4.0.2">
+    <assemblies>
+        <assembly assemblyPath=".\current\net-11\ICSharpCode.SharpZipLib.dll" xmlCommentsPath=".\current\net-11\ICSharpCode.SharpZipLib.xml" commentsOnly="False" />
+    </assemblies>
+    <namespaceSummaries>
+        <namespaceSummaryItem name="" isDocumented="False" />
+        <namespaceSummaryItem name="ICSharpCode.SharpZipLib" isDocumented="True">The root namespace for this library.</namespaceSummaryItem>
+        <namespaceSummaryItem name="ICSharpCode.SharpZipLib.BZip2" isDocumented="True">BZip2 compression handling</namespaceSummaryItem>
+        <namespaceSummaryItem name="ICSharpCode.SharpZipLib.Checksums" isDocumented="True">Checksum Handling</namespaceSummaryItem>
+        <namespaceSummaryItem name="ICSharpCode.SharpZipLib.Core" isDocumented="True">Core Utilities</namespaceSummaryItem>
+        <namespaceSummaryItem name="ICSharpCode.SharpZipLib.Encryption" isDocumented="True">Encryption handling</namespaceSummaryItem>
+        <namespaceSummaryItem name="ICSharpCode.SharpZipLib.GZip" isDocumented="True">GZip compression handling</namespaceSummaryItem>
+        <namespaceSummaryItem name="ICSharpCode.SharpZipLib.Tar" isDocumented="True">Tape Archive handling</namespaceSummaryItem>
+        <namespaceSummaryItem name="ICSharpCode.SharpZipLib.Zip" isDocumented="True">ZIP archive handling</namespaceSummaryItem>
+        <namespaceSummaryItem name="ICSharpCode.SharpZipLib.Zip.Compression" isDocumented="True">Zip Compression handling</namespaceSummaryItem>
+        <namespaceSummaryItem name="ICSharpCode.SharpZipLib.Zip.Compression.Streams" isDocumented="True">Zip compression streams.</namespaceSummaryItem>
+    </namespaceSummaries>
+    <ProjectSummary>Welcom to the #Zip compression library!</ProjectSummary>
+    <MissingTags>Summary, Parameter, Returns, AutoDocumentCtors, Namespace</MissingTags>
+    <VisibleItems>InheritedMembers, InheritedFrameworkMembers, Protected, SealedProtected</VisibleItems>
+    <HtmlHelp1xCompilerPath path="" />
+    <HtmlHelp2xCompilerPath path="" />
+    <OutputPath>C:\Common\User\John\Development\SharpZip\SharpZipLib\trunk\SharpZipLib\current\doc\</OutputPath>
+    <SandcastlePath path="" />
+    <WorkingPath path="" />
+    <CleanIntermediates>True</CleanIntermediates>
+    <HelpFileFormat>HtmlHelp1x</HelpFileFormat>
+    <PurgeDuplicateTopics>True</PurgeDuplicateTopics>
+    <CppCommentsFixup>False</CppCommentsFixup>
+    <FrameworkVersion>2.0.50727</FrameworkVersion>
+    <BinaryTOC>True</BinaryTOC>
+    <IncludeFavorites>False</IncludeFavorites>
+    <Preliminary>False</Preliminary>
+    <RootNamespaceContainer>False</RootNamespaceContainer>
+    <RootNamespaceTitle />
+    <HelpTitle>ICSharpCode.SharpZipLib Compression Library</HelpTitle>
+    <HtmlHelpName>SharpZipLib</HtmlHelpName>
+    <Language>en-US</Language>
+    <CopyrightHref />
+    <CopyrightText />
+    <FeedbackEMailAddress />
+    <HeaderText />
+    <FooterText />
+    <ProjectLinkType>Local</ProjectLinkType>
+    <SdkLinkType>Msdn</SdkLinkType>
+    <PresentationStyle>Prototype</PresentationStyle>
+    <NamingMethod>Guid</NamingMethod>
+    <SyntaxFilters>Standard</SyntaxFilters>
+    <ContentPlacement>AboveNamespaces</ContentPlacement>
+</project>
diff --git a/SharpZlib.build b/SharpZlib.build
@@ -30,7 +30,7 @@
     <property name="debug" value="False"/>
     <property name="optimize" value="True"/>
     <property name="checked" value="False" />
-    <property name="version" value="0.85.3"/>
+    <property name="version" value="0.85.4"/>
 
     <property name="build.output.dir" value="bin" overwrite="False" />
     <property name="sharpziplib.name" value="ICSharpCode.SharpZipLib" />

diff --git a/mkDistribution.bat b/mkDistribution.bat
@@ -1,4 +1,4 @@
-@echo "mkDistribution v1.2"
+@echo "mkDistribution v1.3"
 
 if exist current (
 	rmdir /s /q current
@@ -18,7 +18,6 @@ nant -t:net-1.1 -D:build.output.dir=current\net-11 -buildfile:sharpZLib.build bu
 mkdir current\net-20
 nant -t:net-2.0 -D:build.output.dir=current\net-20 -buildfile:sharpZLib.build build
 
-@echo todo generate documentation and the rest of the distribution image.
 
 mkdir current\doc
 copy doc\readme.rtf current\doc
@@ -28,8 +27,9 @@ copy SharpZipLib.chm current\doc
 copy installGAC.bat current
 copy uninstallGAC.bat current
 
+"c:\Program Files\EWSoftware\Sandcastle Help File Builder\SandcastleBuilderConsole.exe" .\SharpZipLib.shfb
+
 samples\cs\bin\sz -rc current\SharpZipLib.zip current\*.dll
 
 @echo TODO Compress source to SharpZipLib_SourceSamples.zip
-@echo TODO Build CHM file
-@echo TODO Build Bin Zip files
+@echo TODO Build Bin Zip files
diff --git a/samples/cs/CreateZipFile/AssemblyInfo.cs b/samples/cs/CreateZipFile/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("0.85.3.365")]
+[assembly: AssemblyVersion("0.85.4.369")]
 
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]

diff --git a/samples/cs/FastZip/AssemblyInfo.cs b/samples/cs/FastZip/AssemblyInfo.cs
@@ -23,7 +23,7 @@
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly: AssemblyVersion("0.85.3.365")]
+[assembly: AssemblyVersion("0.85.4.369")]
 
 // The following attributes specify the key for the sign of your assembly. See the
 // .NET Framework documentation for more information about signing.

diff --git a/samples/cs/minibzip2/AssemblyInfo.cs b/samples/cs/minibzip2/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("0.85.3.365")]
+[assembly: AssemblyVersion("0.85.4.369")]
 
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]

diff --git a/samples/cs/minigzip/AssemblyInfo.cs b/samples/cs/minigzip/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("0.85.3.365")]
+[assembly: AssemblyVersion("0.85.4.369")]
 
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]

diff --git a/samples/cs/sz/AssemblyInfo.cs b/samples/cs/sz/AssemblyInfo.cs
@@ -23,7 +23,7 @@
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly: AssemblyVersion("0.85.3.365")]
+[assembly: AssemblyVersion("0.85.4.369")]
 
 // The following attributes specify the key for the sign of your assembly. See the
 // .NET Framework documentation for more information about signing.

diff --git a/samples/cs/sz/sz.cs b/samples/cs/sz/sz.cs
@@ -315,6 +315,26 @@ bool SetArgs(string[] args) {
 												System.Console.WriteLine("Invalid extractdir " + args[argIndex]);
 											}
 											break;
+
+										case "-zip64":
+											if ( optArg.Length > 0 )
+											{
+												switch ( optArg )
+												{
+													case "on":
+														useZip64_ = UseZip64.On;
+														break;
+
+													case "off":
+														useZip64_ = UseZip64.Off;
+														break;
+
+													case "auto":
+														useZip64_ = UseZip64.Dynamic;
+														break;
+												}
+											}
+											break;
 
 										case "-encoding":
 											if (optArg.Length > 0) {
@@ -971,7 +991,8 @@ void Create(ArrayList fileSpecs)
 					if (password != null && password.Length > 0) {
 						outputStream.Password = password;
 					}
-
+
+					outputStream.UseZip64 = useZip64_;
 					outputStream.SetLevel(compressionLevel);
 					foreach(string spec in fileSpecs) {
 						string fileName = Path.GetFileName(spec);
@@ -1299,6 +1320,11 @@ public static void Main(string[] args) {
 		}
 
 		#region Instance Fields
+		/// <summary>
+		/// The Zip64 extension use to apply.
+		/// </summary>
+		UseZip64 useZip64_ = UseZip64.Off;
+
 		/// <summary>
 		/// Has user already seen help output?
 		/// </summary>

diff --git a/samples/cs/tar/AssemblyInfo.cs b/samples/cs/tar/AssemblyInfo.cs
@@ -23,7 +23,7 @@
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly: AssemblyVersion("0.85.3.365")]
+[assembly: AssemblyVersion("0.85.4.369")]
 
 // The following attributes specify the key for the sign of your assembly. See the
 // .NET Framework documentation for more information about signing.

diff --git a/samples/cs/zf/AssemblyInfo.cs b/samples/cs/zf/AssemblyInfo.cs
@@ -26,7 +26,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("0.85.3.365")]
+[assembly: AssemblyVersion("0.85.4.369")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the