Skip to content

Commit e2fb150

Browse files
jfreillyjfreilly
committed
Updates to samples, build script and version.
1 parent e4ff385 commit e2fb150

File tree

16 files changed

+116
-51
lines changed

16 files changed

+116
-51
lines changed

‎SharpZlib.build‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22

33
<!-- Nant style build file for #ZipLib -->
44

@@ -63,13 +63,19 @@
6363

6464
<target name="build" description="Build the current source." depends="setup">
6565
<call target="build-${framework::get-target-framework()}" />
66+
<copy todir="bin" overwrite="True" >
67+
<fileset basedir="${build.output.dir}">
68+
<include name="${sharpziplib.name}.dll"/>
69+
</fileset>
70+
</copy>
6671
</target>
6772

6873
<target name="build-netcf-1.0" >
6974
<call target="build-net-1.1" />
7075
</target>
7176

7277
<target name="build-netcf-2.0" >
78+
<!-- The compiler for Microsoft .NET Compact Framework 2.0 does not support the /keyfile option. -->
7379
<call target="build-net-1.1" />
7480
</target>
7581

@@ -81,7 +87,7 @@
8187
debug="${debug}"
8288
checked="${checked}"
8389
define="${build.defines}"
84-
doc="${build.output.dir}/ICSharpCode.SharpZipLib.xml"
90+
doc="${build.output.dir}/ICSharpCode.SharpZipLib.xml"
8591
>
8692
<sources basedir="src">
8793
<include name="**/*.cs"/>
@@ -91,8 +97,6 @@
9197
<include name="System.dll" />
9298
</references>
9399
</csc>
94-
95-
<call target="build-samples" />
96100
</target>
97101

98102

@@ -116,8 +120,6 @@
116120
<include name="System.dll" />
117121
</references>
118122
</csc>
119-
120-
<call target="build-samples" />
121123
</target>
122124

123125
<target name="build-mono-1.0" >

‎mkDistribution.bat‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,20 @@ if exist current (
66

77
mkdir current
88

9-
mkdir current\net-20
10-
nant -t:net-2.0 -D:build.output.dir=current\net-20 -buildfile:sharpZLib.build build
11-
12-
mkdir current\net-11
13-
nant -t:net-1.1 -D:build.output.dir=current\net-11 -buildfile:sharpZLib.build build
14-
159
mkdir current\netcf-10
1610
nant -t:netcf-1.0 -D:build.output.dir=current\netcf-10 -buildfile:sharpZLib.build build
1711

1812
mkdir current\netcf-20
1913
nant -t:netcf-2.0 -D:build.output.dir=current\netcf-20 -buildfile:sharpZLib.build build
2014

21-
@echo todo generate documentation and the rest of the distribution image.
15+
mkdir current\net-11
16+
nant -t:net-1.1 -D:build.output.dir=current\net-11 -buildfile:sharpZLib.build build
17+
18+
mkdir current\net-20
19+
nant -t:net-2.0 -D:build.output.dir=current\net-20 -buildfile:sharpZLib.build build
20+
21+
@echo todo generate documentation and the rest of the distribution image.
22+
samples\cs\bin\sz -rc SharpZipLib.zip current\*.dll
23+
REM Compress source to SharpZipLib_SourceSamples.zip
24+
REM Build CHM file
25+
REM Build Bin Zip files

‎samples/cs/CreateZipFile/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyTrademark("")]
1111
[assembly: AssemblyCulture("")]
1212

13-
[assembly: AssemblyVersion("0.85.2.313")]
13+
[assembly: AssemblyVersion("0.85.2.324")]
1414

1515
[assembly: AssemblyDelaySign(false)]
1616
[assembly: AssemblyKeyFile("")]

‎samples/cs/FastZip/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// You can specify all values by your own or you can build default build and revision
2424
// numbers with the '*' character (the default):
2525

26-
[assembly: AssemblyVersion("0.85.2.313")]
26+
[assembly: AssemblyVersion("0.85.2.324")]
2727

2828
// The following attributes specify the key for the sign of your assembly. See the
2929
// .NET Framework documentation for more information about signing.

‎samples/cs/minibzip2/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyTrademark("")]
1111
[assembly: AssemblyCulture("")]
1212

13-
[assembly: AssemblyVersion("0.85.2.313")]
13+
[assembly: AssemblyVersion("0.85.2.324")]
1414

1515
[assembly: AssemblyDelaySign(false)]
1616
[assembly: AssemblyKeyFile("")]

‎samples/cs/minigzip/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyTrademark("")]
1111
[assembly: AssemblyCulture("")]
1212

13-
[assembly: AssemblyVersion("0.85.2.313")]
13+
[assembly: AssemblyVersion("0.85.2.324")]
1414

1515
[assembly: AssemblyDelaySign(false)]
1616
[assembly: AssemblyKeyFile("")]

