Changeset: ca9167fa62d1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ca9167fa62d1
Modified Files:
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:
Fixed some installer bugs: use correct path and version.
diffs (130 lines):
diff -r a8c0e2385647 -r ca9167fa62d1
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj Fri Aug
13 16:58:15 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj Fri Aug
13 17:21:03 2010 +0200
@@ -1042,7 +1042,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_039D616D2FE84FF495B8F9DCBC94DEA7"
{
- "SourcePath" = "8:C:\\Program
Files\\Intel\\Compiler\\C++\\10.1.022\\IA32\\Bin\\libmmd.dll"
+ "SourcePath" = "8:C:\\Program
Files\\Intel\\Compiler\\11.1\\046\\bin\\ia32\\libmmd.dll"
"TargetName" = "8:libmmd.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3222,7 +3222,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C464E85622B641E5A8EEA48F39228B0C"
{
- "SourcePath" = "8:C:\\Libraries\Pthreads\\lib\\pthreadVC2.dll"
+ "SourcePath" = "8:C:\\Libraries\\Pthreads\\lib\\pthreadVC2.dll"
"TargetName" = "8:pthreadVC2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
diff -r a8c0e2385647 -r ca9167fa62d1
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj Fri Aug 13
16:58:15 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj Fri Aug 13
17:21:03 2010 +0200
@@ -289,7 +289,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_21A2DD174AEE4F2394F2CFFC465BCAF0"
{
- "SourcePath" = "8:C:\\Program
Files\\Intel\\Compiler\\C++\\10.1.022\\IA32\\Bin\\libmmd.dll"
+ "SourcePath" = "8:C:\\Program
Files\\Intel\\Compiler\\11.1\\046\\bin\\ia32\\libmmd.dll"
"TargetName" = "8:libmmd.dll"
"Tag" = "8:"
"Folder" = "8:_D262855B92DE4EC89E4AAE66EAE05B3C"
diff -r a8c0e2385647 -r ca9167fa62d1
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj Fri Aug 13
16:58:15 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj Fri Aug 13
17:21:03 2010 +0200
@@ -289,7 +289,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_21A2DD174AEE4F2394F2CFFC465BCAF0"
{
- "SourcePath" = "8:C:\\Program Files
(x86)\\Intel\\Compiler\\C++\\10.1.022\\EM64T\\Bin\\libmmd.dll"
+ "SourcePath" = "8:C:\\Program Files
(x86)\\Intel\\Compiler\\11.1\\046\\bin\\intel64\\libmmd.dll"
"TargetName" = "8:libmmd.dll"
"Tag" = "8:"
"Folder" = "8:_D262855B92DE4EC89E4AAE66EAE05B3C"
diff -r a8c0e2385647 -r ca9167fa62d1
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Fri Aug
13 16:58:15 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Fri Aug
13 17:21:03 2010 +0200
@@ -1030,7 +1030,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_039D616D2FE84FF495B8F9DCBC94DEA7"
{
- "SourcePath" = "8:C:\\Program Files
(x86)\\Intel\\Compiler\\C++\\10.1.022\\EM64T\\Bin\\libmmd.dll"
+ "SourcePath" = "8:C:\\Program Files
(x86)\\Intel\\Compiler\\11.1\\046\\bin\\intel64\\libmmd.dll"
"TargetName" = "8:libmmd.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3290,7 +3290,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C464E85622B641E5A8EEA48F39228B0C"
{
- "SourcePath" = "8:C:\\Libraries\Pthreads\\lib64\\pthreadVC2.dll"
+ "SourcePath" = "8:C:\\Libraries\\Pthreads\\lib64\\pthreadVC2.dll"
"TargetName" = "8:pthreadVC2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
diff -r a8c0e2385647 -r ca9167fa62d1
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Fri Aug 13 16:58:15
2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Fri Aug 13 17:21:03
2010 +0200
@@ -1751,8 +1751,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_03431EDC85094776AD217020CB3E26D4"
{
- "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\lib\\zlib1.lib"
- "TargetName" = "8:zlib1.lib"
+ "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\lib\\zdll.lib"
+ "TargetName" = "8:zdll.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
"Condition" = "8:"
@@ -3951,7 +3951,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_75A080633F994EA59ED26A025CD34817"
{
- "SourcePath" = "8:C:\\Libraries\Pthreads\\lib\\pthreadVC2.lib"
+ "SourcePath" = "8:C:\\Libraries\\Pthreads\\lib\\pthreadVC2.lib"
"TargetName" = "8:pthreadVC2.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -5551,7 +5551,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C464E85622B641E5A8EEA48F39228B0C"
{
- "SourcePath" = "8:C:\\Libraries\Pthreads\\lib\\pthreadVC2.dll"
+ "SourcePath" = "8:C:\\Libraries\\Pthreads\\lib\\pthreadVC2.dll"
"TargetName" = "8:pthreadVC2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
diff -r a8c0e2385647 -r ca9167fa62d1
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Fri Aug 13
16:58:15 2010 +0200
+++ b/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Fri Aug 13
17:21:03 2010 +0200
@@ -2611,8 +2611,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_34F7F173BA0E45B088AF2C4005405F4A"
{
- "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win64\\lib\\zlib1.lib"
- "TargetName" = "8:zlib1.lib"
+ "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win64\\lib\\zdll.lib"
+ "TargetName" = "8:zdll.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
"Condition" = "8:"
@@ -4911,7 +4911,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A457E16E007645849E9E2B6FD6F5FC11"
{
- "SourcePath" = "8:C:\\Libraries\Pthreads\\lib64\\pthreadVC2.dll"
+ "SourcePath" = "8:C:\\Libraries\\Pthreads\\lib64\\pthreadVC2.dll"
"TargetName" = "8:pthreadVC2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -6511,7 +6511,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F000CF8886F54AA687844B835C659183"
{
- "SourcePath" = "8:C:\\Libraries\Pthreads\\lib64\\pthreadVC2.lib"
+ "SourcePath" = "8:C:\\Libraries\\Pthreads\\lib64\\pthreadVC2.lib"
"TargetName" = "8:pthreadVC2.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
