November 2019 - tor-commits - lists.torproject.org

[tor/master] Another attempt to fix Doxygen references in out-of-tree builds
by dgoulet＠torproject.org 05 Nov '19

05 Nov '19

commit c01f624f4a55dbf97cc39e70700143551d4f571c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 5 08:57:39 2019 -0500 Another attempt to fix Doxygen references in out-of-tree builds This time, we're using cd to run doxygen from inside the source directory, not the build directory at all. This lets us call the source directory ".", which (I hope) both Doxygen 1.8.13 and 1.8.15 will understand. Naturally, this requires a corresponding change in the doxygen configuration so that we are directing the output to the correct place. Fix for 32378. --- Doxyfile.in | 14 +++++++------- Makefile.am | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Doxyfile.in b/Doxyfile.in index 547a7db19..cdaccd75c 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -61,7 +61,7 @@ PROJECT_LOGO = # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = @top_builddir@/doc/doxygen +OUTPUT_DIRECTORY = @abs_top_builddir@/doc/doxygen # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and @@ -173,7 +173,7 @@ FULL_PATH_NAMES = YES # will be relative from the directory where doxygen is started. # This tag requires that the tag FULL_PATH_NAMES is set to YES. -STRIP_FROM_PATH = @top_srcdir@/src +STRIP_FROM_PATH = ./src # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the # path mentioned in the documentation of a class, which tells the reader which @@ -256,7 +256,7 @@ TAB_SIZE = 8 ALIASES = -ALIASES += refdir{1}="\ref @top_srcdir@/src/\1 \"\1\"" +ALIASES += refdir{1}="\ref ./src/\1 \"\1\"" # This tag can be used to specify a number of word-keyword mappings (TCL only). # A mapping has the form "name=value". For example adding "class=itcl::class" @@ -818,7 +818,7 @@ WARN_LOGFILE = # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. -INPUT = @top_srcdir@/src/ +INPUT = ./src/ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses @@ -860,9 +860,9 @@ RECURSIVE = YES # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = @top_srcdir@/src/ext \ - @top_srcdir@/src/trunnel \ - @top_srcdir@/src/test +EXCLUDE = ./src/ext \ + ./src/trunnel \ + ./src/test # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded diff --git a/Makefile.am b/Makefile.am index 8b2772577..1234b6d22 100644 --- a/Makefile.am +++ b/Makefile.am @@ -244,7 +244,8 @@ dist-rpm: dist-gzip .PHONY: doxygen doxygen: Doxyfile - mkdir -p doc/doxygen && doxygen + mkdir -p doc/doxygen + (cd "$(top_srcdir)" && doxygen "$(abs_top_builddir)/Doxyfile") test: all $(top_builddir)/src/test/test

1 0

[tor/master] Merge branch 'tor-github/pr/1498'
by dgoulet＠torproject.org 05 Nov '19

05 Nov '19

commit 884056ae57fb1dd80b39c9e503306c02732a551d Merge: 6c4479a90 326f82db0 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 5 09:05:26 2019 -0500 Merge branch 'tor-github/pr/1498' src/feature/rend/rendclient.c | 1 + 1 file changed, 1 insertion(+)

1 0

[tor/master] Remove a dot from ALIASES declaration.
by dgoulet＠torproject.org 05 Nov '19

05 Nov '19

commit 6c4479a90e3097f99a2f7639d5f21595a8809a68 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 5 09:02:59 2019 -0500 Remove a dot from ALIASES declaration. --- Doxyfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doxyfile.in b/Doxyfile.in index cdaccd75c..be500bbfa 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -256,7 +256,7 @@ TAB_SIZE = 8 ALIASES = -ALIASES += refdir{1}="\ref ./src/\1 \"\1\"" +ALIASES += refdir{1}="\ref src/\1 \"\1\"" # This tag can be used to specify a number of word-keyword mappings (TCL only). # A mapping has the form "name=value". For example adding "class=itcl::class"

1 0

[tpo/master] Update lego
by hiro＠torproject.org 05 Nov '19

05 Nov '19

commit 51dc995e075f9da9701b40046b8141a9dffc2ca7 Author: hiro <hiro(a)torproject.org> Date: Tue Nov 5 15:00:19 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 8a4ddc7..ae51128 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 8a4ddc76122db1b60a2ed2b0217c49b7ad77f3d5 +Subproject commit ae5112831f87ccbe9cccd7d9a11aaf5a8dde1f40

1 0

[styleguide/master] Update lego
by hiro＠torproject.org 05 Nov '19

05 Nov '19

commit a77de4690e9ccd78d045090bc95638ea53f3205b Author: hiro <hiro(a)torproject.org> Date: Tue Nov 5 14:59:56 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 8a4ddc7..ae51128 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 8a4ddc76122db1b60a2ed2b0217c49b7ad77f3d5 +Subproject commit ae5112831f87ccbe9cccd7d9a11aaf5a8dde1f40

1 0

[newsletter/master] Update lego
by hiro＠torproject.org 05 Nov '19

05 Nov '19

commit 1f4384233caeaf94255d9da0d195aecd939bcf18 Author: hiro <hiro(a)torproject.org> Date: Tue Nov 5 14:59:47 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 8a4ddc7..ae51128 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 8a4ddc76122db1b60a2ed2b0217c49b7ad77f3d5 +Subproject commit ae5112831f87ccbe9cccd7d9a11aaf5a8dde1f40

1 0

[gettor-web/master] Update lego
by hiro＠torproject.org 05 Nov '19

05 Nov '19

commit 5518f845da1e12a8a34ada30453ea6fbc53414e5 Author: hiro <hiro(a)torproject.org> Date: Tue Nov 5 14:59:29 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 8a4ddc7..ae51128 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 8a4ddc76122db1b60a2ed2b0217c49b7ad77f3d5 +Subproject commit ae5112831f87ccbe9cccd7d9a11aaf5a8dde1f40

1 0

[dev/master] Update lego
by hiro＠torproject.org 05 Nov '19

05 Nov '19

commit f8dc0b05c9d5dbcc71df9d8dc329914eb83fd98c Author: hiro <hiro(a)torproject.org> Date: Tue Nov 5 14:59:22 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 8a4ddc7..ae51128 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 8a4ddc76122db1b60a2ed2b0217c49b7ad77f3d5 +Subproject commit ae5112831f87ccbe9cccd7d9a11aaf5a8dde1f40

1 0

[community/master] Update lego
by hiro＠torproject.org 05 Nov '19

05 Nov '19

commit d7439ded9c45796a0b872054aa25da72ef46eb22 Author: hiro <hiro(a)torproject.org> Date: Tue Nov 5 14:59:13 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 8a4ddc7..ae51128 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 8a4ddc76122db1b60a2ed2b0217c49b7ad77f3d5 +Subproject commit ae5112831f87ccbe9cccd7d9a11aaf5a8dde1f40

1 0

[lego/master] Update eoy css
by hiro＠torproject.org 05 Nov '19

05 Nov '19

commit 689740889569f5372af5188bceb13bac3eede059 Author: hiro <hiro(a)torproject.org> Date: Tue Nov 5 14:58:35 2019 +0100 Update eoy css --- assets/scss/_eoy.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/scss/_eoy.scss b/assets/scss/_eoy.scss index b374932..b565245 100644 --- a/assets/scss/_eoy.scss +++ b/assets/scss/_eoy.scss @@ -51,6 +51,7 @@ line-height: 4rem !important; right: 8px; position: relative; + max-width: 280px; } .rectangle {

1 0