Skip to content

Correct Regex for Parsing Workspace.bzl #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Correct Regex for Parsing Workspace.bzl #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f873a5
Corrected Regex
acidtonic Jun 7, 2018
39d369a
Corrected Regex for Protobuf
acidtonic Jun 7, 2018
22e0453
Update protobuf.sh
acidtonic Jun 7, 2018
d4f5bd7
Removed fail catch for the final two cp commands
acidtonic Jul 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions eigen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ find_eigen () {
ANY="[^\)]*"
ANY_NO_QUOTES="[^\)\\\"]*"
ANY_HEX="[a-fA-F0-9]*"
ARCHIVE_HEADER="native.new_http_archive\(\s*"
ARCHIVE_HEADER="tf_http_archive\(\s*"
NAME_START="name\s*=\s*\\\""
QUOTE_START="\s*=\s*\\\""
QUOTE_END="\\\"\s*,\s*"
Expand Down Expand Up @@ -248,10 +248,10 @@ elif [ "${MODE}" == "generate" ]; then
echo "Eigen_VERSION.cmake written to ${CMAKE_DIR}"
# perform specific operations regarding installation
if [ "${GENERATE_MODE}" == "external" ]; then
cp ${SCRIPT_DIR}/Eigen.cmake ${CMAKE_DIR} || fail
cp ${SCRIPT_DIR}/Eigen.cmake ${CMAKE_DIR}
echo "Wrote Eigen_VERSION.cmake and Eigen.cmake to ${CMAKE_DIR}"
elif [ "${GENERATE_MODE}" == "installed" ]; then
cp ${SCRIPT_DIR}/FindEigen.cmake ${CMAKE_DIR} || fail
cp ${SCRIPT_DIR}/FindEigen.cmake ${CMAKE_DIR}
echo "FindEigen.cmake copied to ${CMAKE_DIR}"
fi
fi
Expand Down
2 changes: 1 addition & 1 deletion protobuf.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ find_protobuf () {
# defs here
ANY="[^\)]*"
ANY_NO_QUOTES="[^\)\\\"]*"
HTTP_HEADER="native.http_archive\(\s"
HTTP_HEADER="tf_http_archive\(\s"
NAME_START="name\s*=\s*\\\""
QUOTE_START="\s*=\s*\\\""
QUOTE_END="\\\"\s*,\s*"
Expand Down