paleolimbot commented on code in PR #39148: URL: https://github.com/apache/arrow/pull/39148#discussion_r1534124676
########## r/bootstrap.R: ########## @@ -0,0 +1,77 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + + +# exclude_patterns are regular expressions so use ^ to match top-level +# directories only. Otherwise 'dir' will match 'src/dir' and 'dir/file'. +rsync <- function(src_dir, dest_dir, exclude_patterns) { + all_files <- list.files(src_dir, recursive = TRUE) + + # Filter out excluded patterns + for (pattern in exclude_patterns) { + all_files <- all_files[!grepl(pattern, all_files)] + } + + files_to_vendor_src <- file.path(src_dir, all_files) + files_to_vendor_dst <- file.path(dest_dir, all_files) + + # Recreate the directory structure + dst_dirs <- unique(dirname(files_to_vendor_dst)) + for (dst_dir in dst_dirs) { + if (!dir.exists(dst_dir)) { + dir.create(dst_dir, recursive = TRUE) + } + } + + # Copy the files + if (all(file.copy(files_to_vendor_src, files_to_vendor_dst, overwrite = TRUE))) { + cat("All files successfully copied to tools/cpp\n") + } else { + stop("Failed to vendor all files") + } +} + + +if (dir.exists("../cpp")) { + rsync("../cpp", + "tools/cpp", + exclude_patterns = c( + "^apidoc", + "^build$", + "^build-support/boost-", + "^examples", + "^submodules", + "^src/gandiva", + "^src/jni", + "^src/skyhook", + "_test\\.cc" + ) + ) + + # Note: files in tools are available at build time, but not at run time. The thirdparty + # cmake expects .env, NOTICE.txt, and LICENSE.txt to be available one level up from cpp/ + # we must rename .env to dotenv and then replace references to it in cpp/CMakeLists.txt + file.copy(from = c("../NOTICE.txt", to = "../LICENSE.txt"), "tools/", overwrite = TRUE) + file.copy("../.env", "tools/dotenv", overwrite = TRUE) + + cmake_lists <- readLines("tools/cpp/CMakeLists.txt") + cmake_lists <- gsub("\\.env", "dotenv", cmake_lists) Review Comment: Is this any safer as `"\\b\\.env\\b"`? ########## r/bootstrap.R: ########## @@ -0,0 +1,77 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + + +# exclude_patterns are regular expressions so use ^ to match top-level +# directories only. Otherwise 'dir' will match 'src/dir' and 'dir/file'. +rsync <- function(src_dir, dest_dir, exclude_patterns) { + all_files <- list.files(src_dir, recursive = TRUE) + Review Comment: Do we want an option to clean the `dest_dir` to prevent files that were removed from persisting into a tarball? Or maybe every time? ########## r/bootstrap.R: ########## @@ -0,0 +1,77 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + + +# exclude_patterns are regular expressions so use ^ to match top-level +# directories only. Otherwise 'dir' will match 'src/dir' and 'dir/file'. +rsync <- function(src_dir, dest_dir, exclude_patterns) { + all_files <- list.files(src_dir, recursive = TRUE) + + # Filter out excluded patterns + for (pattern in exclude_patterns) { + all_files <- all_files[!grepl(pattern, all_files)] + } + + files_to_vendor_src <- file.path(src_dir, all_files) + files_to_vendor_dst <- file.path(dest_dir, all_files) + + # Recreate the directory structure + dst_dirs <- unique(dirname(files_to_vendor_dst)) + for (dst_dir in dst_dirs) { + if (!dir.exists(dst_dir)) { + dir.create(dst_dir, recursive = TRUE) + } + } + + # Copy the files + if (all(file.copy(files_to_vendor_src, files_to_vendor_dst, overwrite = TRUE))) { + cat("All files successfully copied to tools/cpp\n") + } else { + stop("Failed to vendor all files") + } +} + + +if (dir.exists("../cpp")) { + rsync("../cpp", + "tools/cpp", + exclude_patterns = c( + "^apidoc", + "^build$", Review Comment: ```suggestion "^build/", ``` (Or else my build directory is copied into the tarball with many warnings ensuing!) ########## r/bootstrap.R: ########## @@ -0,0 +1,77 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + + +# exclude_patterns are regular expressions so use ^ to match top-level +# directories only. Otherwise 'dir' will match 'src/dir' and 'dir/file'. +rsync <- function(src_dir, dest_dir, exclude_patterns) { + all_files <- list.files(src_dir, recursive = TRUE) + + # Filter out excluded patterns + for (pattern in exclude_patterns) { + all_files <- all_files[!grepl(pattern, all_files)] + } + + files_to_vendor_src <- file.path(src_dir, all_files) + files_to_vendor_dst <- file.path(dest_dir, all_files) + + # Recreate the directory structure + dst_dirs <- unique(dirname(files_to_vendor_dst)) + for (dst_dir in dst_dirs) { + if (!dir.exists(dst_dir)) { + dir.create(dst_dir, recursive = TRUE) + } + } + + # Copy the files + if (all(file.copy(files_to_vendor_src, files_to_vendor_dst, overwrite = TRUE))) { + cat("All files successfully copied to tools/cpp\n") + } else { + stop("Failed to vendor all files") + } +} + + +if (dir.exists("../cpp")) { + rsync("../cpp", + "tools/cpp", + exclude_patterns = c( + "^apidoc", + "^build$", + "^build-support/boost-", + "^examples", + "^submodules", + "^src/gandiva", + "^src/jni", + "^src/skyhook", + "_test\\.cc" + ) + ) + + # Note: files in tools are available at build time, but not at run time. The thirdparty + # cmake expects .env, NOTICE.txt, and LICENSE.txt to be available one level up from cpp/ + # we must rename .env to dotenv and then replace references to it in cpp/CMakeLists.txt + file.copy(from = c("../NOTICE.txt", to = "../LICENSE.txt"), "tools/", overwrite = TRUE) + file.copy("../.env", "tools/dotenv", overwrite = TRUE) Review Comment: I am a little confused as to how these two statements are connected. Presumably the file has to be renamed because R CMD check complains about hidden files (which might be nice to put here). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
