Changeset: d1d2ec12e9bc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d1d2ec12e9bc
Modified Files:
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
configure.ag
Branch: default
Log Message:
Merged with Jan2014 branch.
diffs (118 lines):
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -94,11 +94,6 @@
"ComponentsUrl" = "8:"
"Items"
{
-
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.2.0"
- {
- "Name" = "8:Windows Installer 2.0"
- "ProductCode" = "8:Microsoft.Windows.Installer.2.0"
- }
}
}
}
@@ -428,6 +423,7 @@
"ProductCode" = "8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}"
"PackageCode" = "8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}"
"UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
+ "AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -982,11 +982,6 @@
"ComponentsUrl" = "8:"
"Items"
{
-
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.2.0"
- {
- "Name" = "8:Windows Installer 2.0"
- "ProductCode" = "8:Microsoft.Windows.Installer.2.0"
- }
}
}
}
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -1207,7 +1207,7 @@
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
- "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x64.msm"
+ "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x64.msm"
"Properties"
{
}
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -94,11 +94,6 @@
"ComponentsUrl" = "8:"
"Items"
{
-
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.2.0"
- {
- "Name" = "8:Windows Installer 2.0"
- "ProductCode" = "8:Microsoft.Windows.Installer.2.0"
- }
}
}
}
@@ -428,6 +423,7 @@
"ProductCode" = "8:{BD1A3C71-3A8E-421D-922D-2B7A19926B5C}"
"PackageCode" = "8:{471DD1DA-9C69-4289-821D-4CC329A8BA94}"
"UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"
+ "AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
@@ -992,7 +988,7 @@
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
- "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x64.msm"
+ "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x64.msm"
"Properties"
{
}
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -982,11 +982,6 @@
"ComponentsUrl" = "8:"
"Items"
{
-
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.2.0"
- {
- "Name" = "8:Windows Installer 2.0"
- "ProductCode" = "8:Microsoft.Windows.Installer.2.0"
- }
}
}
}
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2197,7 +2197,7 @@ org_have_sphinxclient="auto"
have_sphinxclient=$org_have_sphinxclient
AC_ARG_WITH(sphinxclient,
AS_HELP_STRING([--with-sphinxclient=DIR],[sphinxclient library is
installed in DIR]),
- [have_sphinxclient="$withval"], [have_sphinxclient="auto"])
+ [have_sphinxclient="$withval"])
if test "x$have_sphinxclient" != xno; then
case "$have_sphinxclient" in
auto|yes)
@@ -2328,7 +2328,7 @@ org_have_mseed="auto"
have_mseed=$org_have_mseed
AC_ARG_WITH(mseed,
AS_HELP_STRING([--with-mseed=DIR],[mseed library is installed in DIR]),
- [have_mseed="$withval"], [have_mseed="auto"])
+ [have_mseed="$withval"])
if test "x$have_mseed" != xno; then
case "$have_mseed" in
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