‎samples/cs/samples.build‎

Lines changed: 83 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,28 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0"?>
22

33
<project name="SharpZipLib C# Examples" default="build" basedir=".">
44

55
<property name="build.dir" value="bin" />
66

7-
<target name="setup">
8-
<echo message="Setup"/>
9-
<copy todir="${build.dir}">
10-
<fileset basedir="../../bin">
11-
<include name="ICSharpCode.SharpZipLib.dll"/>
12-
</fileset>
13-
</copy>
14-
</target>
15-
167
<target name="build" depends="setup" description="Build samples" >
178

189
<!-- compile CreateZipFile example -->
19-
<echo message="Building CreateZipFile example"/>
10+
<echo message="Building CreateZipFile example ${build.defines}"/>
2011

2112
<csc
2213
target="exe"
2314
output="${build.dir}/createzipfile.exe"
24-
debug="False">
15+
define="${build.defines}"
16+
debug="False" >
2517

2618
<sources basedir="CreateZipFile">
2719
<include name="**/*.cs"/>
2820
</sources>
2921

3022
<references basedir="bin">
3123
<include name="ICSharpCode.SharpZipLib.dll"/>
24+
<include name="mscorlib.dll" />
25+
<include name="System.dll" />
3226
</references>
3327
</csc>
3428

@@ -37,131 +31,158 @@
3731
<csc
3832
target="exe"
3933
output="${build.dir}/minigzip.exe"
40-
debug="False">
34+
define="${build.defines}"
35+
debug="False" >
4136

4237
<sources basedir="minigzip">
4338
<include name="**/*.cs"/>
4439
</sources>
4540
<references basedir="bin">
4641
<include name="ICSharpCode.SharpZipLib.dll"/>
42+
<include name="mscorlib.dll" />
43+
<include name="System.dll" />
4744
</references>
4845
</csc>
4946

5047
<!-- compile sz archiver example -->
5148
<echo message="Building sz example"/>
5249
<csc
5350
target="exe"
51+
define="${build.defines}"
5452
output="${build.dir}/sz.exe"
55-
debug="False">
53+
debug="False" >
5654

5755
<sources basedir="sz">
5856
<include name="**/*.cs"/>
5957
</sources>
6058
<references basedir="bin">
6159
<include name="ICSharpCode.SharpZipLib.dll"/>
60+
<include name="mscorlib.dll" />
61+
<include name="System.dll" />
6262
</references>
6363
</csc>
6464

6565
<!-- compile viewzipfile example -->
6666
<echo message="Building viewzipfile example"/>
6767
<csc
6868
target="exe"
69+
define="${build.defines}"
6970
output="${build.dir}/viewzipfile.exe"
70-
debug="False">
71+
debug="False" >
7172

7273
<sources basedir="viewzipfile">
7374
<include name="**/*.cs"/>
7475
</sources>
7576
<references basedir="bin">
7677
<include name="ICSharpCode.SharpZipLib.dll"/>
78+
<include name="mscorlib.dll" />
79+
<include name="System.dll" />
7780
</references>
7881
</csc>
7982

8083
<!-- compile unzipfile example -->
8184
<echo message="Building unzipfile example"/>
8285
<csc
8386
target="exe"
87+
define="${build.defines}"
8488
output="${build.dir}/unzipfile.exe"
85-
debug="False">
89+
debug="False" >
8690

8791
<sources basedir="unzipfile">
8892
<include name="**/*.cs"/>
8993
</sources>
9094
<references basedir="bin">
9195
<include name="ICSharpCode.SharpZipLib.dll"/>
96+
<include name="mscorlib.dll" />
97+
<include name="System.dll" />
9298
</references>
9399
</csc>
94100

95101
<!-- compile minibzip2 example -->
96102
<echo message="Building minibzip2 example"/>
97103
<csc
98104
target="exe"
105+
define="${build.defines}"
99106
output="${build.dir}/minibzip2.exe"
100-
debug="False">
107+
debug="False" >
101108

102109
<sources basedir="minibzip2">
103110
<include name="**/*.cs"/>
104111
</sources>
105112
<references basedir="bin">
106113
<include name="ICSharpCode.SharpZipLib.dll"/>
114+
<include name="mscorlib.dll" />
115+
<include name="System.dll" />
107116
</references>
108117
</csc>
109118

110119
<!-- compile tar example -->
111120
<echo message="Building tar example"/>
112121
<csc
113122
target="exe"
123+
define="${build.defines}"
114124
output="${build.dir}/tar.exe"
115-
debug="False">
125+
debug="False" >
116126

117127
<sources basedir="tar">
118128
<include name="**/*.cs"/>
119129
</sources>
120130
<references basedir="bin">
121131
<include name="ICSharpCode.SharpZipLib.dll"/>
132+
<include name="mscorlib.dll" />
133+
<include name="System.dll" />
122134
</references>
123135
</csc>
124136

