Skip to content

Commit

Permalink
fixing up build scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
@craiggwilson
craiggwilson committed Mar 20, 2013
1 parent 429beb2 commit f62e30d
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 83 deletions.
48 changes: 0 additions & 48 deletions Installer/Frameworks.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="INSTALLDIR">
<Directory Id="net35Folder" Name="net35" />
<Directory Id="net40Folder" Name="net40" />
</DirectoryRef>

<DirectoryRef Id="net35Folder">
<Component Id="c_net35BsonDll" Guid="13DA8DD9-1AD1-46BF-971A-78FA499F281D">
<File Id="f_net35BsonDll" Name="MongoDB.Bson.dll" Source="$(var.SourceBase)\artifacts\net35\build\MongoDB.Bson.dll"
DiskId ="1" KeyPath="yes" />
Expand Down Expand Up @@ -42,42 +37,6 @@
<ComponentRef Id="c_net35DriverXml"/>
</ComponentGroup>

<DirectoryRef Id="net40Folder">
<Component Id="c_net40BsonDll" Guid="ec7c163e-dfd7-4063-ba49-e91dcde34126">
<File Id="f_net40BsonDll" Name="MongoDB.Bson.dll" Source="$(var.SourceBase)\artifacts\net40\build\MongoDB.Bson.dll"
DiskId ="1" KeyPath="yes" />
</Component>
<Component Id="c_net40BsonPdb" Guid="26d1d6d9-13d7-435b-912b-efa23c562b8f">
<File Id="f_net40BsonPdb" Name="MongoDB.Bson.pdb" Source="$(var.SourceBase)\artifacts\net40\build\MongoDB.Bson.pdb"
DiskId ="1" KeyPath="yes" />
</Component>
<Component Id="c_net40BsonXml" Guid="8a703382-523e-4c5d-b84e-829ce17e74a8">
<File Id="f_net40BsonXml" Name="MongoDB.Bson.xml" Source="$(var.SourceBase)\artifacts\net40\build\MongoDB.Bson.XML"
DiskId ="1" KeyPath="yes" />
</Component>
<Component Id="c_net40DriverDll" Guid="05ed77f8-c1b9-49eb-a893-0144c2128593">
<File Id="f_net40DriverDll" Name="MongoDB.Driver.dll" Source="$(var.SourceBase)\artifacts\net40\build\MongoDB.Driver.dll"
DiskId ="1" KeyPath="yes" />
</Component>
<Component Id="c_net40DriverPdb" Guid="3f6d49e7-9f1f-4a2c-9512-a7fc8abfaf8c">
<File Id="f_net40DriverPdb" Name="MongoDB.Driver.pdb" Source="$(var.SourceBase)\artifacts\net40\build\MongoDB.Driver.pdb"
DiskId ="1" KeyPath="yes" />
</Component>
<Component Id="c_net40DriverXml" Guid="36054a9a-35cc-4f42-b52d-e46eec2965c4">
<File Id="f_net40DriverXml" Name="MongoDB.Driver.XML" Source="$(var.SourceBase)\artifacts\net40\build\MongoDB.Driver.XML"
DiskId ="1" KeyPath="yes" />
</Component>
</DirectoryRef>

<ComponentGroup Id="cg_net40">
<ComponentRef Id="c_net40BsonDll"/>
<ComponentRef Id="c_net40BsonPdb"/>
<ComponentRef Id="c_net40BsonXml"/>
<ComponentRef Id="c_net40DriverDll"/>
<ComponentRef Id="c_net40DriverPdb"/>
<ComponentRef Id="c_net40DriverXml"/>
</ComponentGroup>

