Skip to content

Commit

Permalink
Update build to work better with git
Browse files Browse the repository at this point in the history
  • Loading branch information
jjeffery committed Apr 17, 2014
1 parent 7365c1c commit 14a34ed
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CommonAssemblyInfo.cs
*.Net35.csproj
temp
artifacts
version.txt

# User-specific files
*.suo
Expand Down
14 changes: 12 additions & 2 deletions build/Quokka.build
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@

<property name="product.version" value="${environment::get-variable('BUILD_NUMBER')}" if="${environment::variable-exists('BUILD_NUMBER')}"/>
<property name="product.version" value="0.1.0.0" overwrite="false"/>
<echo message="product.version: ${product.version}"/>
<property name="vcs.version" value="${environment::get-variable('BUILD_VCS_NUMBER')" if="${environment::variable-exists('BUILD_VCS_NUMBER')}"/>
<property name="vcs.version" value="unknown" overwrite="false"/>
<echo message="product.version: ${product.version}"/>
<echo message="vcs.version: ${vcs.version}"/>


<!-- parse the product.version for the major, minor, build and revision -->
<property name="version.major" value="${version::get-major(version::parse(product.version))}"/>
Expand Down Expand Up @@ -161,7 +165,13 @@
<echo message="##teamcity[publishArtifacts '${zip.file.path}']"/>
</target>

<target name="nuget" depends="artifacts.directory,codesign.assemblies">
<target name="version.txt" depends="timestamp">
<echo file="${root.dir}/version.txt" message="Version: ${full.product.version}&#13;&#10;"/>
<echo file="${root.dir}/version.txt" message="Git revision: ${vcs.version}&#13;&#10;" append="true"/>
<echo file="${root.dir}/version.txt" message="Build timestamp: ${build.timestamp}&#13;&#10;" append="true"/>
</target>

<target name="nuget" depends="artifacts.directory,codesign.assemblies,version.txt">
<nant buildfile="nuget/nuget.build" target="pack">
<properties>
<property name="project.name" value="Quokka.Core"/>
Expand Down
3 changes: 2 additions & 1 deletion build/nuget/nuget.build
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
<mkdir dir="${temp.dir}/nuget/${project.name}"/>
<copy file="${src.dir}/${project.name}/${project.name}.nuspec" todir="${temp.dir}/nuget/${project.name}"/>
<copy file="${root.dir}/license.txt" todir="${temp.dir}/nuget/${project.name}"/>
<mkdir dir="${temp.dir}/nuget/${project.name}/lib/net40-client"/>
<copy file="${root.dir}/version.txt" todir="${temp.dir}/nuget/${project.name}"/>
<mkdir dir="${temp.dir}/nuget/${project.name}/lib/net40-client"/>
<copy todir="${temp.dir}/nuget/${project.name}/lib/net40-client">
<fileset basedir="${bin.dir}">
<include name="${project.name}.dll"/>
Expand Down

0 comments on commit 14a34ed

Please sign in to comment.