Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1818)

Issue 2338093003: Revert of gn: Generalize process_version() and move it to build/util (Closed)

Created:
4 years, 3 months ago by Yuta Kitamura
Modified:
4 years, 3 months ago
CC:
alokp+watch_chromium.org, anandc+watch-blimp_chromium.org, android-webview-reviews_chromium.org, caitkp+watch_chromium.org, cbentzel+watch_chromium.org, chromium-apps-reviews_chromium.org, chromium-reviews, chromoting-reviews_chromium.org, dtrainor+watch-blimp_chromium.org, eme-reviews_chromium.org, extensions-reviews_chromium.org, feature-media-reviews_chromium.org, gab+watch_chromium.org, gcasto+watch-blimp_chromium.org, grt+watch_chromium.org, halliwell+watch_chromium.org, jessicag+watch-blimp_chromium.org, khushalsagar+watch-blimp_chromium.org, kmarshall+watch-blimp_chromium.org, lcwu+watch_chromium.org, lethalantidote+watch-blimp_chromium.org, maniscalco+watch-blimp_chromium.org, marcinjb+watch-blimp_chromium.org, Michael Moss, nyquist+watch-blimp_chromium.org, pennymac+watch_chromium.org, shaktisahu+watch-blimp_chromium.org, sriramsr+watch-blimp_chromium.org, wfh+watch_chromium.org
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of gn: Generalize process_version() and move it to build/util (patchset #4 id:60001 of https://codereview.chromium.org/2308313003/ ) Reason for revert: This appears to cause compile errors on "Google Chrome Linux x64", closing the main waterfall. https://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Linux%20x64/builds/13577 FAILED: installer/version.txt python ../../build/util/version.py --official -f ../../chrome/VERSION -f ../../chrome/app/theme/google_chrome/BRANDING -o installer/version.txt Traceback (most recent call last): File "../../build/util/version.py", line 170, in <module> sys.exit(main()) File "../../build/util/version.py", line 159, in main """ % values KeyError: 'LASTCHANGE' Original issue's description: > There is nothing really chrome-specific in the process_version() > template, and if we stop always passing some files in chrome/ on every > invocation it is possible to generalize it and move it to build/util > instead (and fix some layering violation comments along the way). > > Compared to its previous incarnation, process_version() no longer passes > LASTCHANGE, BRANDING and VERSION automatically to version.py. This makes > it easier for callers to specify their own |sources| with values that > may override those set in those 3 files. > > A new wrapper, process_version_rc_template(), was introduced to cater > for callers (generally Windows ones) who need to process a .rc.version > file that requires the values from LASTCHANGE, BRANDING and VERSION. It > always passes those 3 files to process_version() before any optional > additional |sources|, and |template_file| defaults to > chrome_version.rc.version. > Since this template depends on files from //chrome, it lives in the > newly-added //chrome/process_version_rc_template.gni. > > R=dpranke@chromium.org,brettw@chromium.org > > Committed: https://crrev.com/cf276fc41653b2830a5ec796d4db09b199754677 > Cr-Commit-Position: refs/heads/master@{#418514} TBR=phajdan.jr@chromium.org,brettw@chromium.org,ddorwin@chromium.org,dpranke@chromium.org,xhwang@chromium.org,raphael.kubo.da.costa@intel.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Committed: https://crrev.com/b4efc387bb10eef38bbd8cb20a79802e508dd1ba Cr-Commit-Position: refs/heads/master@{#418519}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+204 lines, -278 lines) Patch
M android_webview/common/BUILD.gn View 1 chunk +1 line, -4 lines 0 comments Download
M blimp/common/BUILD.gn View 2 chunks +1 line, -4 lines 0 comments Download
D build/util/process_version.gni View 1 chunk +0 lines, -125 lines 0 comments Download
M build/util/version.gni View 1 chunk +1 line, -1 line 0 comments Download
M chrome/BUILD.gn View 3 chunks +9 lines, -5 lines 0 comments Download
M chrome/android/BUILD.gn View 2 chunks +1 line, -6 lines 0 comments Download
M chrome/app/version_assembly/BUILD.gn View 3 chunks +1 line, -7 lines 0 comments Download
M chrome/chrome_watcher/BUILD.gn View 2 chunks +3 lines, -2 lines 0 comments Download
M chrome/common/BUILD.gn View 2 chunks +3 lines, -7 lines 0 comments Download
M chrome/installer/gcapi/BUILD.gn View 2 chunks +2 lines, -2 lines 0 comments Download
M chrome/installer/linux/BUILD.gn View 2 chunks +1 line, -6 lines 0 comments Download
M chrome/installer/mini_installer/BUILD.gn View 2 chunks +2 lines, -2 lines 0 comments Download
M chrome/installer/setup/BUILD.gn View 2 chunks +2 lines, -2 lines 0 comments Download
D chrome/process_version_rc_template.gni View 1 chunk +0 lines, -65 lines 0 comments Download
A chrome/version.gni View 1 chunk +153 lines, -0 lines 0 comments Download
M chrome_elf/BUILD.gn View 1 chunk +3 lines, -2 lines 0 comments Download
M chromecast/base/BUILD.gn View 2 chunks +1 line, -4 lines 0 comments Download
M chromecast/crypto/BUILD.gn View 1 chunk +1 line, -0 lines 0 comments Download
M components/cronet/android/BUILD.gn View 3 chunks +1 line, -9 lines 0 comments Download
M components/cronet/ios/BUILD.gn View 2 chunks +1 line, -4 lines 0 comments Download
M components/data_reduction_proxy/core/common/BUILD.gn View 2 chunks +1 line, -4 lines 0 comments Download
M components/version_info/BUILD.gn View 2 chunks +1 line, -7 lines 0 comments Download
M extensions/shell/BUILD.gn View 2 chunks +5 lines, -5 lines 0 comments Download
M ios/crnet/BUILD.gn View 1 chunk +1 line, -0 lines 0 comments Download
M media/cdm/ppapi/BUILD.gn View 2 chunks +3 lines, -2 lines 0 comments Download
M remoting/build/config/remoting_build.gni View 1 chunk +1 line, -0 lines 0 comments Download
M remoting/host/BUILD.gn View 2 chunks +2 lines, -1 line 0 comments Download
M third_party/widevine/cdm/BUILD.gn View 2 chunks +3 lines, -2 lines 0 comments Download

Messages

Total messages: 7 (3 generated)
Yuta Kitamura
Created Revert of gn: Generalize process_version() and move it to build/util
4 years, 3 months ago (2016-09-14 09:46:40 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2338093003/1
4 years, 3 months ago (2016-09-14 09:47:00 UTC) #3
commit-bot: I haz the power
Committed patchset #1 (id:1)
4 years, 3 months ago (2016-09-14 09:48:10 UTC) #5
commit-bot: I haz the power
4 years, 3 months ago (2016-09-14 09:49:29 UTC) #7
Message was sent while issue was closed.
Patchset 1 (id:??) landed as
https://crrev.com/b4efc387bb10eef38bbd8cb20a79802e508dd1ba
Cr-Commit-Position: refs/heads/master@{#418519}

Powered by Google App Engine
This is Rietveld 408576698