Skip to content

Commit e64a3ff

Browse files
ngbrownngbrown
committed
NH-4008 - Normalize spaces and tabs in build files.
1 parent 9f3c792 commit e64a3ff

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
@@ -196,19 +196,19 @@
196196
<!-- Tests -->
197197
<copy file="${bin.dir}/TestEnbeddedConfig.cfg.xml" todir="${bin-pack.tests}"/>
198198
<copy file="${bin.dir}/ABC.hbm.xml" todir="${bin-pack.tests}"/>
199-
<copy todir="${bin-pack.tests}/DbScripts">
200-
<fileset basedir="${root.dir}/src/NHibernate.Test/DbScripts">
201-
<include name="*.sql" />
202-
</fileset>
203-
</copy>
204-
<copy todir="${bin-pack.tests}">
199+
<copy todir="${bin-pack.tests}/DbScripts">
200+
<fileset basedir="${root.dir}/src/NHibernate.Test/DbScripts">
201+
<include name="*.sql" />
202+
</fileset>
203+
</copy>
204+
<copy todir="${bin-pack.tests}">
205205
<fileset basedir="${bin.dir}">
206206
<include name="nunit*" />
207-
<include name="SharpTestsEx*" />
208-
<include name="NHibernate.Domain*" />
207+
<include name="SharpTestsEx*" />
208+
<include name="NHibernate.Domain*" />
209209
<include name="NHibernate.Test*" />
210-
<include name="log4net*" />
211-
</fileset>
210+
<include name="log4net*" />
211+
</fileset>
212212
</copy>
213213
</target>
214214

@@ -242,65 +242,65 @@
242242

243243
</target>
244244

245-
<fileset id="nugetfiles.all" basedir="src">
246-
<include name="NHibernate/NHibernate.build" />
247-
</fileset>
248-
249-
<target name="nuspec" depends="init nuget.set-properties" description="Create nuspec files">
250-
<nant target="nuspec">
251-
<buildfiles refid="nugetfiles.all" />
252-
</nant>
253-
</target>
254-
255-
<target name="nuget" depends="init binaries nuget.set-properties nuspec"
256-
description="Creates files for the release on nuget gallery.">
245+
<fileset id="nugetfiles.all" basedir="src">
246+
<include name="NHibernate/NHibernate.build" />
247+
</fileset>
248+
249+
<target name="nuspec" depends="init nuget.set-properties" description="Create nuspec files">
250+
<nant target="nuspec">
251+
<buildfiles refid="nugetfiles.all" />
252+
</nant>
253+
</target>
254+
255+
<target name="nuget" depends="init binaries nuget.set-properties nuspec"
256+
description="Creates files for the release on nuget gallery.">
257257

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

306306
</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)