Skip to content

Commit 3e2b3da

Browse files
author
Jeffrey Cameron
committed
#48 Added package creation to the build script and #20 added ILMerge support for all outputs to the build script
1 parent a550971 commit 3e2b3da

File tree

4 files changed

+49
-24
lines changed

4 files changed

+49
-24
lines changed

NuGetPackAll.cmd

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
cd src\Pickles
2-
cd Pickles
3-
call NugetPack.cmd %1
4-
cd ..\Pickles.CommandLine
5-
call NugetPack.cmd
6-
cd ..\Pickles.MsBuild
7-
call NugetPack.cmd
8-
cd ..\Pickles.NAnt
9-
call NugetPack.cmd
10-
cd \..\..
1+
pushd src\Pickles\Pickles.CommandLine && ..\.nuget\nuget.exe pack Pickles.CommandLine.csproj -Properties Configuration=Release
2+
popd
3+
pushd src\Pickles\Pickles.MSBuild && ..\.nuget\nuget.exe pack Pickles.MSBuild.csproj -Properties Configuration=Release
4+
popd
5+
pushd src\Pickles\Pickles.NAnt && ..\.nuget\nuget.exe pack Pickles.NAnt.csproj -Properties Configuration=Release
6+
popd
7+
pushd src\Pickles\Pickles.PowerShell && ..\.nuget\nuget.exe pack Pickles.nuspec -Version 0.3
8+
popd

project.build

+40-13
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,14 @@
3131
<property name="version" value="${version.major}.${version.minor}.${build.number}.0" />
3232
<property name="msbuild.dir" value="C:\Windows\Microsoft.NET\Framework\v4.0.30319" />
3333
<property name="ilmerge.dir" value="${environment::get-variable('ProgramFiles')}\Microsoft\ILMerge" />
34+
<property name="nuget.dir" value="src\Pickles\.nuget" />
3435
<property name="framework.dir" value="${msbuild.dir}" />
3536
<property name="assemblies.dir" value="C:\dev\pickles\src\Pickles\Pickles.CommandLine\bin\Release" />
3637
<property name="assemblies.console.dir" value="src\Pickles\Pickles.CommandLine\bin\Release" />
3738
<property name="assemblies.msbuild.dir" value="src\Pickles\Pickles.MSBuild\bin\Release" />
3839
<property name="assemblies.nant.dir" value="src\Pickles\Pickles.NAnt\bin\Release" />
40+
<property name="assemblies.powershell.dir" value="src\Pickles\Pickles.Powershell\bin\Release" />
41+
<property name="nuspec.powershell.dir" value="src\Pickles\Pickles.PowerShell\Pickles.nuspec" />
3942
<property name="merged.dir" value="merged" />
4043
<property name="deploy.dir" value="deploy" />
4144
<property name="report.dir" value="reports" />
@@ -70,48 +73,70 @@
7073
</exec>
7174
</target>
7275

73-
<target name="merge" depends="test">
76+
<target name="merge" depends="build">
77+
<delete>
78+
<fileset>
79+
<include name="${merged.dir}\merge.*.log" />
80+
</fileset>
81+
</delete>
82+
7483
<exec program="ilmerge.exe" basedir="${ilmerge.dir}">
75-
<arg value="/targetplatform=v4,${framework.dir}"/>
7684
<arg value="/out=${merged.dir}\Pickles.exe"/>
7785
<arg value="/target=exe"/>
78-
<arg value="/closed"/>
7986
<arg value="/ndebug"/>
80-
<arg value="/xmldocs"/>
8187
<arg value="/wildcards"/>
8288
<arg value="/allowDup"/>
83-
<arg value="/log:${merged.dir}\merge.console.log" />
89+
<arg value="/log:${merged.dir}\merge.exe.log" />
90+
<arg value="${assemblies.console.dir}\Pickles.CommandLine.exe"/>
8491
<arg value="${assemblies.console.dir}\*.dll"/>
8592
</exec>
8693

