From 61666e38dfff7109f3c8eea3f1769273312f67fa Mon Sep 17 00:00:00 2001 From: Yaz Saito Date: Wed, 2 Nov 2016 12:43:56 -0700 Subject: [PATCH 1/5] Add WORKSPACE, fix BUILD. --- BUILD | 3 --- WORKSPACE | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) create mode 100644 WORKSPACE diff --git a/BUILD b/BUILD index c9dc00d..3b8a7c6 100644 --- a/BUILD +++ b/BUILD @@ -37,9 +37,6 @@ cc_library( "-DHAVE_RWLOCK", "-DGFLAGS_INTTYPES_FORMAT_C99", ], - includes = [ - "include", - ], visibility = ["//visibility:public"], ) diff --git a/WORKSPACE b/WORKSPACE new file mode 100644 index 0000000..ae57ffa --- /dev/null +++ b/WORKSPACE @@ -0,0 +1 @@ +workspace(name = "com_googlesource_code_gflags") From 60048ce435a8b02d6d500949b58d1b5a0fe23f15 Mon Sep 17 00:00:00 2001 From: Yaz Saito Date: Wed, 2 Nov 2016 13:03:57 -0700 Subject: [PATCH 2/5] Fix the doc. --- INSTALL.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index e3a23c8..2126a09 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -33,12 +33,12 @@ the name of this package and the obtained version of the software. $ cd gflags-$version $ mkdir build && cd build $ ccmake .. - + - Press 'c' to configure the build system and 'e' to ignore warnings. - Set CMAKE_INSTALL_PREFIX and other CMake variables and options. - Continue pressing 'c' until the option 'g' is available. - Then press 'g' to generate the configuration files for GNU Make. - + $ make $ make test (optional) $ make install (optional) @@ -73,14 +73,14 @@ To use gflags in a Bazel project, map it in as an external dependency by editing your WORKSPACE file: git_repository( - name = "gflags_git", + name = "com_googlesource_code_gflags", commit = "", # Use the current HEAD commit remote = "https://github.com/gflags/gflags.git", ) bind( name = "gflags", - actual = "@gflags_git//:gflags", + actual = "@com_googlesource_code_gflags//:gflags", ) You can then add `//external:gflags` to the `deps` section of a `cc_binary` or From 10c3fcc27e25f0688e8d3825cecb69a03712de6b Mon Sep 17 00:00:00 2001 From: Yaz Saito Date: Wed, 2 Nov 2016 13:26:36 -0700 Subject: [PATCH 3/5] Checkpointing. --- BUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILD b/BUILD index 3b8a7c6..68ec390 100644 --- a/BUILD +++ b/BUILD @@ -70,7 +70,7 @@ genrule( outs = [ "gflags_completions.h", ], - cmd = "awk '{ gsub(/@GFLAGS_NAMESPACE@/, \"gflags\"); print; }' $(<) > $(@)", + cmd = "awk '{ gsub(/@GFLAGS_NAMESPACE@/, \"google\"); print; }' $(<) > $(@)", ) genrule( @@ -82,7 +82,7 @@ genrule( "gflags_declare.h", ], cmd = ("awk '{ " + - "gsub(/@GFLAGS_NAMESPACE@/, \"gflags\"); " + + "gsub(/@GFLAGS_NAMESPACE@/, \"google\"); " + "gsub(/@(HAVE_STDINT_H|HAVE_SYS_TYPES_H|HAVE_INTTYPES_H|GFLAGS_INTTYPES_FORMAT_C99)@/, \"1\"); " + "gsub(/@([A-Z0-9_]+)@/, \"0\"); " + "print; }' $(<) > $(@)"), From 1fb8580887a20d2016d7cb12b4f1ddd81d6e0f32 Mon Sep 17 00:00:00 2001 From: Yaz Saito Date: Fri, 4 Nov 2016 10:12:53 -0700 Subject: [PATCH 4/5] Reverted the namespace change. --- BUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILD b/BUILD index 68ec390..3b8a7c6 100644 --- a/BUILD +++ b/BUILD @@ -70,7 +70,7 @@ genrule( outs = [ "gflags_completions.h", ], - cmd = "awk '{ gsub(/@GFLAGS_NAMESPACE@/, \"google\"); print; }' $(<) > $(@)", + cmd = "awk '{ gsub(/@GFLAGS_NAMESPACE@/, \"gflags\"); print; }' $(<) > $(@)", ) genrule( @@ -82,7 +82,7 @@ genrule( "gflags_declare.h", ], cmd = ("awk '{ " + - "gsub(/@GFLAGS_NAMESPACE@/, \"google\"); " + + "gsub(/@GFLAGS_NAMESPACE@/, \"gflags\"); " + "gsub(/@(HAVE_STDINT_H|HAVE_SYS_TYPES_H|HAVE_INTTYPES_H|GFLAGS_INTTYPES_FORMAT_C99)@/, \"1\"); " + "gsub(/@([A-Z0-9_]+)@/, \"0\"); " + "print; }' $(<) > $(@)"), From cd344d6ecaefdcf0dbc30eb02320262cae6e8128 Mon Sep 17 00:00:00 2001 From: Yaz Saito Date: Fri, 4 Nov 2016 10:53:51 -0700 Subject: [PATCH 5/5] Remove WORKSPACE, for testing. --- WORKSPACE | 1 - 1 file changed, 1 deletion(-) delete mode 100644 WORKSPACE diff --git a/WORKSPACE b/WORKSPACE deleted file mode 100644 index ae57ffa..0000000 --- a/WORKSPACE +++ /dev/null @@ -1 +0,0 @@ -workspace(name = "com_googlesource_code_gflags")