<Feature Id="FrameworksFeature"
Title ="Frameworks"
Description="The supported frameworks."
Expand All @@ -90,13 +49,6 @@
AllowAdvertise="no">
<ComponentGroupRef Id="cg_net35" />
</Feature>
<Feature Id="net40Feature"
Title =".NET 4.0"
Description="Install support for .NET 4.0."
Level ="1"
AllowAdvertise="no">
<ComponentGroupRef Id="cg_net40" />
</Feature>
</Feature>
</Fragment>
</Wix>
14 changes: 7 additions & 7 deletions Installer/Product.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,18 @@
<Shortcut Id="f_ReleaseNotesShortCut"
Name="Release Notes"
Description="Release notes for MongoDB CSharp Driver"
Target="[INSTALLDIR]ReleaseNotes.txt"
Target="[INSTALLDIR]Release Notes.txt"
WorkingDirectory="INSTALLDIR"
Directory="CSharpDriverProgramsFolder"/>
<RemoveFolder Id="r_CSharpDriverProgramsFolder" Directory="CSharpDriverProgramsFolder" On="uninstall" />
<RemoveFolder Id="r_MongoDBProgramsFolder" Directory="MongoDBProgramsFolder" On="uninstall" />
<RemoveFolder Id="CSharpDriverProgramsFolder" Directory="CSharpDriverProgramsFolder" On="uninstall" />
<RemoveFolder Id="MongoDBProgramsFolder" Directory="MongoDBProgramsFolder" On="uninstall" />
<RegistryValue Root="HKCU" Key="Software\MongoDB" Name="releasenotesinstalled" Type="integer" Value="1" KeyPath="yes"/>
</Component>
<Component Id="c_HelpShortCut" Guid="B256E367-EA97-48C5-A546-49F4A0803682">
<Shortcut Id="f_HelpShortCut"
Name="Help"
Name="CSharpDriverDocs"
Description="Help for !(WixProductName)"
Target="[INSTALLDIR]Documentation.chm"
Target="[INSTALLDIR]CSharpDriverDocs.chm"
WorkingDirectory="INSTALLDIR"/>
<RegistryValue Root="HKCU" Key="Software\MongoDB" Name="helpinstalled" Type="integer" Value="1" KeyPath="yes"/>
</Component>
Expand All @@ -63,11 +63,11 @@
DiskId ="1" KeyPath="yes" />
</Component>
<Component Id="c_ReleaseNotes" Guid="115F1B08-8A38-435A-BBB0-0C0DED5ACB31">
<File Id="f_ReleaseNotes" Name="ReleaseNotes.txt" Source="$(var.SourceBase)\$(var.ReleaseNotes)"
<File Id="f_ReleaseNotes" Name="Release Notes.txt" Source="$(var.SourceBase)\$(var.ReleaseNotes)"
DiskId ="1" KeyPath="yes" />
</Component>
<Component Id="c_Help" Guid="CC3F9A2F-1C43-48CA-B998-D03C15181DD3">
<File Id="f_Help" Name="Help.chm" Source="$(var.SourceBase)\$(var.Documentation)"
<File Id="f_Help" Name="CSharpDriverDocs.chm" Source="$(var.SourceBase)\$(var.Documentation)"
DiskId ="1" KeyPath="yes" />
</Component>
</DirectoryRef>
Expand Down
35 changes: 13 additions & 22 deletions build.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@ Properties {

$version = "$base_version.$build_number"
$sem_version = $base_version
$short_version = Get-ShortenedVersion $sem_version
if(-not [string]::IsNullOrEmpty($version_status)) {
$sem_version = "$base_version-$($version_status)-$build_number"
$sem_version = "$sem_version-$($version_status)-$build_number"
$short_version = "$short_version-$($version_status)-$build_number"
}
$release_notes_version = Get-ShortenedVersion $base_version
$config = 'Release'
$installer_product_id = [System.Guid]::Parse($git_commit.Hash.SubString(0,32))
$installer_upgrade_code = [System.Guid]::Parse($git_commit.Hash.SubString(1,32))
$installer_product_id = New-Object System.Guid($git_commit.Hash.SubString(0,32))
$installer_upgrade_code = New-Object System.Guid($git_commit.Hash.SubString(1,32))

Write-Host "$config Version $sem_version($version)" -ForegroundColor Yellow

$base_dir = Split-Path $psake.build_script_file
$src_dir = "$base_dir"
$tools_dir = "$base_dir\tools"
Expand All @@ -31,7 +33,7 @@ Properties {
$docs_file = "$base_dir\Docs\Api\CSharpDriverDocs.shfbproj"
$installer_file = "$base_dir\Installer\CSharpDriverInstaller.wixproj"
$nuspec_file = "$base_dir\mongocsharpdriver.nuspec"
$chm_file = "$artifacts_dir\CSharpDriverDocs-$sem_version.chm"
$chm_file = "$artifacts_dir\CSharpDriverDocs-$short_version.chm"
$release_notes_file = "$base_dir\Release Notes\Release Notes v$release_notes_version.md"
$license_file = "$base_dir\License.txt"

Expand Down Expand Up @@ -107,8 +109,7 @@ Task Docs -precondition { BuildHasBeenRun } {

mv "$docs_dir\CSharpDriverDocs.chm" $chm_file
mv "$docs_dir\Index.html" "$docs_dir\index.html"
Exec { &$zip_tool a "$artifacts_dir\CSharpDriverDocs-$sem_version-html.zip" "$docs_dir\*" }

Exec { &$zip_tool a "$artifacts_dir\CSharpDriverDocs-$short_version-html.zip" "$docs_dir\*" }
RemoveDirectory $docs_dir
}

Expand All @@ -119,29 +120,19 @@ task Zip -precondition { (BuildHasBeenRun) -and (DocsHasBeenRun) }{

mkdir -p $zip_dir | out-null

mkdir -p $zip_dir\net35 | out-null
$35_items = @("$35_build_dir\MongoDB.Bson.dll", `
"$35_build_dir\MongoDB.Bson.pdb", `
"$35_build_dir\MongoDB.Bson.xml", `
"$35_build_dir\MongoDB.Driver.dll", `
"$35_build_dir\MongoDB.Driver.pdb", `
"$35_build_dir\MongoDB.Driver.xml")
cp $35_items "$zip_dir\net35"

mkdir -p $zip_dir\net40 | out-null
$40_items = @("$40_build_dir\MongoDB.Bson.dll", `
"$40_build_dir\MongoDB.Bson.pdb", `
"$40_build_dir\MongoDB.Bson.xml", `
"$40_build_dir\MongoDB.Driver.dll", `
"$40_build_dir\MongoDB.Driver.pdb", `
"$40_build_dir\MongoDB.Driver.xml")
cp $40_items "$zip_dir\net40"
cp $35_items "$zip_dir"

cp $license_file $zip_dir
cp "Release Notes\Release Notes v$release_notes_version.md" "$zip_dir\Release Notes v$release_notes_version.txt"
cp $chm_file $zip_dir
cp "Release Notes\Release Notes v$release_notes_version.md" "$zip_dir\Release Notes.txt"
cp $chm_file "$zip_dir\CSharpDriverDocs.chm"

Exec { &$zip_tool a "$artifacts_dir\CSharpDriver-$sem_version.zip" "$zip_dir\*" }
Exec { &$zip_tool a "$artifacts_dir\CSharpDriver-$short_version.zip" "$zip_dir\*" }

rd $zip_dir -rec -force | out-null
}
Expand All @@ -150,7 +141,7 @@ Task Installer -precondition { (BuildHasBeenRun) -and (DocsHasBeenRun) } {
$release_notes_relative_path = Get-Item $release_notes_file | Resolve-Path -Relative
$doc_relative_path = Get-Item $chm_file | Resolve-Path -Relative

Exec { msbuild "$installer_file" /t:Rebuild /p:Configuration=$config /p:Version=$version /p:SemVersion=$sem_version /p:ProductId=$installer_product_id /p:UpgradeCode=$installer_upgrade_code /p:ReleaseNotes=$release_notes_relative_path /p:License="License.rtf" /p:Documentation=$doc_relative_path /p:OutputPath=$artifacts_dir }
Exec { msbuild "$installer_file" /t:Rebuild /p:Configuration=$config /p:Version=$version /p:SemVersion=$short_version /p:ProductId=$installer_product_id /p:UpgradeCode=$installer_upgrade_code /p:ReleaseNotes=$release_notes_relative_path /p:License="License.rtf" /p:Documentation=$doc_relative_path /p:OutputPath=$artifacts_dir }

rm -force $artifacts_dir\*.wixpdb
}
Expand Down
6 changes: 0 additions & 6 deletions mongocsharpdriver.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,6 @@
<file src="artifacts\net35\build\MongoDB.Driver.dll" target="lib\net35" />
<file src="artifacts\net35\build\MongoDB.Driver.pdb" target="lib\net35" />
<file src="artifacts\net35\build\MongoDB.Driver.XML" target="lib\net35" />
<file src="artifacts\net40\build\MongoDB.Bson.dll" target="lib\net40" />

This comment has been minimized.

Sign in to view

Copy link
@JasonMyer

JasonMyer May 6, 2013

This seemed to have the effect of breaking bin deployment of mongocsharpdriver. Now you have to use the installer to GAC deploy the MongoDB binaries, it seems. Was that the intent of this commit?

This comment has been minimized.

Sign in to view

Copy link
@rstam

rstam May 6, 2013

Contributor

We are now building for .NET 3.5 and .NET 4.0, but we are still only shipping the 3.5 binaries.

I don't think anything has changed that would require you to use the installer or put the binaries in the GAC. What exactly is happening for you?
<file src="artifacts\net40\build\MongoDB.Bson.pdb" target="lib\net40" />
<file src="artifacts\net40\build\MongoDB.Bson.xml" target="lib\net40" />
<file src="artifacts\net40\build\MongoDB.Driver.dll" target="lib\net40" />
<file src="artifacts\net40\build\MongoDB.Driver.pdb" target="lib\net40" />
<file src="artifacts\net40\build\MongoDB.Driver.XML" target="lib\net40" />
<file src="License.rtf" target ="" />
<file src="MongoDB.Bson\**\*.cs" target="src\MongoDB.Bson" />
<file src="MongoDB.Driver\**\*.cs" target="src\MongoDB.Driver" />
Expand Down

0 comments on commit f62e30d

Please sign in to comment.