8794
<exec program="ilmerge.exe" basedir="${ilmerge.dir}">
88-
<arg value="/targetplatform=v4,${framework.dir}"/>
8995
<arg value="/out=${merged.dir}\Pickles.MSBuild.Tasks.dll"/>
9096
<arg value="/target=dll"/>
91-
<arg value="/closed"/>
9297
<arg value="/ndebug"/>
93-
<arg value="/xmldocs"/>
9498
<arg value="/wildcards"/>
9599
<arg value="/allowDup"/>
96100
<arg value="/log:${merged.dir}\merge.msbuild.log" />
101+
<arg value="${assemblies.msbuild.dir}\Pickles.MSBuild.Tasks.dll"/>
97102
<arg value="${assemblies.msbuild.dir}\*.dll"/>
98103
</exec>
99104

100105
<exec program="ilmerge.exe" basedir="${ilmerge.dir}">
101-
<arg value="/targetplatform=v4,${framework.dir}"/>
102106
<arg value="/out=${merged.dir}\Pickles.NAnt.Tasks.dll"/>
103107
<arg value="/target=dll"/>
104-
<arg value="/closed"/>
105108
<arg value="/ndebug"/>
106-
<arg value="/xmldocs"/>
107109
<arg value="/wildcards"/>
108110
<arg value="/allowDup"/>
109111
<arg value="/log:${merged.dir}\merge.nant.log" />
112+
<arg value="${assemblies.nant.dir}\Pickles.NAnt.Tasks.dll"/>
110113
<arg value="${assemblies.nant.dir}\*.dll"/>
111114
</exec>
115+
116+
<exec program="ilmerge.exe" basedir="${ilmerge.dir}">
117+
<arg value="/out=${merged.dir}\Pickles.PowerShell.dll"/>
118+
<arg value="/target=dll"/>
119+
<arg value="/ndebug"/>
120+
<arg value="/wildcards"/>
121+
<arg value="/allowDup"/>
122+
<arg value="/log:${merged.dir}\merge.powershell.log" />
123+
<arg value="${assemblies.powershell.dir}\Pickles.Powershell.dll"/>
124+
<arg value="${assemblies.powershell.dir}\*.dll"/>
125+
</exec>
126+
</target>
127+
128+
<target name="pack" depends="build">
129+
<exec program="nuget.exe" basedir="${nuget.dir}">
130+
<arg value="Pack"/>
131+
<arg value="-Version"/>
132+
<arg value="${version}" />
133+
<arg value="-OutputDirectory"/>
134+
<arg value="${deploy.dir}"/>
135+
<arg value="${nuspec.powershell.dir}"/>
136+
</exec>
112137
</target>
113138

114-
<target name="zip" depends="test">
139+
<target name="zip" depends="merge">
115140
<zip zipfile="${deploy.dir}\pickles-${version}.zip">
116141
<fileset basedir="${assemblies.console.dir}" prefix="pickles-${version}\exe">
117142
<include name="**/*" />
@@ -121,8 +146,10 @@
121146
</fileset>
122147
<fileset basedir="${assemblies.nant.dir}" prefix="pickles-${version}\nant">
123148
<include name="**/*" />
149+
</fileset>
150+
<fileset basedir="${assemblies.powershell.dir}" prefix="pickles-${version}\powershell">
151+
<include name="**/*" />
124152
</fileset>
125153
</zip>
126154
</target>
127-
128155
</project>

src/Pickles/.nuget/NuGet.exe

1.5 KB
Binary file not shown.

src/Pickles/VersionInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
[assembly: AssemblyCompany("Pickles")]
2020
[assembly: AssemblyProduct("Pickles")]
21-
[assembly: AssemblyCopyright("Copyright © Jeffrey Cameron 2010-2012")]
21+
[assembly: AssemblyCopyright("Copyright Jeffrey Cameron 2010-2012")]
2222
[assembly: AssemblyTrademark("")]
2323
[assembly: AssemblyCulture("")]
2424

0 commit comments

Comments
 (0)