diff options
| author | Charles E. Rolke <chug@apache.org> | 2013-11-05 19:59:34 +0000 |
|---|---|---|
| committer | Charles E. Rolke <chug@apache.org> | 2013-11-05 19:59:34 +0000 |
| commit | b954722055b283f5f206482f06fb32a095fe8e22 (patch) | |
| tree | 3995c84471a332544be7df793c2faed346a4b390 /qpid/cpp | |
| parent | f9808a83e93e1972c615c13edc344b675986420a (diff) | |
| download | qpid-python-b954722055b283f5f206482f06fb32a095fe8e22.tar.gz | |
QPID-5261: adjust winsdk packager to find objects in new places
QPID-5262: don't ship Debug msvc runtime dlls
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1539113 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/bld-winsdk.ps1 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/qpid/cpp/bld-winsdk.ps1 b/qpid/cpp/bld-winsdk.ps1 index 671123c17f..2f00f203dd 100644 --- a/qpid/cpp/bld-winsdk.ps1 +++ b/qpid/cpp/bld-winsdk.ps1 @@ -212,9 +212,10 @@ function BuildAPlatform # Move target must be a directory $move=( ('bin/*.lib', 'lib'), - ('bin/boost/*-gd-*.dll', 'bin/Debug'), - ('bin/boost/*.dll', 'bin/Release'), + ('bin/*-gd-*.dll', 'bin/Debug'), + ('bin/boost*.dll', 'bin/Release'), ('bin/Microsoft*', 'bin/Release'), + ('bin/msvc*d.dll', 'bin/Debug') , ('bin/msvc*.dll', 'bin/Release') , ('bin/*d.dll', 'bin/Debug'), ('bin/*.dll', 'bin/Release'), @@ -240,17 +241,16 @@ function BuildAPlatform 'bin/qpidxarm*.*', 'bin/*PDB/qmfengine*.*', 'bin/*PDB/qpidxarm*.*', - 'bin/boost_regex*.*', - 'bin/boost', 'bin/*.exe', 'bin/qmf-gen', - 'bin/qpidt', + 'bin/Debug/msvc*', 'conf', 'examples/*.sln', 'examples/*.vcproj', 'examples/messaging/*.vcproj', 'include', - 'plugins') + 'plugins', + 'lib/pkgconfig') # Move some files around in the install tree foreach ($pattern in $move) { @@ -326,10 +326,10 @@ function BuildAPlatform "cmake -G ""$cmakeGenerator"" ." | Out-File -filepath $dst -encoding ASCII -append # Zip the /bin PDB files
- &'7z' a -mx9 ".\$install_dir\bin\Debug\symbols-debug.zip" ".\$install_dir\bin\DebugPDB\*.pdb" - &'7z' a -mx9 ".\$install_dir\bin\Release\symbols-release.zip" ".\$install_dir\bin\ReleasePDB\*.pdb" - Remove-Item -recurse ".\$install_dir\bin\DebugPDB" - Remove-Item -recurse ".\$install_dir\bin\ReleasePDB" + &'7z' a -mx9 ".\$install_dir\bin\Debug\symbols-debug.zip" ".\$install_dir\lib\DebugPDB\*.pdb" + &'7z' a -mx9 ".\$install_dir\bin\Release\symbols-release.zip" ".\$install_dir\lib\ReleasePDB\*.pdb" + Remove-Item -recurse ".\$install_dir\lib\DebugPDB" + Remove-Item -recurse ".\$install_dir\lib\ReleasePDB" # Copy the dotnet bindings Copy-Item -force -path "./src/Debug/org.apache.qpid.messaging*.dll" -destination "$install_dir/bin/Debug/" |