Changeset: cc8475c22248 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cc8475c22248
Modified Files:
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB4-XQuery-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB4-XQuery-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/installer64/cv32-64.sh
NT/installer64/fixmsi.py
NT/updatecodes.py
vertoo.config
Branch: default
Log Message:
Updated package/product/upgrade codes, and productversion.
The ProductVersion is now the same as the global version number (one
more reason to use 11.X.X).
Also added some scripts that are useful for building and maintaining
the visual studio project files and installers.
diffs (truncated from 402 to 300 lines):
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -566,14 +566,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{FEF4111D-7D84-494C-816B-59AC17D61DD3}"
- "PackageCode" = "8:{CA234000-7CBC-41BE-B950-52932DA115F6}"
+ "ProductCode" = "8:{F553EDA6-208A-4F89-9783-7ADA935E014A}"
+ "PackageCode" = "8:{C3CFF53E-BE5C-4C30-B071-847452592499}"
"UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:10.6.30"
+ "ProductVersion" = "8:11.0.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff --git a/NT/installer32/MonetDB4-XQuery-Installer.vdproj
b/NT/installer32/MonetDB4-XQuery-Installer.vdproj
--- a/NT/installer32/MonetDB4-XQuery-Installer.vdproj
+++ b/NT/installer32/MonetDB4-XQuery-Installer.vdproj
@@ -4168,14 +4168,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB4"
- "ProductCode" = "8:{F49EF5E9-4562-4AEC-90B7-8658E01E25FB}"
- "PackageCode" = "8:{A5FB07EB-EB77-482F-BBFB-C544B8431C27}"
+ "ProductCode" = "8:{92EABADC-D872-4E44-9C2C-52EDD1B2CE13}"
+ "PackageCode" = "8:{0C59C568-9EF9-4F06-9E71-27C26AABAD83}"
"UpgradeCode" = "8:{4F980AC7-863E-4C5E-A3BF-138F9DEDDB8A}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:10.6.30"
+ "ProductVersion" = "8:11.0.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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
@@ -425,14 +425,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5 SQL GIS Module"
- "ProductCode" = "8:{58592D26-F57D-40EE-A887-2800247B063B}"
- "PackageCode" = "8:{46EAD9E3-9260-4AB8-B182-AD16E6A8F619}"
+ "ProductCode" = "8:{0EB6FD98-A8BB-4E40-A6AB-D0258F937766}"
+ "PackageCode" = "8:{28CF4984-296C-4CC3-8049-9CE19CC68F1E}"
"UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:10.6.30"
+ "ProductVersion" = "8:11.0.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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
@@ -5281,14 +5281,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{449131CF-5503-495D-B080-3524A56BBB80}"
- "PackageCode" = "8:{9AFCF549-8C52-4F91-85B1-F7717300CFF4}"
+ "ProductCode" = "8:{3639864D-963F-4E5C-A087-17A25EEEC36F}"
+ "PackageCode" = "8:{18713244-E915-4623-ABB4-FBA11E0CA986}"
"UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:10.10.7"
+ "ProductVersion" = "8:11.0.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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
@@ -566,14 +566,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB ODBC Driver"
- "ProductCode" = "8:{FEF4111D-7D84-494C-816B-59AC17D61DD3}"
- "PackageCode" = "8:{CA234000-7CBC-41BE-B950-52932DA115F6}"
- "UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"
+ "ProductCode" = "8:{BCA28DEE-33C4-4897-85D5-98DA9747054A}"
+ "PackageCode" = "8:{D107C833-4867-4471-B5E7-36C3A5C26F2E}"
+ "UpgradeCode" = "8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:10.6.30"
+ "ProductVersion" = "8:11.0.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff --git a/NT/installer64/MonetDB4-XQuery-Installer.vdproj
b/NT/installer64/MonetDB4-XQuery-Installer.vdproj
--- a/NT/installer64/MonetDB4-XQuery-Installer.vdproj
+++ b/NT/installer64/MonetDB4-XQuery-Installer.vdproj
@@ -4168,14 +4168,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB4"
- "ProductCode" = "8:{F49EF5E9-4562-4AEC-90B7-8658E01E25FB}"
- "PackageCode" = "8:{A5FB07EB-EB77-482F-BBFB-C544B8431C27}"
- "UpgradeCode" = "8:{4F980AC7-863E-4C5E-A3BF-138F9DEDDB8A}"
+ "ProductCode" = "8:{EB9DAD8E-B4D6-4100-B250-E1D231DC326B}"
+ "PackageCode" = "8:{3A650591-F096-4B1D-B878-06DD15202F1B}"
+ "UpgradeCode" = "8:{AE963DBC-EE5D-4FCB-AAFD-37FED2302241}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:10.6.30"
+ "ProductVersion" = "8:11.0.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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
@@ -425,14 +425,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5 SQL GIS Module"
- "ProductCode" = "8:{58592D26-F57D-40EE-A887-2800247B063B}"
- "PackageCode" = "8:{46EAD9E3-9260-4AB8-B182-AD16E6A8F619}"
- "UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
+ "ProductCode" = "8:{ED180113-0260-405D-BE84-051345482E57}"
+ "PackageCode" = "8:{7B8FF815-E532-4549-A621-10E9481DEED9}"
+ "UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:10.6.30"
+ "ProductVersion" = "8:11.0.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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
@@ -5281,14 +5281,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MonetDB5"
- "ProductCode" = "8:{449131CF-5503-495D-B080-3524A56BBB80}"
- "PackageCode" = "8:{9AFCF549-8C52-4F91-85B1-F7717300CFF4}"
- "UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"
+ "ProductCode" = "8:{B90D913B-5C67-4BC7-9FB9-0157309A096D}"
+ "PackageCode" = "8:{70EC6B53-5D37-4A97-931B-2EA93C126810}"
+ "UpgradeCode" = "8:{839D3C90-B578-41E2-A004-431440F9E899}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:10.10.7"
+ "ProductVersion" = "8:11.0.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
diff --git a/NT/installer64/cv32-64.sh b/NT/installer64/cv32-64.sh
--- a/NT/installer64/cv32-64.sh
+++ b/NT/installer64/cv32-64.sh
@@ -7,4 +7,10 @@
-e 's/\[ProgramFilesFolder\]/[ProgramFiles64Folder]/' \
-e 's/C:\\\\Program Files\\\\Common Files\\\\Merge
Modules\\\\Microsoft_VC90_CRT_x86.msm/C:\\\\Program Files (x86)\\\\Common
Files\\\\Merge Modules\\\\Microsoft_VC90_CRT_x86_x64.msm/' \
-e 's/C:\\\\Program
Files\\\\Intel\\\\Compiler\\\\11.1\\\\046\\\\bin\\\\ia32\\\\libmmd.dll/C:\\\\Program
Files
(x86)\\\\Intel\\\\Compiler\\\\11.1\\\\046\\\\bin\\\\intel64\\\\libmmd.dll/' \
+ -e
's/{C1F69378-3F5C-4120-8224-32F07D3458F3}/{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}/'
\
+ -e
's/{4F980AC7-863E-4C5E-A3BF-138F9DEDDB8A}/{AE963DBC-EE5D-4FCB-AAFD-37FED2302241}/'
\
+ -e
's/{92C89C36-0E86-45E1-B3D8-0D6C91108F30}/{8E6CDFDE-39B9-43D9-97B3-2440C012845C}/'
\
+ -e
's/{730C595B-DBA6-48D7-94B8-A98780AC92B6}/{839D3C90-B578-41E2-A004-431440F9E899}/'
\
*.vdproj
+
+
diff --git a/NT/installer64/fixmsi.py b/NT/installer64/fixmsi.py
new file mode 100755
--- /dev/null
+++ b/NT/installer64/fixmsi.py
@@ -0,0 +1,23 @@
+#!/usr/bin/python
+
+# Fix a .msi (Windows Installer) file for a 64-bit registry search.
+# Microsoft refuses to fix a bug in Visual Studio so that for a 64-bit
+# build, the registry search will look in the 32-bit part of the
+# registry instead of the 64-bit part of the registry. This script
+# fixes the .msi to look in the correct part.
+
+import msilib
+import sys
+import glob
+
+def fixmsi(f):
+ db = msilib.OpenDatabase(f, msilib.MSIDBOPEN_DIRECT)
+ v = db.OpenView('UPDATE RegLocator SET Type = 18 WHERE Type = 2')
+ v.Execute(None)
+ v.Close()
+ db.Commit()
+
+if __name__ == '__main__':
+ for f in sys.argv[1:]:
+ for g in glob.glob(f):
+ fixmsi(g)
diff --git a/NT/updatecodes.py b/NT/updatecodes.py
new file mode 100755
--- /dev/null
+++ b/NT/updatecodes.py
@@ -0,0 +1,30 @@
+#!/usr/bin/python
+
+import subprocess
+import re
+
+prcdre = re.compile('"ProductCode" = "8:{(.*)}"')
+pacdre = re.compile('"PackageCode" = "8:{(.*)}"')
+
+def update(f):
+ p = subprocess.Popen(['uuidgen'], stdout = subprocess.PIPE)
+ u, e = p.communicate()
+ productcode = u.strip('\r\n').upper()
+ p = subprocess.Popen(['uuidgen'], stdout = subprocess.PIPE)
+ u, e = p.communicate()
+ packagecode = u.strip('\r\n').upper()
+ fp = open(f, 'rb')
+ data = fp.read()
+ fp.close()
+ repl = '"ProductCode" = "8:{%s}"' % productcode
+ data = prcdre.sub(repl, data)
+ repl = '"PackageCode" = "8:{%s}"' % packagecode
+ data = pacdre.sub(repl, data)
+ fp = open(f, 'wb')
+ fp.write(data)
+ fp.close()
+
+if __name__ == '__main__':
+ import sys
+ for f in sys.argv[1:]:
+ update(f)
diff --git a/vertoo.config b/vertoo.config
--- a/vertoo.config
+++ b/vertoo.config
@@ -15,16 +15,6 @@
'VALUE "ProductVersion", "%v\\0"',
arguments(pattern = 'FILEVERSION %v', format = '@winrc'),
arguments(pattern = 'PRODUCTVERSION %v', format = '@winrc'))
-main.addAnchors("MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj",
- arguments(pattern = '"ProductVersion" = "8:%v"',
- format = "@normal"),
- arguments(pattern = '"Value" = "8:%v"',
- format = '@normal'))
-main.addAnchors("MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj",
- arguments(pattern = '"ProductVersion" = "8:%v"',
- format = "@normal"),
- arguments(pattern = '"Value" = "8:%v"',
- format = '@normal'))
main.addAnchors("clients/src/odbc/winsetup/setup.rc",
'VALUE "FileVersion", "%v"',
'VALUE "ProductVersion", "%v"',
@@ -40,112 +30,40 @@
'VALUE "ProductVersion", "%v\\0"',
arguments(pattern = 'FILEVERSION %v', format = '@winrc'),
arguments(pattern = 'PRODUCTVERSION %v', format = '@winrc'))
-main.addAnchors("clients/NT/MonetDB-Clients/MonetDB-Clients.vdproj",
- arguments(pattern = '"ProductVersion" = "8:%v"',
- format = "@normal"),
- arguments(pattern = '"Value" = "8:%v"',
- format = '@normal'),
- arguments(pattern = r'"Condition" = "8:COMMONVERSION >=
\"%v\""',
- format = "@normal"))
-main.addAnchors("clients/NT/MonetDB-Clients/MonetDB-Clients64.vdproj",
- arguments(pattern = '"ProductVersion" = "8:%v"',
- format = "@normal"),
- arguments(pattern = '"Value" = "8:%v"',
- format = '@normal'),
- arguments(pattern = r'"Condition" = "8:COMMONVERSION >=
\"%v\""',
- format = "@normal"))
main.addAnchors("MonetDB4/src/monet/libmonet.rc",
'VALUE "FileVersion", "%v\\0"',
'VALUE "ProductVersion", "%v\\0"',
arguments(pattern = 'FILEVERSION %v', format = '@winrc'),
arguments(pattern = 'PRODUCTVERSION %v', format = '@winrc'))
-main.addAnchors("MonetDB4/NT/MonetDB4-Server/MonetDB4-Server.vdproj",
- arguments(pattern = '"ProductVersion" = "8:%v"',
- format = "@normal"),
- arguments(pattern = '"Value" = "8:%v"',
- format = '@normal'),
- arguments(pattern = r'"Condition" = "8:COMMONVERSION >=
\"%v\""',
- format = "@normal"))
-main.addAnchors("MonetDB4/NT/MonetDB4-Server/MonetDB4-Server64.vdproj",
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
