Skip to content

Commit 0c60e0a

Browse files
ngbrownngbrown
committed
NH-4008 - Normalize spaces and tabs in build files.
1 parent 675ec72 commit 0c60e0a

File tree

2 files changed

+75
-75
lines changed

2 files changed

+75
-75
lines changed

‎default.build

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -192,19 +192,19 @@
192192
<!-- Tests -->
193193
<copy file="${bin.dir}/TestEmbeddedConfig.cfg.xml" todir="${bin-pack.tests}"/>
194194
<copy file="${bin.dir}/ABC.hbm.xml" todir="${bin-pack.tests}"/>
195-
<copy todir="${bin-pack.tests}/DbScripts">
196-
<fileset basedir="${root.dir}/src/NHibernate.Test/DbScripts">
197-
<include name="*.sql" />
198-
</fileset>
199-
</copy>
200-
<copy todir="${bin-pack.tests}">
195+
<copy todir="${bin-pack.tests}/DbScripts">
196+
<fileset basedir="${root.dir}/src/NHibernate.Test/DbScripts">
197+
<include name="*.sql" />
198+
</fileset>
199+
</copy>
200+
<copy todir="${bin-pack.tests}">
201201
<fileset basedir="${bin.dir}">
202202
<include name="nunit*" />
203-
<include name="SharpTestsEx*" />
204-
<include name="NHibernate.Domain*" />
203+
<include name="SharpTestsEx*" />
204+
<include name="NHibernate.Domain*" />
205205
<include name="NHibernate.Test*" />
206-
<include name="log4net*" />
207-
</fileset>
206+
<include name="log4net*" />
207+
</fileset>
208208
</copy>
209209
</target>
210210

@@ -235,65 +235,65 @@
235235

236236
</target>
237237

238-
<fileset id="nugetfiles.all" basedir="src">
239-
<include name="NHibernate/NHibernate.build" />
240-
</fileset>
241-
242-
<target name="nuspec" depends="init nuget.set-properties" description="Create nuspec files">
243-
<nant target="nuspec">
244-
<buildfiles refid="nugetfiles.all" />
245-
</nant>
246-
</target>
247-
248-
<target name="nuget" depends="init binaries nuget.set-properties nuspec"
249-
description="Creates files for the release on nuget gallery.">
238+
<fileset id="nugetfiles.all" basedir="src">
239+
<include name="NHibernate/NHibernate.build" />
240+
</fileset>
241+
242+
<target name="nuspec" depends="init nuget.set-properties" description="Create nuspec files">
243+
<nant target="nuspec">
244+
<buildfiles refid="nugetfiles.all" />
245+
</nant>
246+
</target>
247+
248+
<target name="nuget" depends="init binaries nuget.set-properties nuspec"
249+
description="Creates files for the release on nuget gallery.">
250250

