Bug 1675516 - Remove RNP's CMakeSettings.json via update_rnp.sh. r=kaie a=wsmwk
authorRob Lemley <rob@thunderbird.net>
Tue, 10 Nov 2020 13:14:39 +0000
changeset 40062 2c213fd0c3c6e07f35547702e4e98789493dd1e4
parent 40061 4a4ab5e0b262cfbe4cc432547083900d61b66502
child 40063 96ce609a4097d981b188c7e352c0fcca57d2361f
push id111
push userkaie@kuix.de
push dateFri, 27 Nov 2020 19:37:08 +0000
treeherdercomm-esr78@03a1c8f00e26 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskaie, wsmwk
bugs1675516
Bug 1675516 - Remove RNP's CMakeSettings.json via update_rnp.sh. r=kaie a=wsmwk Differential Revision: https://phabricator.services.mozilla.com/D96576
third_party/README.rnp
third_party/update_rnp.sh
--- a/third_party/README.rnp
+++ b/third_party/README.rnp
@@ -25,16 +25,17 @@ git-hooks
 .clang-format
 .gitignore
 _config.yml
 docker.sh
 travis.sh
 vcpkg.txt
 Brewfile
 CMakeLists.txt
+CMakeSettings.json
 
 
 The following files were added to the source's root by MZLA Technologies:
 Makefile.in
 moz.build
 module.ver
 rnp.symbols
 
--- a/third_party/update_rnp.sh
+++ b/third_party/update_rnp.sh
@@ -43,17 +43,17 @@ LATEST_VERSION=$($THIRDROC latest_versio
 REVISION=$(git -C "${RNPgit}" rev-parse --verify HEAD)
 TIMESTAMP=$(git -C "${RNPgit}" show -s --format=%ct)
 
 BUGREPORT="https://bugzilla.mozilla.org/enter_bug.cgi?product=Thunderbird"
 
 # Cleanup rnp checkout
 rm -rf ${RNPgit}/{.git,.github,.cirrus.yml,.clang-format,.gitignore}
 rm -rf ${RNPgit}/{_config.yml,docker.sh,ci,cmake,git-hooks,travis.sh,vcpkg.txt}
-rm -rf ${RNPgit}/{Brewfile,CMakeLists.txt}
+rm -rf ${RNPgit}/{Brewfile,CMakeLists.txt,CMakeSettings.json}
 
 # Do the switch
 rm -rf rnp
 mv "${RNPgit}" rnp
 # Build version.h/config.h.in
 $THIRDROC rnp_source_update rnp/ \
   "${LATEST_VERSION}" \
   "${REVISION}" \