Changeset: ea401e91f092 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ea401e91f092
Modified Files:
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
sql/sql/Makefile.ag
Branch: Mar2011
Log Message:
Two files were removed from the installation, so remove them from the installer.
The replication module is no longer compiled and installed, so don't
try to install it.
Also, don't install the SQL file that references the no longer
available module.
diffs (178 lines):
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
@@ -231,12 +231,6 @@
}
"Entry"
{
- "MsmKey" = "8:_334E7A07ED5D4A97860D57F3E76BCAA0"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_387D4731F62A4189926D60105416556E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -261,12 +255,6 @@
}
"Entry"
{
- "MsmKey" = "8:_3B48252F751E4499BB74A438AE4B7E70"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_3D07311C9AD34774AF127D1A385A6A6A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1955,26 +1943,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_334E7A07ED5D4A97860D57F3E76BCAA0"
- {
- "SourcePath" = "8:lib\\monetdb5\\replication.mal"
- "TargetName" = "8:replication.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_387D4731F62A4189926D60105416556E"
{
"SourcePath" = "8:lib\\monetdb5\\opt_dataflow.mal"
@@ -2055,26 +2023,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3B48252F751E4499BB74A438AE4B7E70"
- {
- "SourcePath" = "8:lib\\monetdb5\\opt_replication.mal"
- "TargetName" = "8:opt_replication.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3D07311C9AD34774AF127D1A385A6A6A"
{
"SourcePath" = "8:lib\\monetdb5\\opt_accessmode.mal"
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
@@ -231,12 +231,6 @@
}
"Entry"
{
- "MsmKey" = "8:_334E7A07ED5D4A97860D57F3E76BCAA0"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_387D4731F62A4189926D60105416556E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -261,12 +255,6 @@
}
"Entry"
{
- "MsmKey" = "8:_3B48252F751E4499BB74A438AE4B7E70"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_3D07311C9AD34774AF127D1A385A6A6A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1955,26 +1943,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_334E7A07ED5D4A97860D57F3E76BCAA0"
- {
- "SourcePath" = "8:lib\\monetdb5\\replication.mal"
- "TargetName" = "8:replication.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_387D4731F62A4189926D60105416556E"
{
"SourcePath" = "8:lib\\monetdb5\\opt_dataflow.mal"
@@ -2055,26 +2023,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3B48252F751E4499BB74A438AE4B7E70"
- {
- "SourcePath" = "8:lib\\monetdb5\\opt_replication.mal"
- "TargetName" = "8:opt_replication.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3D07311C9AD34774AF127D1A385A6A6A"
{
"SourcePath" = "8:lib\\monetdb5\\opt_accessmode.mal"
diff --git a/sql/sql/Makefile.ag b/sql/sql/Makefile.ag
--- a/sql/sql/Makefile.ag
+++ b/sql/sql/Makefile.ag
@@ -28,7 +28,7 @@
DIR = libdir/monetdb5
SOURCES = \
cache.sql octopus.sql parts.sql \
- replication.sql temporal.sql
+ temporal.sql
}
headers_rdf = {
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
