squash! 122.0.6253.3

checkpoint

cmake/patch.py

@@ -80,6 +80,8 @@ def create_patch_file(self):
                 verbose('Not putting component into edit tree')
             elif 'third_party/ipfs_client' in path:
                 verbose('Not putting library into edit tree')
+            elif isdir(from_path):
+                verbose('Ignoring unversioned directory, since that is not a kind of edit I do.')
             elif not self.file_in_branch(tag, path):
                 print('Copy', from_path, '->', to_path)
                 makedirs(to_dir, exist_ok=True)
@@ -99,8 +101,8 @@ def create_patch_file(self):
                         to_f.write(diff_out)
                         print(to_path)
         self.git(['add', 'url/url_canon_ipfs.cc'], Result.OrDie)
-        diff = self.git(['diff', '--patch', tag], Result.RawOutput)
-        file_name = join(self.pdir, name+'.patch')
+        # diff = self.git(['diff', '--patch', tag], Result.RawOutput)
+        # file_name = join(self.pdir, name+'.patch')
         # print('Old patch file:', file_name)
         # with open(file_name, 'w') as patch_file:
         #     patch_file.write(diff+"\n")
@@ -254,7 +256,7 @@ def electron_version(self, branch='main'):
     def unavailable(self):
         avail = list(map(as_int, self.available()))
         version_set = {}
-        fudge = 59895
+        fudge = 59896
         def check(version, version_set, s):
             i = as_int(version)
             by = (fudge,0)

component/CMakeLists.txt

@@ -68,9 +68,9 @@ foreach(proto ${protos} )
     set(gn_protos "${gn_protos}  \"${basename}\",\n  ")
 endforeach()
 
-add_custom_target(patch_file
+add_custom_target(record_edits
   COMMAND "${Python3_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/cmake/patch.py" "${CHROMIUM_SOURCE_TREE}" "${GIT_EXECUTABLE}" "${CMAKE_BUILD_TYPE}"
-  COMMENT "Creating patch file (will overwrite if already present)."
+  COMMENT "Creating patch files and such (will overwrite if already present)."
   )
 
 add_custom_target(setup_in_tree