Replace ${BUILT_PRODUCTS_DIR} with <(PRODUCT_DIR).

GYP internally converts <(PRODUCT_DIR) with ${BUILT_PRODUCTS_DIR} on Mac build. https://gyp.gsrc.io/docs/InputFormatReference.md#Predefined-Variables This CL should not change any results. This is a refactoring. BUG=#247 TEST=compile REF_BUG=22545802 REF_CL=100648617
google · Dec 31, 2015 · be24638 · be24638
1 parent 0964d5e
commit be24638
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/mac/mac.gyp b/src/mac/mac.gyp
@@ -528,7 +528,7 @@
                 '--input', 'installer/<(branding)_template.pkgproj',
                 '--version_file', '../mozc_version.txt',
                 '--gen_out_dir', '<(gen_out_dir)',
-                '--build_dir', '$(BUILT_PRODUCTS_DIR)',
+                '--build_dir', '<(PRODUCT_DIR)',
                 '--build_type', '<(build_type)',
               ],
             },
@@ -542,13 +542,13 @@
             {
               'action_name': 'generate',
               'inputs': [
-                '$(BUILT_PRODUCTS_DIR)/ActivatePane.bundle',
-                '$(BUILT_PRODUCTS_DIR)/<(branding).app',
-                '$(BUILT_PRODUCTS_DIR)/Uninstall<(branding).app',
+                '<(PRODUCT_DIR)/ActivatePane.bundle',
+                '<(PRODUCT_DIR)/<(branding).app',
+                '<(PRODUCT_DIR)/Uninstall<(branding).app',
                 '<(gen_out_dir)/<(branding).pkgproj',
               ],
               'outputs': [
-                '$(BUILT_PRODUCTS_DIR)/<(branding).pkg',
+                '<(PRODUCT_DIR)/<(branding).pkg',
               ],
               'action': [
                 'python', '../build_tools/build_and_sign_pkg_mac.py',
@@ -557,10 +557,10 @@
               'conditions': [
                 ['branding=="GoogleJapaneseInput"', {
                   'inputs': [
-                    '$(BUILT_PRODUCTS_DIR)/DevConfirmPane.bundle',
+                    '<(PRODUCT_DIR)/DevConfirmPane.bundle',
                   ],
                   'action': [
-                    '--signpkg', '$(BUILT_PRODUCTS_DIR)/<(branding).pkg',
+                    '--signpkg', '<(PRODUCT_DIR)/<(branding).pkg',
                   ],
                 }],
               ],

diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=17
-BUILD=2283
+BUILD=2284
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.