|
31 | 31 | <property name="version" value="${version.major}.${version.minor}.${build.number}.0" />
|
32 | 32 | <property name="msbuild.dir" value="C:\Windows\Microsoft.NET\Framework\v4.0.30319" />
|
33 | 33 | <property name="ilmerge.dir" value="${environment::get-variable('ProgramFiles')}\Microsoft\ILMerge" />
|
| 34 | + <property name="nuget.dir" value="src\Pickles\.nuget" /> |
34 | 35 | <property name="framework.dir" value="${msbuild.dir}" />
|
35 | 36 | <property name="assemblies.dir" value="C:\dev\pickles\src\Pickles\Pickles.CommandLine\bin\Release" />
|
36 | 37 | <property name="assemblies.console.dir" value="src\Pickles\Pickles.CommandLine\bin\Release" />
|
37 | 38 | <property name="assemblies.msbuild.dir" value="src\Pickles\Pickles.MSBuild\bin\Release" />
|
38 | 39 | <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" /> |
39 | 42 | <property name="merged.dir" value="merged" />
|
40 | 43 | <property name="deploy.dir" value="deploy" />
|
41 | 44 | <property name="report.dir" value="reports" />
|
|
70 | 73 | </exec>
|
71 | 74 | </target>
|
72 | 75 |
|
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 | + |
74 | 83 | <exec program="ilmerge.exe" basedir="${ilmerge.dir}">
|
75 |
| - <arg value="/targetplatform=v4,${framework.dir}"/> |
76 | 84 | <arg value="/out=${merged.dir}\Pickles.exe"/>
|
77 | 85 | <arg value="/target=exe"/>
|
78 |
| - <arg value="/closed"/> |
79 | 86 | <arg value="/ndebug"/>
|
80 |
| - <arg value="/xmldocs"/> |
81 | 87 | <arg value="/wildcards"/>
|
82 | 88 | <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"/> |
84 | 91 | <arg value="${assemblies.console.dir}\*.dll"/>
|
85 | 92 | </exec>
|
86 | 93 |
|
87 | 94 | <exec program="ilmerge.exe" basedir="${ilmerge.dir}">
|
88 |
| - <arg value="/targetplatform=v4,${framework.dir}"/> |
89 | 95 | <arg value="/out=${merged.dir}\Pickles.MSBuild.Tasks.dll"/>
|
90 | 96 | <arg value="/target=dll"/>
|
91 |
| - <arg value="/closed"/> |
92 | 97 | <arg value="/ndebug"/>
|
93 |
| - <arg value="/xmldocs"/> |
94 | 98 | <arg value="/wildcards"/>
|
95 | 99 | <arg value="/allowDup"/>
|
96 | 100 | <arg value="/log:${merged.dir}\merge.msbuild.log" />
|
| 101 | + <arg value="${assemblies.msbuild.dir}\Pickles.MSBuild.Tasks.dll"/> |
97 | 102 | <arg value="${assemblies.msbuild.dir}\*.dll"/>
|
98 | 103 | </exec>
|
99 | 104 |
|
100 | 105 | <exec program="ilmerge.exe" basedir="${ilmerge.dir}">
|
101 |
| - <arg value="/targetplatform=v4,${framework.dir}"/> |
102 | 106 | <arg value="/out=${merged.dir}\Pickles.NAnt.Tasks.dll"/>
|
103 | 107 | <arg value="/target=dll"/>
|
104 |
| - <arg value="/closed"/> |
105 | 108 | <arg value="/ndebug"/>
|
106 |
| - <arg value="/xmldocs"/> |
107 | 109 | <arg value="/wildcards"/>
|
108 | 110 | <arg value="/allowDup"/>
|
109 | 111 | <arg value="/log:${merged.dir}\merge.nant.log" />
|
| 112 | + <arg value="${assemblies.nant.dir}\Pickles.NAnt.Tasks.dll"/> |
110 | 113 | <arg value="${assemblies.nant.dir}\*.dll"/>
|
111 | 114 | </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> |
112 | 137 | </target>
|
113 | 138 |
|
114 |
| - <target name="zip" depends="test"> |
| 139 | + <target name="zip" depends="merge"> |
115 | 140 | <zip zipfile="${deploy.dir}\pickles-${version}.zip">
|
116 | 141 | <fileset basedir="${assemblies.console.dir}" prefix="pickles-${version}\exe">
|
117 | 142 | <include name="**/*" />
|
|
121 | 146 | </fileset>
|
122 | 147 | <fileset basedir="${assemblies.nant.dir}" prefix="pickles-${version}\nant">
|
123 | 148 | <include name="**/*" />
|
| 149 | + </fileset> |
| 150 | + <fileset basedir="${assemblies.powershell.dir}" prefix="pickles-${version}\powershell"> |
| 151 | + <include name="**/*" /> |
124 | 152 | </fileset>
|
125 | 153 | </zip>
|
126 | 154 | </target>
|
127 |
| - |
128 | 155 | </project>
|
0 commit comments