diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2015-02-17 17:25:57 +0000 |
|---|---|---|
| committer | <> | 2015-03-17 16:26:24 +0000 |
| commit | 780b92ada9afcf1d58085a83a0b9e6bc982203d1 (patch) | |
| tree | 598f8b9fa431b228d29897e798de4ac0c1d3d970 /dist/winmsi | |
| parent | 7a2660ba9cc2dc03a69ddfcfd95369395cc87444 (diff) | |
| download | berkeleydb-master.tar.gz | |
Diffstat (limited to 'dist/winmsi')
| -rw-r--r-- | dist/winmsi/build.bat | 22 | ||||
| -rw-r--r-- | dist/winmsi/db.wxs | 4 |
2 files changed, 14 insertions, 12 deletions
diff --git a/dist/winmsi/build.bat b/dist/winmsi/build.bat index 001c3afd..c6369606 100644 --- a/dist/winmsi/build.bat +++ b/dist/winmsi/build.bat @@ -1,14 +1,14 @@ @echo off :: Helper script to build BDB products for binary release :: Assumes current directory is <product>/dist -:: Current version of Visual Studio for binaries is 2005. +:: Current version of Visual Studio for binaries is 2008. :: This is enforced but if testing is desired for other releases -:: it's possible to cut/paste. +:: it's possible to edit. :: :: Try to find different versions of Visual Studio -call :TryBat "%VS80COMNTOOLS%\vsvars32.bat" && goto VS80 +::call :TryBat "%VS80COMNTOOLS%\vsvars32.bat" && goto VS80 call :TryBat "%VS90COMNTOOLS%\vsvars32.bat" && goto VS90 :: no luck @@ -30,24 +30,26 @@ echo Using Visual Studio format 8.0 (Visual Studio 2005) goto :eof :VS90 -@echo Windows binaries must be built using Visual Studio 2005 -@echo If you want to test VS2008, uncomment the goto line below. -@echo Note these build lines will not work with the express editions -@echo of VS which do not appear to include "devenv." +@echo Note these build commands will not work with the express +@echo editions of VS2008 which do not appear to include "devenv." @echo Express editions can be built with lines like: @echo "VCExpress Berkeley_DB.sln /build" or @echo "VCSExpress BDB_dotNet.sln /build" -goto :batnotfound +::goto :batnotfound @echo Using Visual Studio format 9.0 (Visual Studio 2008) @echo "" > winbld.out +@echo devenv /upgrade ..\build_windows\Berkeley_DB.sln +@devenv /upgrade ..\build_windows\Berkeley_DB.sln >> winbld.out @echo devenv /build Release ..\build_windows\Berkeley_DB.sln @devenv /build Release ..\build_windows\Berkeley_DB.sln >> winbld.out @echo devenv /build Release ..\build_windows\Berkeley_DB.sln /project VS8\db_java.vcproj @devenv /build Release ..\build_windows\Berkeley_DB.sln /project VS8\db_java.vcproj +@echo devenv /upgrade ..\build_windows\BDB_dotNet.sln +@devenv /upgrade ..\build_windows\BDB_dotNet.sln >> winbld.out @echo devenv /build Release ..\build_windows\BDB_dotNet.sln @devenv /build Release ..\build_windows\BDB_dotNet.sln >> winbld.out -@echo devenv /build Release ..\build_windows\VS8\db_sql_jdbc.vcproj -@devenv /build Release ..\build_windows\VS8\db_sql_jdbc.vcproj >> winbld.out +@echo devenv /build Release ..\build_windows\Berkeley_DB.sln /project VS8\db_sql_java.vcproj +@devenv /build Release ..\build_windows\Berkeley_DB.sln /project VS8\db_sql_java.vcproj >> winbld.out @echo devenv /build Release ..\build_windows\VS8\db_sql_odbc.vcproj @devenv /build Release ..\build_windows\VS8\db_sql_odbc.vcproj >> winbld.out goto :eof diff --git a/dist/winmsi/db.wxs b/dist/winmsi/db.wxs index a12bf3b6..a274daed 100644 --- a/dist/winmsi/db.wxs +++ b/dist/winmsi/db.wxs @@ -1,5 +1,5 @@ <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> - <Product Id='*' UpgradeCode='2df79540-9c19-11df-b5e4-00262db1b537' + <Product Id='*' UpgradeCode='89316d6e-b68c-11e3-8d9b-001d099e0a33' Name='@PRODUCT_NAME@' Version='@PROD_WIX_VERSION@' Manufacturer='Oracle' Language='1033'> @@ -12,7 +12,7 @@ Compressed='yes' Platform="x86" Languages="1033" SummaryCodepage="1252" /> <!-- The upgrade id should be the same to the UpgradeCode of the previous version you want upgrade --> - <Upgrade Id='529068a1-2ba8-11df-8e8e-00262db1b537'> + <Upgrade Id='2ef4dbf0-b1a7-11e2-af6c-001e4f951af2'> <UpgradeVersion OnlyDetect="yes" Minimum="@PROD_WIX_VERSION@" Property="NEWERFOUND" |