OLD | NEW |
1 # | 1 # |
2 # Expects command line definition for variable 'target_arch' | 2 # Expects command line definition for variable 'target_arch' |
3 # Must be either 'ia32' or 'x64' | 3 # Must be either 'ia32' or 'x64' |
4 # | 4 # |
5 # This .gyp file sits in directory 'installer'. | 5 # This .gyp file sits in directory 'installer'. |
6 # When gyp translates files locations, base them here. | 6 # When gyp translates files locations, base them here. |
7 # | 7 # |
8 # The solution file from this .gyp source lands in 'installer/build/<(target_arc
h)'. | 8 # The solution file from this .gyp source lands in 'installer/build/<(target_arc
h)'. |
9 # When gyp does not translate file locations, base them here. | 9 # When gyp does not translate file locations, base them here. |
10 # | 10 # |
11 { | 11 { |
12 'includes': [ '../defaults.gypi' ], | 12 'includes': [ '../defaults.gypi' ], |
13 'variables': | 13 'variables': |
14 { | 14 { |
15 # | 15 # |
| 16 # Architecture specification |
| 17 # -- WiX uses {x86,x64}. VS uses {ia32,x64} |
| 18 # |
| 19 'conditions' : |
| 20 [ |
| 21 [ 'target_arch=="ia32"', { 'candle_arch': 'x86' } ], |
| 22 [ 'target_arch=="x64"', { 'candle_arch': 'x64' } ] |
| 23 ], |
| 24 |
| 25 # |
16 # Build directories, both common and architecture-specific | 26 # Build directories, both common and architecture-specific |
17 # | 27 # |
18 'build_dir_arch': 'build/<(target_arch)', | 28 'build_dir_arch': 'build/<(target_arch)', |
19 'build_dir_common': 'build/common', | 29 'build_dir_common': 'build/common', |
20 | 30 |
21 # | 31 # |
22 # MSI file names. | 32 # MSI file names. |
23 # -- The base MSI is a single-language MSI as originally constructed. | 33 # -- The base MSI is a single-language MSI as originally constructed. |
24 # This is the one from which all transforms are derived. | 34 # This is the one from which all transforms are derived. |
25 # -- The interim MSI is the working copy of the multilanguage MSI during the
build process. | 35 # -- The interim MSI is the working copy of the multilanguage MSI during the
build process. |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 'inputs': | 164 'inputs': |
155 [ | 165 [ |
156 '<@(installer_source_files)' | 166 '<@(installer_source_files)' |
157 ], | 167 ], |
158 'outputs': | 168 'outputs': |
159 [ | 169 [ |
160 # List must contain only a single element so that "-out" argument works
correctly. | 170 # List must contain only a single element so that "-out" argument works
correctly. |
161 '<(installer_object_file)' | 171 '<(installer_object_file)' |
162 ], | 172 ], |
163 'action': | 173 'action': |
164 [ 'candle -nologo -dNoDefault -dVersion=91.0 -dConfiguration=Release ',
'-out', '<@(_outputs)', '<(installer_source_top_file)' ] | 174 [ 'candle -nologo -arch <(candle_arch) -dNoDefault -dVersion=91.0 -dConf
iguration=Release', '-out', '<@(_outputs)', '<(installer_source_top_file)' ] |
165 } ] | 175 } ] |
166 }, | 176 }, |
167 | 177 |
168 ################################## | 178 ################################## |
169 # MSI targets | 179 # MSI targets |
170 # | 180 # |
171 # Building a multiple-language MSI requires embedding a transform for each lan
guage into a single MSI database. | 181 # Building a multiple-language MSI requires embedding a transform for each lan
guage into a single MSI database. |
172 # Each step requires a locale identifier (Microsoft LCID) as a parameter and a
WiX localization file (.wxl) as a source. | 182 # Each step requires a locale identifier (Microsoft LCID) as a parameter and a
WiX localization file (.wxl) as a source. |
173 # gyp does not support per-source-file parameters, so we're stuck with one pro
ject per step. | 183 # gyp does not support per-source-file parameters, so we're stuck with one pro
ject per step. |
174 # The naming convention for projects: | 184 # The naming convention for projects: |
(...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
880 'SubSystem': '1', # Console | 890 'SubSystem': '1', # Console |
881 }, | 891 }, |
882 }, | 892 }, |
883 }, | 893 }, |
884 | 894 |
885 ] | 895 ] |
886 } | 896 } |
887 | 897 |
888 | 898 |
889 | 899 |
OLD | NEW |