From 52abe2ff499b5a6f6d97ba3fc8e8900b2d5b7b37 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Sun, 5 Jun 2011 01:07:59 +0200 Subject: [PATCH] [win] Added incomplete windows installer scripts --- common.pri | 2 +- installer/win/MapsWithMe.wxs | 143 ++++++++++++-- installer/win/generator.pl | 124 ++++++++++++ installer/win/guidgen.sh | 7 + installer/win/guids.txt | 362 +++++++++++++++++++++++++++++++++++ installer/win/makeSetup.bat | 11 +- 6 files changed, 633 insertions(+), 16 deletions(-) create mode 100644 installer/win/generator.pl create mode 100644 installer/win/guidgen.sh create mode 100644 installer/win/guids.txt diff --git a/common.pri b/common.pri index 57c0fc9fa2..41097180a7 100644 --- a/common.pri +++ b/common.pri @@ -98,7 +98,7 @@ win32-msvc* { CONFIG(release, debug|release) { DEFINES += _SECURE_SCL=0 } - } +} win32-msvc2010 { DEFINES += _HAS_CPP0X=0 # disable tr1 and c++0x features to avoid build errors diff --git a/installer/win/MapsWithMe.wxs b/installer/win/MapsWithMe.wxs index 4e6cefa231..d772070a62 100644 --- a/installer/win/MapsWithMe.wxs +++ b/installer/win/MapsWithMe.wxs @@ -12,32 +12,147 @@ Manufacturer='MapsWithMe' InstallerVersion='300' Compressed='yes' - InstallPrivileges='limited' - InstallScope='perUser' + InstallPrivileges='elevated' + InstallScope='perMachine' Platform='x86' /> - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + + + diff --git a/installer/win/generator.pl b/installer/win/generator.pl new file mode 100644 index 0000000000..533dce0633 --- /dev/null +++ b/installer/win/generator.pl @@ -0,0 +1,124 @@ +use strict; + +my @RESOURCES = ("01_dejavusans.ttf", "02_wqy-microhei.ttf", "03_jomolhari-id-a3d.ttf", "04_padauk.ttf", "05_khmeros.ttf", "06_code2000.ttf", + "basic.skn", "symbols_24.png", + "classificator.txt", "visibility.txt", "drawing_rules.bin", + "fonts_blacklist.txt", "fonts_whitelist.txt", "unicode_blocks.txt", + "languages.txt", "maps.update", "countries.txt", + "welcome.html", "about-travelguide-desktop.html", "eula.html", + "dictionary.slf"); + +my @QT_LIBS = ("QtCore4.dll", "QtGui4.dll", "QtOpenGL4.dll", "QtNetwork4.dll", "QtWebkit4.dll"); + +my $QT_PATH = "..\\..\\..\\SDK\\Desktop\\Qt\\4.7.3\\msvc2010\\bin\\"; +my $BINARY_PATH = "..\\..\\..\\omim-build-msvc2010\\out\\release\\"; +my $DATA_PATH = "..\\..\\data\\"; +my $MERGE_MODULE_PATH = "\\Program Files (x86)\\Common Files\\Merge Modules\\Microsoft_VC100_CRT_x86.msm"; +my $MERGE_MODULE_TITLE = "Visual C++ 10.0 Runtime"; + +# read guids from file +my $GUIDS_FILE="guids.txt"; +my %GUIDS; +open(IN, "<$GUIDS_FILE") or die "Couldn't open $GUIDS_FILE: $!"; +while () +{ + chomp; + $_ =~ m/([0-9a-zA-Z-]*) (.*$)/; + $GUIDS{$2} = $1; +} +close IN; + +# generate mwm data file components list +sub GenComponents(\@$) +{ + my @files = @{(shift)}; + my $SOURCE_PATH = shift; + my $COMPONENTS = ""; + my $REFS = ""; + foreach (@files) + { + $_ =~ /([a-zA-Z- _\.0-9]*)$/; + my $nameOnly = $1; + # fix id to be in valid wix format + my $id = "_" . $nameOnly; + $id =~ s/-/_/g; + if (exists($GUIDS{$nameOnly})) + { + $COMPONENTS = $COMPONENTS . " \n" . + " \n" . + " \n"; + $REFS = $REFS . " \n"; + } + else + { + # do nothing + print "ERROR: missing file: $nameOnly\n"; + } + } + chomp($COMPONENTS); + + return ($COMPONENTS, $REFS); +} + +my @files = <../../data/*.mwm>; +my @DATA_COMPONENTS = GenComponents(@files, $DATA_PATH); + +my @RESOURCE_COMPONENTS = GenComponents(@RESOURCES, $DATA_PATH); + +my @QT_COMPONENTS = GenComponents(@QT_LIBS, $QT_PATH); + +print < + + + + + + + + + + + + + +$QT_COMPONENTS[0] + +$DATA_COMPONENTS[0] +$RESOURCE_COMPONENTS[0] + + + + + + + +$QT_COMPONENTS[1] +$DATA_COMPONENTS[1] +$RESOURCE_COMPONENTS[1] + + + + + + + + + + + + + +RAWTEXT diff --git a/installer/win/guidgen.sh b/installer/win/guidgen.sh new file mode 100644 index 0000000000..f2b3c09f16 --- /dev/null +++ b/installer/win/guidgen.sh @@ -0,0 +1,7 @@ +#!/bin/bash + + +cat res_files.txt | while read line; do + GUID=`'/c/Program Files/Microsoft SDKs/Windows/v7.1/Bin/Uuidgen.Exe'` + echo "$GUID $line" +done diff --git a/installer/win/guids.txt b/installer/win/guids.txt new file mode 100644 index 0000000000..75de6338ba --- /dev/null +++ b/installer/win/guids.txt @@ -0,0 +1,362 @@ +51b99190-6a04-4611-bb08-367b9a73744b QtCore4.dll +8cd46b88-bb79-4332-870a-e299f3022aea QtGui4.dll +1c4c482d-93eb-4f45-8d52-be5ce2778885 QtOpenGL4.dll +0cd8c6a6-5f3d-40bc-a36b-cb37842239d4 QtNetwork4.dll +8de45066-d0c7-475e-b83e-cba8f9df8a60 QtWebkit4.dll +9c3a2d71-58a5-4e5a-ae65-0ffd085e7f6f 01_dejavusans.ttf +1370713b-1bdf-484a-984a-5a829ecfd9ee 02_wqy-microhei.ttf +8c0e64ea-b45e-4a1c-a8b5-8ec0647d6db6 03_jomolhari-id-a3d.ttf +9895bfbb-480f-4a83-baa6-3826cf496398 04_padauk.ttf +5ea3e229-6211-4790-9a7b-81f653cfda7d 05_khmeros.ttf +8e5bfedc-7de1-4522-a08f-56f7c6af4e40 06_code2000.ttf +16511f92-e4ec-4284-903a-3e9977fa9090 about-travelguide-desktop.html +1ac919ed-c9a8-4254-a9ea-38d7f5e90723 basic.skn +7f871bff-8d12-4eaf-ae76-3e2b3eb8c312 classificator.txt +820dfe36-cc14-4dce-9e5e-f640948c13ed countries.txt +140584d8-f21e-41c5-b650-854a62288071 dictionary.slf +bfc9e374-fdad-4864-a66b-3e252f94f3bb drawing_rules.bin +42bfca6e-5396-473a-8dd0-5ffe8f08334c eula.html +6c73e171-95eb-4030-a4f0-bf8bade679f7 fonts_blacklist.txt +7bc33762-35a7-4112-b2c5-be0a22f252cd fonts_whitelist.txt +3aa8b05a-e8de-460d-b045-5076e29b5e39 languages.txt +e515075d-22ba-4ce4-a9e5-0123e49e9c2e maps.update +87f5da59-4aab-4cdd-8c15-2668de66d9a2 symbols_24.png +ed9ff385-4c53-4cd7-a7b9-39df265b2494 unicode_blocks.txt +83a05519-c95f-4b36-84f0-bea8abadb020 visibility.txt +4a382811-08bb-4795-8e7d-d547d42523a3 welcome.html +f9e69eb7-ed63-4e43-9283-9e9b51d7e6b3 Afghanistan.mwm +ae45b9ff-395e-4d82-bea3-6df8849caf1c Alabama.mwm +13393ef5-8514-4c2f-8039-e2930d244201 Alaska.mwm +0ef2756d-7332-447b-9126-28dc41519087 Albania.mwm +ee56b160-30f6-4745-9c54-a5d373156efb Alberta.mwm +cf635712-9ea6-4680-9286-503e4eee8fcc Algeria.mwm +2841e27d-a83a-410e-b3bc-1f33ad48d504 Alsace.mwm +be22c303-04fd-4612-b7af-b835808edac4 American Samoa.mwm +6ed67bdd-76e1-4ba1-b97c-aabca2b32ec7 Andorra.mwm +dcd8341e-df34-42fb-8927-181fb55abff1 Angola.mwm +32d77634-cd2e-483d-8682-4cd004fbc63d Anguilla.mwm +34ef25c1-31ee-4e8a-92e9-7fafc9bf509f Antigua and Barbuda.mwm +79ead102-5781-481e-8afc-8870430e63c8 Aquitaine.mwm +66d17522-4abb-4649-a630-04a03e8f5c8e Argentina.mwm +5b95584b-4053-417d-b01d-e70279a555d2 Arizona.mwm +bde9986c-fc26-42a4-84a2-dbac940ed139 Arkansas.mwm +7a2a0953-9768-4ebf-a698-79137ae856ef Armenia.mwm +19f675d7-6ea2-47de-95b4-c00e846982d0 Aruba.mwm +1ca20788-af3d-4081-b039-a4794ee5d614 Australia.mwm +f1ed99c1-17f6-4b7d-af54-365dc42e2617 Austria.mwm +aa29b455-55e6-4340-b5b0-b203016cf363 Auvergne.mwm +a43d44ff-fa46-4553-9c33-eae46b70942c Azerbaijan.mwm +69026b9e-32b0-4a14-af43-0fc3fbdb2ffe Baden-Wurttemberg.mwm +d7406b19-eaa9-4f38-b7e0-00361067038d Bahamas.mwm +85674a56-8abc-44b1-8bc8-fa9b4615b7d7 Bahrain.mwm +32220d6b-5590-4052-9e88-16ca0e1ebe46 Bangladesh.mwm +d6556208-4e3b-4d6b-a4ff-ab6202100f80 Barbados.mwm +12519dc2-a522-4258-b3f3-baaa1f11044b Basse-Normandie.mwm +dbaaafca-5ba2-4d12-8cf3-c018ee1aee40 Bavaria.mwm +95bef92a-093b-4bbf-b681-ace224994e75 Belarus.mwm +c6a9a79a-5cf9-4295-997b-51aa11aca49e Belgium.mwm +c1567853-79a4-40b6-871e-65ba6d31e4b7 Belize.mwm +28cb4e5a-089a-495c-be45-d108322a1b9d Benin.mwm +978ba6e0-cbad-4ac1-913f-b742389c95d3 Berlin & Brandenburg.mwm +d28ac463-5eed-4c8f-8c02-9927309f69aa Bermuda.mwm +44715bf2-9744-43f6-b336-e6a3bda3f92b Bhutan.mwm +104c3139-5cec-437a-85fe-49f1011fc278 Bolivia.mwm +48cd19b3-664d-4bff-9a5b-7789435dfd68 Bosnia and Herzegovina.mwm +024404a5-93a5-46e0-9720-d1772f7ff50a Botswana.mwm +f626198e-eb42-4266-966e-0cb6a64ad833 Bourgogne.mwm +23fea130-1372-4a1a-a758-d1cd023f0d58 Bouvet Island.mwm +7830ecec-0b2d-4b49-9220-fff9376af23d Brazil.mwm +f69e8524-1b22-4173-9e54-3bd23d892076 Bremen & Lower Saxony.mwm +ba0cdb1f-d933-4212-ac84-c70728101a23 Bretagne.mwm +b9c45a86-ddbe-4cd2-8898-808caefbda20 British Columbia.mwm +83f1e276-010f-46c3-b2fa-810ee1191052 British Indian Ocean Territory.mwm +95770c85-c375-4b70-a20e-ed40b2129742 British Virgin Islands.mwm +be6dff38-0a15-44bf-8ee1-9eae017f5450 Brunei.mwm +3a664c16-15d8-4205-bd04-c633666f8173 Bulgaria.mwm +f4660b8f-9763-4cd2-acb8-b558563d423e Burkina Faso.mwm +0b8457e2-1667-407c-92f8-e096da107ebb Burma.mwm +77d73555-510e-4ada-b768-ebd922321ae1 Burundi.mwm +5486b1e6-2209-41d8-bb21-7786dc53757f California.mwm +90951e0f-240f-4d79-8db5-5545d5fe59d8 Cambodia.mwm +0e3d17f8-cd7a-43aa-8f8d-e4c1428ed366 Cameroon.mwm +7487d227-fbd3-4f54-99e0-057a29ee37fb Cape Verde.mwm +4819913f-9553-460e-a55c-68939e122ceb Cayman Islands.mwm +d206f55b-4184-4d40-946f-7ae5b0084968 Central African Republic.mwm +7daedea1-e3d0-42bf-b514-fa0658006cea Centre.mwm +392132df-9216-4802-9983-136c3ae93bba Chad.mwm +47db2ab7-b9e2-498a-9fed-f4726baa1b1f Champagne-Ardenne.mwm +597b9aad-bc19-49f0-835e-265a886ede74 Chile.mwm +84d0ff5f-5f96-45d1-a8a1-734155357da6 China.mwm +68f603ea-0bc7-47ed-a16d-13c720e3dc90 Christmas Island.mwm +3e4c1408-9162-4fad-b807-d517cc323192 Cocos Islands.mwm +cf08acd4-e9fe-4759-9bf1-762f895eaecc Colombia.mwm +772d2744-e3ca-4750-855d-af85631935ae Colorado.mwm +4926ff2e-0cc4-40b7-b3cc-b8515df16194 Comoros.mwm +895cf59b-f879-4dfe-aa81-d5d6db772fca Congo-Brazzaville.mwm +37582ee4-6cb8-44a6-80da-2983fda64f72 Congo-Kinshasa.mwm +d67fb42c-2a23-4b27-9a1f-48ce81fcd51c Connecticut.mwm +9d385b99-e354-4107-b2fa-d82f5176e1bd Cook Islands.mwm +f3e46f99-fd18-4688-a7fb-97587a88ec2e Corsica.mwm +8b05d2d7-a6df-4ec1-afd6-c79da126b604 Costa Rica.mwm +8695b4d3-7234-4056-b4ea-4c42e197dadf Croatia.mwm +827ebccb-f51c-413c-833f-afc4435389d3 Cuba.mwm +f1f9b1ba-2758-4ab0-ad02-a0f9d7e7758b Curacao.mwm +da2ab13d-9a44-494c-9697-c5326ffc5442 Cyprus.mwm +5f54efb3-0edf-4a55-b534-820b4d835f5e Czech Republic.mwm +f55ea1da-f730-4453-a50d-8833a218f7c0 Delaware.mwm +06b9e904-c40c-4f2b-b6df-37ad0d93a38d Denmark.mwm +4b0a8b5d-de2d-4765-a22e-4fdfb34a4f39 District of Columbia.mwm +31dd2751-6d54-4e8a-b544-a1774132c141 Djibouti.mwm +44d4f41f-3f2a-4e5a-b92d-3c1af4b47e88 Dominica.mwm +085f41bf-428a-4a40-bd9e-f6d0d7644133 Dominican Republic.mwm +13a96832-c2a1-47ca-b911-02a59c14714d East Timor.mwm +8cb7aa00-2ced-4cc3-81d0-1abcc669eeec Ecuador.mwm +df1237d3-ff43-48fc-96ba-fd71b43a5e4e Egypt.mwm +4b503d64-4155-4fde-b8a6-3522391b76f8 El Salvador.mwm +76f8b24d-54fc-404e-acb5-a77cba5c5ea4 Equatorial Guinea.mwm +64d132f4-eb36-4a9d-b0df-ba3ea28c6df7 Eritrea.mwm +1a7d866d-69e7-45ce-a2bd-08d8dff1a88c Estonia.mwm +101793ff-d31f-43b1-8d35-b0d3d3c3e612 Ethiopia.mwm +198fb33a-4bf2-479e-a2c6-d33857bf7073 Falkland Islands.mwm +529def3c-4419-4fec-b93d-eeb833d6d3de Faroe Islands.mwm +aa5d072f-d030-4d4a-8c36-8deee4dce5cd Fiji.mwm +4eec3c2f-57ed-41c6-a1ff-a85e13a4b019 Finland.mwm +c911ea34-a1fa-49f2-acde-85fd1321396b Florida.mwm +9a76266b-8e06-4d69-8086-00bd78d3b5ce Franche-Comte.mwm +3397af56-572e-4122-aad3-3faa7b44f78d French Guiana.mwm +c09cd24d-6331-4575-a0bc-c14f6e4fe9dc French Polynesia.mwm +bee7e8e0-a9d6-4322-920b-23ee0d67033f French Southern Territories.mwm +2d89f8fd-e600-4289-8f9a-8cd8f08b979b Gabon.mwm +2d7f7d0e-b01e-43a9-96d0-0097465486dc Gambia.mwm +e2a25129-129a-4b6b-b36b-d4763a9e419e Georgia.mwm +8cc16bbf-22f7-475f-a2ed-5ce4c2a87c71 Georgia_USA.mwm +598eeb8a-e98d-45c2-a85c-e276b5f3a53d Ghana.mwm +6da782d2-4b0e-4a99-934b-ce95923e0f1e Gibraltar.mwm +8b41c623-1f2b-46c4-9ed5-f861363b3ea3 Greece.mwm +47441b0f-f314-4905-9653-d4b772b77f18 Greenland.mwm +9347e958-1b40-4071-8a3f-1a78db729b25 Grenada.mwm +c050b787-e343-4c4e-b920-75d114386859 Guadeloupe.mwm +35271536-18a2-423e-9121-777657c6cf65 Guam.mwm +70571805-48d8-4106-8540-b06b6751758c Guatemala.mwm +8221ee5d-1eee-4131-bd4d-a0cd4068fe48 Guernsey.mwm +cc0f0dad-7402-48e1-ba61-6160f2001bc3 Guinea-Bissau.mwm +0959b8c4-7302-45d6-b66f-c8a2273cc5ee Guinea.mwm +f370d78d-b4bd-4008-9ba4-d69b56f597e3 Guyana.mwm +02576b41-f5a7-45ec-9928-af7ff149ee38 Haiti.mwm +4fe15540-64bd-4b3a-978e-d8647dbac82a Hamburg.mwm +982f4ffc-dc57-4f7b-b5b7-3885bc3ac368 Haute-Normandie.mwm +84af5670-2d5b-4daa-a1f5-8cd8275c0002 Hawaii.mwm +840cd825-a63a-4c04-9963-16a8b575db16 Heard Island and McDonald Islands.mwm +9c6c1f4a-9a4b-426a-97df-bc2ff28f5157 Hesse.mwm +c0234c96-2fda-408b-bea6-297be84a38a5 Honduras.mwm +09abf54b-f2fa-4713-83b3-f6cd9f260720 Hungary.mwm +21f0bc64-21a4-4676-a3d9-46a5866a43ea Iceland.mwm +e3a8eee7-878d-4d50-9266-4546127364c9 Idaho.mwm +aef9cb91-6fad-4a1e-808a-46c52ec33759 Illinois.mwm +d7073ab3-142d-41da-940c-c1b01ad91e40 India.mwm +74d7ae04-59eb-400b-9719-a06efc57ce11 Indiana.mwm +ac475e4b-3d9e-4e8c-95dd-9bf3a4db3563 Indonesia.mwm +61d5db4e-63d3-4b8f-93fe-d38a6d4579f5 Iowa.mwm +63be619c-2076-4ee3-aef0-de7452bd30c6 Iran.mwm +bf2dd4cc-41b3-4b18-804d-9e47d158ca8a Iraq.mwm +f91854a2-f908-4042-9b5c-5e2377d6a10b Ireland.mwm +9d2f777c-a7ae-4cd7-a6f9-75c98b9ef3ef Isle of Man.mwm +ee516949-258e-441a-a278-0eda45d1913b Israel.mwm +6e7b8456-fac4-4013-a6fa-ef8e22ddc60f Italy.mwm +f0ebc922-7513-45e2-93a1-6837540f3650 Ivory Coast.mwm +65d61b93-f24e-42af-96a6-8bc788e59586 Jamaica.mwm +7ce55425-f65f-4d1a-9bb6-54648b09d8b9 Japan.mwm +721ce351-06ca-45ce-94a4-69d90ccd323f Jersey.mwm +53a5f4ba-db2f-4f1a-8654-883d46c35440 Jordan.mwm +03cdddfb-5afd-4b80-9d62-283e07a94bce Kansas.mwm +878d239a-64de-4d50-9c7e-a44d2252d44e Kazakhstan.mwm +589b1c99-660d-4b85-8953-ab8161d95506 Kentucky.mwm +678b7863-74fb-4d79-a0e6-1c18eb8ce113 Kenya.mwm +3fd8ed38-c65f-454e-b120-68418bc92c7f Kiribati.mwm +13ead85a-a7cb-468f-8c97-a546774b6fbc Kosovo.mwm +e76452ef-d067-421d-84b5-0cc7d035898d Kuwait.mwm +f4b74252-3f1b-4f0d-af89-a52ad82c9790 Kyrgyzstan.mwm +a49b8d9f-6ab3-4d68-a5f2-47ecf83f81cb Languedoc-Roussillon.mwm +1f246d00-15e1-437a-81c2-8aec756d7b87 Laos.mwm +ce3965d0-a4c6-4f68-83ae-e9f1482bc92c Latvia.mwm +b00b92e8-ad13-4192-95fa-8ac45e4be352 Lebanon.mwm +4db58588-6c6d-4479-9077-3e875d8cba34 Lesotho.mwm +804fe1a0-3e5a-43b7-aa2d-da63890518ca Liberia.mwm +d9083187-54a9-4d63-aabc-b5ecf0d73fbe Libya.mwm +a3d16885-8589-47cb-9847-ad7d1cb995c0 Liechtenstein.mwm +f1e373d8-ef26-436b-af24-2721fac39af9 Limousin.mwm +b796905b-a75f-4464-adc4-b219dd61f32e Lithuania.mwm +6cf9502d-d616-49f1-98a5-0b7b38bbc3a3 Lorraine.mwm +5016652e-c211-4ec2-aa9f-28f3815b96ee Louisiana.mwm +8044b1fc-4661-4172-9d92-9d59b2e3985a Luxembourg.mwm +1b516e14-e8f6-4e9a-aba0-16ac20bdaa72 Macedonia.mwm +f3c56d12-d9e8-46ea-be02-f35dd92c722d Madagascar.mwm +428db8d3-4bc4-4031-a74c-f2de3d0c5b82 Maine.mwm +7713c6d2-85c9-4c3e-b428-aa61fcddb2e2 Malawi.mwm +80cf4318-cd99-47fb-8a61-2a839f48c845 Malaysia.mwm +2e3bcc9a-df17-4722-836b-008921c3cfaf Maldives.mwm +01350c8a-50e3-415a-9388-aba34e9ed62d Mali.mwm +9a1db8c5-ad27-4eae-8951-d14c22e1f118 Malta.mwm +a16c2937-0c5d-424b-af74-a20dca4bd126 Manitoba.mwm +8c40f387-8cd8-4859-9c90-9875314e5c6f Marshall Islands.mwm +fb7e70dc-5fe2-469e-bd98-cc6d47f75d03 Martinique.mwm +4db40b16-7411-4cb3-9a8e-95da5718b548 Maryland.mwm +7c7567b7-41bd-4520-ace4-24b6e8f5f1cb Massachusetts.mwm +6041f7ea-622b-4a1f-9760-d366e6df7374 Mauritania.mwm +9bcdda15-ea9e-44c1-a880-bc52c96dae2f Mauritius.mwm +d472cb40-223b-4984-8b90-c2194a6c6b83 Mayotte.mwm +df32a62c-61b1-405f-96c9-f2cdc22267cf Mecklenburg-Vorpommern.mwm +cbc14195-6544-46b1-a8c0-14912e86814e Mexico.mwm +400897d5-52b3-495a-8eb0-fb597684be94 Michigan.mwm +fb27c792-f1e4-4fe0-a86c-75c67bd9ae11 Micronesia.mwm +77e89aa8-2bb8-4a45-b414-1da7f6dda926 Midi-Pyrenees.mwm +99cb4202-628d-4729-a164-0d029ea3010c Minnesota.mwm +e7812e1f-d0bc-4429-9e5b-9c1444dc0a0c Mississippi.mwm +be137a35-0fde-480d-a039-c40fefab5dc7 Missouri.mwm +b3067fca-5a60-4c02-832e-80d4762d3af1 Moldova.mwm +50d57cca-f14a-481c-b383-5a39b58f9dd2 Monaco.mwm +d43cfed3-ef0e-4bf9-b86c-ee1522ce8b6e Mongolia.mwm +4eb55608-18dc-4ba3-bab6-a0a4a539a625 Montana.mwm +a00162a0-7cd9-432f-868d-ff34a06eb5c8 Montenegro.mwm +e906570c-3710-4c89-a4a5-4be38a3ab153 Montserrat.mwm +6906e0cd-27fb-4014-b1ca-d9b8bd894fe1 Morocco.mwm +41545032-948d-46eb-8627-cfd2103a4994 Mozambique.mwm +b34a8dde-8c43-4aca-8978-6c37844662fb Namibia.mwm +e1b6d959-9ba9-463f-a196-dcad0113be9c Nauru.mwm +29516c70-8546-4791-888a-528a24b40113 Nebraska.mwm +afd10777-856a-4cc9-b9ee-bfc30f819191 Nepal.mwm +13cfa11e-9145-4ac4-9690-1b0ea0fc4b36 Netherlands Antilles.mwm +3002b466-2cbd-4cdb-ab32-343100a2ad01 Netherlands.mwm +9e286271-2228-420c-a7f1-95b4f7553c85 Nevada.mwm +e48892e8-c518-4882-ade0-5977207b90ec New Brunswick.mwm +5227d65c-0eb5-4f56-8fc8-fb07dcab4227 New Caledonia.mwm +141d27fa-334b-4938-ab89-8352cdff31da Newfoundland and Labrador.mwm +21fd17be-1759-41f1-9f94-6e40aacb85d6 New Hampshire.mwm +a9f1d5ee-327a-45eb-9645-a6d70647de29 New Jersey.mwm +46b50e45-01b7-4480-ab1c-e79f9c2f87fa New Mexico.mwm +b79fe544-1641-460c-aa45-681e84e9b12f New York.mwm +444b8099-1b54-422e-a8e7-a9f248fb891f New Zealand.mwm +3b719d08-4652-421c-8c9f-d0e76e9e8b8d Nicaragua.mwm +b299c829-e9cf-4bf7-8299-7c8684e0a13c Nigeria.mwm +b0fa8bea-a5cb-401d-b0f9-0f807a6bcfa9 Niger.mwm +a0690fa7-b449-4c45-bd73-5ff5e1dfc15f Niue.mwm +442945b9-55d9-4465-a108-8d290e54487e Nord-Pas-de-Calais.mwm +518b584e-3a66-4659-98ed-346baff1caa0 Norfolk Island.mwm +86e23494-93f0-4ad1-9c80-23ca6cbf99c9 North Carolina.mwm +b7927c94-a0c2-4028-8b67-58b6383a9818 North Dakota.mwm +ac7c0cd9-e19e-4309-9415-1da8cc02e2da Northern Mariana Islands.mwm +37d0e76d-6b5f-4a7f-9bfb-2249852fba1f North Korea.mwm +cbb43dce-cbd2-40c5-93e5-0a1c39619f9b North Rhine-Westphalia.mwm +cf77a0a0-87f8-47aa-a140-c5be23bbdeb1 Northwest Territories.mwm +311985df-a3f2-4e56-b85c-56e0487fc5c4 Norway.mwm +8cbda049-6c48-402d-af36-1c14bd8e550e Nova Scotia.mwm +178c90c2-5a80-4dec-b8b4-0cf2d3902078 Nunavut.mwm +76819147-3e5e-4057-affd-296dcaadb91f Ohio.mwm +ecb10898-25d1-4943-8238-9f366c9c580a Oklahoma.mwm +0dd47af5-347e-406a-b5e2-9022594f4d86 Oman.mwm +f2b811df-df0a-4ca3-a80b-2cfad5e1facd Ontario.mwm +ab270021-8260-45cd-af2c-c4f2839f8fd8 Oregon.mwm +661dd308-f9cd-48c9-9cc5-f6a7a0c20475 Pakistan.mwm +e2614a73-7c5b-474d-9489-bdcdfdddc6e8 Palau.mwm +e17cc632-6df1-48aa-a6b4-18d9210483b4 Palestine.mwm +336fa542-9182-4e4e-9b7e-9a9b17148abe Panama.mwm +3fa359f9-761e-49cc-bf16-f5d9d703e793 Papua New Guinea.mwm +8c05c66a-dd67-4b1b-8ecb-305411637e2e Paraguay.mwm +ce2a83d4-b752-441a-9096-a0eb4d3c8e8c Paris & Ile-de-France.mwm +0be61e8e-1ae4-4fa3-8f8b-8f7e24370d11 Pays de la Loire.mwm +e2e8e96d-69d6-41c2-aaca-10805fa73ea4 Pennsylvania.mwm +ffeb289e-a5bb-4538-8c61-69e521c05411 Peru.mwm +7e63a602-f392-4ab0-bd05-e76eb81b38a6 Philippines.mwm +b5e12de5-6d39-47bb-994c-1d9b8b9655e7 Picardie.mwm +bb13771a-b672-4297-a69b-2ddfec705a53 Pitcairn Islands.mwm +e522c918-bd23-475d-b3ec-a55cc5b5eac9 Poitou-Charentes.mwm +f78bd0c6-8873-4ba2-b567-19a765edded6 Poland.mwm +bf0860b4-ce16-4785-8f4c-0c05f245da05 Portugal.mwm +f67162d7-a476-43f6-9a70-e265491b47eb Prince Edward Island.mwm +88b76010-f89f-4371-8c58-9117a7fcc5d5 Provence-Alpes-Cote d'Azur.mwm +44d8fc8e-8727-408a-a0ce-a212f1e32bae Puerto Rico.mwm +c5a738c5-2b46-4e49-85a3-5782ab7bc33e Qatar.mwm +c0febd63-3666-4cf8-8891-de9876371931 Quebec.mwm +3cd93ea7-e048-4777-92b5-9cde207a988a Reunion.mwm +6520d546-b380-4900-ac22-8d2205fde4bf Rhineland-Palatinate.mwm +581c82eb-e92c-43e3-96f3-ce0798b43177 Rhode Island.mwm +5ce02c95-26a4-44a5-9b99-14562dee0ff8 Rhone-Alpes.mwm +8f26814e-6e3b-42ee-bd58-e29d34a3c5a5 Romania.mwm +fba9c521-7525-4f6f-ac03-e596f390ebe5 Russia.mwm +26d4384b-2739-49ce-b2a1-2877fe9531c8 Rwanda.mwm +323e14f0-664b-42a3-bdbb-69bc8e754e79 Saarland.mwm +b20a8557-694f-4d2b-8206-fe71539ff0fc Sahrawi.mwm +73386c53-7c23-42bb-8374-32573cea5f1d Saint Barthelemy.mwm +285399c9-e8fb-4ae6-b05d-c9dbe823be8b Saint Helena, Ascension and Tristan da Cunha.mwm +58a93300-bee0-462c-ba6d-8842e827abc9 Saint Kitts and Nevis.mwm +56df21ca-32fd-4378-9add-9d926ba07729 Saint Lucia.mwm +9e6d79d4-ae7d-4ffc-b693-c848bec942d1 Saint Pierre and Miquelon.mwm +019671d8-9808-4974-9983-7bb40bf4d188 Saint Vincent and the Grenadines.mwm +bfff638f-298f-413a-af7a-3b08c7056595 Samoa.mwm +42f25c82-4b3d-4519-a8d6-6c5ecca77b8c San Marino.mwm +971fb1d1-cb65-4b68-b7ce-cd8b19386caa Sao Tome and Principe.mwm +446c5564-e954-44fb-ba16-0f7e886867c2 Saskatchewan.mwm +4aef90ab-8df8-4dd7-9127-20a13f872118 Saudi Arabia.mwm +d1c2ee23-06e9-4403-bca4-0644ae0d3d43 Saxony-Anhalt.mwm +47bc41a3-cc29-4163-b57c-e3bc14158d43 Saxony.mwm +b26f5a7b-9ee9-4b8f-89b0-bdbc2799f173 Schleswig-Holstein.mwm +1683ac1c-af2c-4e45-a762-53059b61a6c4 Senegal.mwm +5f808726-675c-4a6d-80ae-46a9909e4227 Serbia.mwm +b959ad89-3261-42e5-8a7f-899d98b57904 Seychelles.mwm +fdb9f5e4-2826-48a1-af16-b8b842512a86 Sierra Leone.mwm +d414f542-1b2d-499d-831d-73d79245f343 Singapore.mwm +c448e106-15a5-486d-8d6f-02b41b1aa61d Slovakia.mwm +493e8b7d-d6b3-4772-8580-41dad7bd69f8 Slovenia.mwm +5e0c2c31-20ef-4436-a53c-b530994bdf8a Somalia.mwm +dc0f3871-9a39-4c89-b8c3-dec0d36636cf South Africa.mwm +f54b5260-ea89-4460-8b4a-461caf23cb16 South Carolina.mwm +7ac7be6c-e192-468b-844a-1778fcf03640 South Dakota.mwm +635edb99-d74b-42ff-b0ec-c10b59437eb7 South Georgia and the South Sandwich Islands.mwm +aac06e92-1f0f-4dcf-9276-201249f8716f South Korea.mwm +31690103-0241-4129-a35d-44743a425869 Spain.mwm +e6cd7729-325d-420c-8d42-948a650aa387 Sri Lanka.mwm +9f1342ce-544a-46cc-9141-72a235a57995 Sudan.mwm +c2c5c3b9-aa28-445d-b6c6-9c558629b63c Suriname.mwm +1a80c10e-18a5-4922-953d-4d58f287183c Svalbard and Jan Mayen.mwm +8b1860b7-b4b2-4af7-a0e4-526f9444e12c Swaziland.mwm +4d042aa8-fc09-40ad-9424-d10cee697840 Sweden.mwm +931c7ed0-46d0-4d0a-b859-d94a2ed559ff Switzerland.mwm +a79ba8c9-c904-4be9-b8b1-c9ddd2dc4276 Syria.mwm +6d3132e4-6aaf-4c59-a68a-a1e3231c5f53 Taiwan.mwm +9ebf6f45-ec28-46fc-a08b-c1cd6a90f7fc Tajikistan.mwm +a4b9d9aa-68e7-4660-b6b1-f729518ac4ac Tanzania.mwm +0d43b952-5d27-4e14-9904-b9754c4f0cde Tennessee.mwm +bfbda9fe-1698-4343-876f-1a161c61bd2f Texas.mwm +1a90d282-2c9f-4b1b-9edb-376f9ae27e1e Thailand.mwm +f236b150-f6f1-455f-a57d-fe1652e82031 Thuringia.mwm +46497760-0b64-469b-9c3a-66d464544d1c Togo.mwm +c37abe22-1aef-4620-9939-431516d1bbe0 Tokelau.mwm +e2245cf2-8387-441e-8bf8-6a6d94b35dd6 Trinidad and Tobago.mwm +aea12711-a39f-4556-afee-d0413d122841 Tunisia.mwm +f2c1ed09-43ce-4531-aa70-e130f90d1a57 Turkey.mwm +961d87c6-3d11-40e1-b881-cea233fbbd21 Turkmenistan.mwm +2ec906a7-db79-4bf4-ba5a-626c059387df Turks and Caicos Islands.mwm +1efca978-d144-4934-83cb-6748995af70b Uganda.mwm +d8cdfcf2-151f-4cbc-9081-d387fedafc2d Ukraine.mwm +545cae46-d197-4b2d-a5cd-27f3263c05f6 United Arab Emirates.mwm +b888e9f7-884b-47b8-b211-42150bc28352 United Kingdom.mwm +93639381-1a60-477b-8fea-651f05f28424 United States Virgin Islands.mwm +5c294729-cc50-457f-9084-a1da7d5dae1a Uruguay.mwm +380d5ee8-7a69-4483-9350-9fabc2e21e41 Utah.mwm +629cb6ba-f623-4946-801b-9e55283c28b3 Uzbekistan.mwm +1445c567-b50b-4edb-9f69-bdd5e096458b Vanuatu.mwm +a03be5f0-6c9b-4f29-80c4-6a81d371b5aa Vatican.mwm +b8881f63-7258-4875-ac55-0d4bce893214 Venezuela.mwm +3c588e8f-4831-46ea-aa46-a67fb8a5affa Vermont.mwm +92b04bb3-0666-4392-9af7-881f8673d64a Vietnam.mwm +b5540ec2-4bb4-4b09-9187-fd8aa1f28846 Virginia.mwm +49f13318-060d-47a8-adc7-a6a1eb115e3c Wallis and Futuna.mwm +c28379d6-8cff-4b3f-9918-6ce31d0675e9 Washington.mwm +d433d631-1ac7-4057-979b-c6b74a4242c0 West Virginia.mwm +0399bfa6-fb64-4db9-a6f6-c4ec6fc1f677 Wisconsin.mwm +c6f61689-eecc-46f2-85d3-92ee8d6ff8a4 World.mwm +f6311449-cbc8-4a80-90bc-17a183484907 Wyoming.mwm +a93efe21-679d-4cda-90ab-ef7d6d552ef4 Yemen.mwm +d6454444-146c-427a-a7b2-53a0e645f012 Yukon.mwm +d94528c3-55dc-4a9c-be66-f160749cbbfc Zambia.mwm +6d9c07f6-d94f-4b2e-b5b4-6d2ca26523a4 Zimbabwe.mwm diff --git a/installer/win/makeSetup.bat b/installer/win/makeSetup.bat index 6471080717..3e7bd311a6 100644 --- a/installer/win/makeSetup.bat +++ b/installer/win/makeSetup.bat @@ -1,6 +1,15 @@ @echo on -set PATH="C:\Program Files\Windows Installer XML v3.5\bin";%PATH% +del MapsWithMe.wxs > nul +del MapsWithMe.wixobj > nul +del MapsWithMe.wixpdb > nul +del MapsWithMe.msi > nul + +perl generator.pl > MapsWithMe.wxs + +if NOT ERRORLEVEL 0 echo "Generator returned error %ERRORLEVEL%" + +set PATH="C:\Program Files (x86)\Windows Installer XML v3.5\bin";%PATH% candle MapsWithMe.wxs