251-
<nant target="nuget">
252-
<buildfiles refid="nugetfiles.all" />
253-
</nant>
254-
255-
<mkdir dir="${nuget.nupackages.dir}" />
256-
<move todir="${nuget.nupackages.dir}">
257-
<fileset basedir="${nuget.workingdir}">
258-
<include name="*.nupkg" />
259-
</fileset>
260-
</move>
261-
</target>
262-
263-
<target name="nugetpushbat" depends="init binaries common.download-nuget nuget.set-properties nuspec nuget"
264-
description="Creates files for the release on nuget gallery.">
265-
266-
<copy file="${tools.dir}/NuGet.exe" todir="${nuget.nupackages.dir}"/>
267-
268-
<echo message="rem In order to use this bat you have to be sure you have executed 'nuget SetApiKey' ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="false"/>
269-
<foreach item="File" property="filename">
270-
<in>
271-
<items>
272-
<include name="${nuget.nupackages.dir}/*.nupkg"/>
273-
</items>
274-
</in>
275-
<do>
276-
<echo message="nuget push ${filename} ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="true"/>
277-
</do>
278-
</foreach>
279-
</target>
280-
281-
<target name="nugetpush" depends="init binaries common.download-nuget nuget.set-properties nuspec nuget"
282-
description="Push packages on nuget gallery.">
283-
<!-- In order to use this task you have to be sure you have executed 'nuget SetApiKey' -->
284-
<foreach item="File" property="filename">
285-
<in>
286-
<items>
287-
<include name="${nuget.nupackages.dir}/*.nupkg"/>
288-
</items>
289-
</in>
290-
<do>
291-
<exec basedir="${tools.dir}" workingdir="${nuget.nupackages.dir}" program="NuGet.exe">
292-
<arg value="push" />
293-
<arg value="${filename}" />
294-
</exec>
295-
</do>
296-
</foreach>
297-
</target>
251+
<nant target="nuget">
252+
<buildfiles refid="nugetfiles.all" />
253+
</nant>
254+
255+
<mkdir dir="${nuget.nupackages.dir}" />
256+
<move todir="${nuget.nupackages.dir}">
257+
<fileset basedir="${nuget.workingdir}">
258+
<include name="*.nupkg" />
259+
</fileset>
260+
</move>
261+
</target>
262+
263+
<target name="nugetpushbat" depends="init binaries common.download-nuget nuget.set-properties nuspec nuget"
264+
description="Creates files for the release on nuget gallery.">
265+
266+
<copy file="${tools.dir}/NuGet.exe" todir="${nuget.nupackages.dir}"/>
267+
268+
<echo message="rem In order to use this bat you have to be sure you have executed 'nuget SetApiKey' ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="false"/>
269+
<foreach item="File" property="filename">
270+
<in>
271+
<items>
272+
<include name="${nuget.nupackages.dir}/*.nupkg"/>
273+
</items>
274+
</in>
275+
<do>
276+
<echo message="nuget push ${filename} ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="true"/>
277+
</do>
278+
</foreach>
279+
</target>
280+
281+
<target name="nugetpush" depends="init binaries common.download-nuget nuget.set-properties nuspec nuget"
282+
description="Push packages on nuget gallery.">
283+
<!-- In order to use this task you have to be sure you have executed 'nuget SetApiKey' -->
284+
<foreach item="File" property="filename">
285+
<in>
286+
<items>
287+
<include name="${nuget.nupackages.dir}/*.nupkg"/>
288+
</items>
289+
</in>
290+
<do>
291+
<exec basedir="${tools.dir}" workingdir="${nuget.nupackages.dir}" program="NuGet.exe">
292+
<arg value="push" />
293+
<arg value="${filename}" />
294+
</exec>
295+
</do>
296+
</foreach>
297+
</target>
298298

299299
</project>

‎src/NHibernate/NHibernate.build

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

33
<project
4-
name="NHibernate"
5-
default="build"
6-
xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd"
4+
name="NHibernate"
5+
default="build"
6+
xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd"
77
>
88

99
<property name="nuspec.destination.filename" value="NHibernate.nuspec" />
1010
<property name="root.dir" value="../.." />
11-
<include buildfile="${root.dir}/build-common/common-project.xml" />
11+
<include buildfile="${root.dir}/build-common/common-project.xml" />
1212

1313
<target name="nuspec" depends="common.init nuget.set-properties" description="Create nuspec for NHibernate">
1414
<property name="nuspec.destination.file" value="${nuget.workingdir}/${nuspec.destination.filename}" />
@@ -19,7 +19,7 @@
1919
<target name="nuget" depends="common.init common.download-nuget nuget.set-properties nuspec">
2020
<!-- Prepare working dir with file needed by NHibernate.nuspec -->
2121
<copy file="${bin.dir}/NHibernate.dll" todir="${nuget.workingdir}"/>
22-
<copy file="${bin.dir}/NHibernate.pdb" todir="${nuget.workingdir}"/>
22+
<copy file="${bin.dir}/NHibernate.pdb" todir="${nuget.workingdir}"/>
2323
<copy file="${bin.dir}/NHibernate.xml" todir="${nuget.workingdir}"/>
2424
<copy file="${root.dir}/releasenotes.txt" tofile="${nuget.workingdir}/NHibernate.releasenotes.txt"/>
2525
<exec program="CScript.exe" commandline="${root.dir}/Tools/showdown/showdown.wsf ${root.dir}/README.md ${nuget.workingdir}/NHibernate.readme.html"/>
@@ -37,7 +37,7 @@
3737

3838
<exec basedir="${tools.dir}" workingdir="${nuget.workingdir}" program="NuGet.exe">
3939
<arg value="pack" />
40-
<arg value="-symbols" />
40+
<arg value="-symbols" />
4141
<arg value="${nuspec.destination.filename}" />
4242
</exec>
4343
</target>

0 commit comments

Comments
 (0)