Skip to content

Commit 9883271

Browse files
committedApr 18, 2017
Rename lgpl.txt to LICENSE.txt
- Move and rename gfdl.txt to doc/LICENSE.txt - Clarify which license is for what part of the software - Minor fixes to include correct licenses into ZIP files
1 parent 9fd9d4b commit 9883271

8 files changed

+14
-14
lines changed
 

‎lgpl.txt ‎LICENSE.txt

File renamed without changes.

‎README.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,13 @@ can be found [here][C2].
4646
Licenses
4747
--------
4848

49-
This software is distributed under the terms of the Free Software Foundation [Lesser GNU Public License (LGPL), version 2.1][D1] (see lgpl.txt).
49+
- This software is distributed under the terms of the Free Software Foundation [Lesser GNU Public License (LGPL), version 2.1][D1] (see [LICENSE.txt][D2]).
50+
- The documentation for this software is distributed under the terms of the Free Software Foundation [GNU Free Documentation License (GNU FDL), version 1.1][D3] (see [doc/LICENSE.txt][D4]).
5051

5152
[D1]: http://www.gnu.org/licenses/lgpl-2.1-standalone.html
53+
[D2]: LICENSE.txt
54+
[D3]: http://www.gnu.org/licenses/old-licenses/fdl-1.1-standalone.html
55+
[D4]: doc/LICENSE.txt
5256

5357
Credits
5458
-------

‎default.build

+3-7
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@
7878
<foreach item="String" delim=" " property="framework" in="${supported.frameworks}">
7979
<call target="set-${framework}-framework-configuration" />
8080
<call target="build" />
81-
<!-- Copy and rename the license -->
82-
<copy file="lgpl.txt" tofile="${bin.dir}/NHibernate.license.txt" />
8381
</foreach>
8482

8583
<!-- Reset the current framework to the saved value -->
@@ -124,10 +122,9 @@
124122
<include name="build-common/**" />
125123

126124
<include name="*.build" />
127-
<include name="gfdl.txt" />
128-
<include name="lgpl.txt" />
125+
<include name="LICENSE.txt" />
129126
<include name="releasenotes.txt" />
130-
<include name="readme.html" />
127+
<include name="README.md" />
131128

132129
<!-- exclude ReSharper stuff -->
133130
<exclude name="**/_ReSharper*/**" />
@@ -170,8 +167,7 @@
170167
<property name="bin-pack.tests" value="${bin-pack.tmpdir}/Tests" />
171168

172169
<copy file="releasenotes.txt" todir="${bin-pack.tmpdir}"/>
173-
<copy file="lgpl.txt" todir="${bin-pack.tmpdir}/NHibernate.license.txt"/>
174-
<copy file="gfdl.txt" todir="${bin-pack.tmpdir}"/>
170+
<copy file="LICENSE.txt" todir="${bin-pack.tmpdir}"/>
175171
<copy file="HowInstall.txt" todir="${bin-pack.tmpdir}"/>
176172

177173
<exec program="CScript.exe"

‎gfdl.txt ‎doc/LICENSE.txt

File renamed without changes.

‎doc/documentation.build

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
<target name="manual" depends="init">
2828
<property name="lang" value="en" />
29+
<copy file="LICENSE.txt" todir="${doc.out.dir}"/>
2930
<nant target="build" buildfile="reference/reference.build">
3031
<properties>
3132
<property name="lang" value="${lang}" />

‎src/NHibernate.Everything.sln

+2-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NAnt Build", "NAnt Build",
3535
EndProject
3636
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Information", "Information", "{1631B0BA-59AC-4F0D-B300-3F64CC7579C9}"
3737
ProjectSection(SolutionItems) = preProject
38-
..\gfdl.txt = ..\gfdl.txt
39-
..\lgpl.txt = ..\lgpl.txt
40-
..\readme.html = ..\readme.html
38+
..\LICENSE.txt = ..\LICENSE.txt
39+
..\README.md = ..\README.md
4140
..\releasenotes.txt = ..\releasenotes.txt
4241
..\sample build commands.txt = ..\sample build commands.txt
4342
..\ShowBuildMenu.bat = ..\ShowBuildMenu.bat

‎src/NHibernate/NHibernate.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
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"/>
26-
<copy file="${root.dir}/lgpl.txt" tofile="${nuget.workingdir}/NHibernate.license.txt"/>
26+
<copy file="${root.dir}/LICENSE.txt" tofile="${nuget.workingdir}/NHibernate.license.txt"/>
2727
<copy todir="${nuget.workingdir}">
2828
<fileset basedir="${root.dir}/src/NHibernate">
2929
<include name="*.xsd" />

‎src/NHibernate/NHibernate.nuspec.template

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<projectUrl>
2121
http://nhibernate.info
2222
</projectUrl>
23-
<iconUrl>https://raw.github.com/nhibernate/nhibernate-core/master/logo/NHibernate-NuGet.png</iconUrl>
24-
<licenseUrl>https://raw.github.com/nhibernate/nhibernate-core/master/lgpl.txt</licenseUrl>
23+
<iconUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/logo/NHibernate-NuGet.png</iconUrl>
24+
<licenseUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/LICENSE.txt</licenseUrl>
2525
</metadata>
2626
<files>
2727
<file src="NHibernate.dll" target="lib\net461" />

0 commit comments

Comments
 (0)