125137
<!-- compile zipfiletest example -->
126138
<echo message="Building zipfiletest example"/>
127139
<csc
128140
target="exe"
141+
define="${build.defines}"
129142
output="${build.dir}/zipfiletest.exe"
130-
debug="False">
143+
debug="False" >
131144

132145
<sources basedir="zipfiletest">
133146
<include name="**/*.cs"/>
134147
</sources>
135148
<references basedir="bin">
136149
<include name="ICSharpCode.SharpZipLib.dll"/>
150+
<include name="mscorlib.dll" />
151+
<include name="System.dll" />
137152
</references>
138153
</csc>
139154

140155
<!-- Compile zf sample -->
141156
<echo message="Building zf sample"/>
142157
<csc
143158
target="exe"
159+
define="${build.defines}"
144160
output="${build.dir}/zf.exe"
145-
debug="False">
161+
debug="False" >
146162
<sources basedir="zf">
147163
<include name="**/*.cs"/>
148164
</sources>
149165
<references basedir="bin">
150166
<include name="ICSharpCode.SharpZipLib.dll"/>
167+
<include name="mscorlib.dll" />
168+
<include name="System.dll" />
151169
</references>
152170
</csc>
153171

154172
<!-- Compile FastZip sample -->
155173
<echo message="Building FastZip sample"/>
156174
<csc
157175
target="exe"
176+
define="${build.defines}"
158177
output="${build.dir}/fastzip.exe"
159-
debug="False">
178+
debug="False" >
160179
<sources basedir="fastzip">
161180
<include name="**/*.cs"/>
162181
</sources>
163182
<references basedir="bin">
164183
<include name="ICSharpCode.SharpZipLib.dll"/>
184+
<include name="mscorlib.dll" />
185+
<include name="System.dll" />
165186
</references>
166187
</csc>
167188
</target>
@@ -177,4 +198,45 @@
177198

178199
<target name="rebuild" depends="clean, build" description="Rebuild samples" />
179200

201+
<target name="setup">
202+
<if test="${target::exists('setup-for-' + framework::get-target-framework())}">
203+
<call target="setup-for-${framework::get-target-framework()}" />
204+
</if>
205+
<copy todir="${build.dir}" overwrite="True" >
206+
<fileset basedir="../../bin">
207+
<include name="ICSharpCode.SharpZipLib.dll"/>
208+
</fileset>
209+
</copy>
210+
</target>
211+
212+
<target name="setup-for-net-1.0">
213+
<property name="build.defines" value="AUTOBUILD,NET,NET_1_0" />
214+
</target>
215+
216+
<target name="setup-for-net-1.1">
217+
<property name="build.defines" value="AUTOBUILD,NET,NET_1_1" />
218+
</target>
219+
220+
<target name="setup-for-net-2.0">
221+
<property name="build.defines" value="AUTOBUILD,NET,NET_2_0" />
222+
</target>
223+
224+
<target name="setup-for-netcf-1.0">
225+
<property name="build.defines" value="AUTOBUILD,NETCF,NETCF_1_0" />
226+
</target>
227+
228+
<target name="setup-for-netcf-2.0">
229+
<property name="build.defines" value="AUTOBUILD,NETCF,NETCF_2_0" />
230+
</target>
231+
232+
<!-- Mono has not actually been used or tested please let us know if you use Mono! -->
233+
<target name="setup-for-mono-1.0">
234+
<property name="build.defines" value="AUTOBUILD,MONO,MONO_1_0" />
235+
</target>
236+
237+
<target name="setup-for-mono-2.0">
238+
<property name="build.defines" value="AUTOBUILD,MONO,MONO_2_0" />
239+
</target>
240+
241+
180242
</project>

‎samples/cs/sz/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// You can specify all values by your own or you can build default build and revision
2424
// numbers with the '*' character (the default):
2525

26-
[assembly: AssemblyVersion("0.85.2.313")]
26+
[assembly: AssemblyVersion("0.85.2.324")]
2727

2828
// The following attributes specify the key for the sign of your assembly. See the
2929
// .NET Framework documentation for more information about signing.

‎samples/cs/sz/sz.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@
3636
</PropertyGroup>
3737
<ItemGroup>
3838
<Reference Include="System" />
39-
<Reference Include="System.Data" />
40-
<Reference Include="System.Drawing" />
41-
<Reference Include="System.Windows.Forms" />
42-
<Reference Include="System.Xml" />
4339
<Reference Include="ICSharpCode.SharpZipLib">
4440
<HintPath>..\..\..\bin\ICSharpCode.SharpZipLib.dll</HintPath>
4541
<Private>True</Private>

0 commit comments

Comments
 (0)