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

[translation/liveusb-creator_completed] https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator_completed
by translation＠torproject.org 05 Nov '19

05 Nov '19

commit 7523474a5698989cad92cc3d9e2e796a5991c125 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 5 15:16:21 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator_com… --- es/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/es.po b/es/es.po index 6b9cfc7ad..75e78e7d5 100644 --- a/es/es.po +++ b/es/es.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Fito JB, 2014 +# Adolfo Jayme-Barrientos, 2014 # Adrián Sandí <asandi.sagot(a)gmail.com>, 2013 # dark_yoshi <angelargi(a)yahoo.es>, 2014 # BL <tresemes3(a)gmail.com>, 2014

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 05 Nov '19

05 Nov '19

commit 1df87a37908cf9825c168ef18c72a9f678ebb645 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 5 14:53:32 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 34210d172..112e43692 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -3,11 +3,11 @@ # Isho Antar <isho.antar1(a)gmail.com>, 2018 # ButterflyOfFire, 2019 # Ahmed A. <6622227a(a)gmail.com>, 2019 -# Ahmed IB <mee.tbhole(a)gmail.com>, 2019 # Amin Jobran, 2019 # Khaled Hosny, 2019 # erinm, 2019 # Emma Peel, 2019 +# Ahmed IB <mee.tbhole(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-10-29 12:09+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Ahmed IB <mee.tbhole(a)gmail.com>, 2019\n" "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -8204,7 +8204,7 @@ msgstr "" #: lego/templates/banner.html:10 templates/banner.html:10 msgid "Tracking, surveillance, and censorship are widespread online." -msgstr "" +msgstr "ينتشر التّتبُّع والرقابة والحجب على صعيد واسع في الانترنت" #: lego/templates/banner.html:14 templates/banner.html:14 msgid "TAKE BACK THE INTERNET WITH TOR"

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 05 Nov '19

05 Nov '19

commit da5c84e37d3ad3b21c5e06c261d71868bb42ac7f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 5 14:53:03 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ar.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 265c0f294..d577d82f9 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -3,12 +3,12 @@ # ButterflyOfFire, 2019 # Ahmad Gharbeia <gharbeia(a)gmail.com>, 2019 # Ahmed A. <6622227a(a)gmail.com>, 2019 -# Ahmed IB <mee.tbhole(a)gmail.com>, 2019 # Khaled Hosny, 2019 # ِAbu <elsahookie(a)gmail.com>, 2019 # erinm, 2019 # IDRASSI Mounir <mounir.idrassi(a)idrix.fr>, 2019 # Emma Peel, 2019 +# Ahmed IB <mee.tbhole(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -16,7 +16,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-10-29 10:45+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Ahmed IB <mee.tbhole(a)gmail.com>, 2019\n" "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +55,7 @@ msgstr "" #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "Tracking, surveillance, and censorship are widespread online." -msgstr "" +msgstr "ينتشر التّتبُّع والرقابة والحجب على صعيد واسع في الانترنت" #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "Take back the internet with Tor. Donate now."

1 0

[translation/abouttor-homepage_completed] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
by translation＠torproject.org 05 Nov '19

05 Nov '19

commit a2b6fcb02084e016204687e69e6532071087bd66 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 5 14:45:12 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_c… --- ar/aboutTor.dtd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ar/aboutTor.dtd b/ar/aboutTor.dtd index 382066efe..17c085a8f 100644 --- a/ar/aboutTor.dtd +++ b/ar/aboutTor.dtd @@ -30,3 +30,8 @@ <!ENTITY aboutTor.newsletter.link_text ""> <!ENTITY aboutTor.donationBanner.line2e ""> <!ENTITY aboutTor.donationBanner.buttonA ""> + + +<!ENTITY aboutTor.ey2019.mozilla ""> +<!ENTITY aboutTor.ey2019.tracking ""> +<!ENTITY aboutTor.ey2019.takeback "">

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 05 Nov '19

05 Nov '19

commit 83d2a8383771f31fcd5dbccdb67db75eeb160b26 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 5 14:45:05 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- ar/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/aboutTor.dtd b/ar/aboutTor.dtd index 5071a52a4..d0ca0d2bd 100644 --- a/ar/aboutTor.dtd +++ b/ar/aboutTor.dtd @@ -33,5 +33,5 @@  <!ENTITY aboutTor.ey2019.mozilla "تبرع اليوم، وستجاريك موزيلا وتبرع بنفس المبلغ."> -<!ENTITY aboutTor.ey2019.tracking "Tracking, surveillance, and censorship are widespread online."> -<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor"> +<!ENTITY aboutTor.ey2019.tracking "ينتشر التّتبُّع والرقابة والحجب على صعيد واسع في الانترنت"> +<!ENTITY aboutTor.ey2019.takeback "استعد السيطرة على الانترنت مع تور Tor">

1 0

[translation/orfox-stringsxml] https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml
by translation＠torproject.org 05 Nov '19

05 Nov '19

commit f23a72230544e24deb59119d9547795b2b9b5bf5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 5 14:17:02 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml --- ar/strings.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ar/strings.xml b/ar/strings.xml index cb5acbb4f..71ba784c7 100644 --- a/ar/strings.xml +++ b/ar/strings.xml @@ -1,2 +1,10 @@ <resources> - </resources> + <string name="app_name">انتهى العمل بأورفكس Orfox</string> + <string name="try_tor_browser">جرّب متصفح Tor Browser</string> + <string name="orfox_is_now_tor_browser">تحول أورفكس Orfox الى متصفح Tor Browser لنظام أندرويد</string> + <string name="get_it">احصل عليه من المصدر المفضل لديك</string> + <string name="go_to_f_droid">حمّله من F-DROID</string> + <string name="go_to_google_play">حمّله من GOOGLE PLAY</string> + <string name="download_apk">حمّله بصيغة .APK</string> + <string name="export_bookmarks">تصدير الإشارات المرجعية</string> +</resources>

1 0

[translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
by translation＠torproject.org 05 Nov '19

05 Nov '19

commit a536c410b72da09c4f02b8cd88e4e33a4f369d23 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 5 14:16:17 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_co… --- lt/https-everywhere.dtd | 97 +++++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/lt/https-everywhere.dtd b/lt/https-everywhere.dtd index 2807b6393..0f3f0be01 100644 --- a/lt/https-everywhere.dtd +++ b/lt/https-everywhere.dtd @@ -2,24 +2,24 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "Šifruokite saityną! Automatiškai naudokite HTTPS saugumą daugelyje svetainių."> <!ENTITY https-everywhere.about.version "Versija"> -<!ENTITY https-everywhere.about.rulesets_version "Taisyklių rinkinio versija"> +<!ENTITY https-everywhere.about.rulesets_version ""> <!ENTITY https-everywhere.about.add_new_rule "Pridėti naują taisyklę"> -<!ENTITY https-everywhere.menu.donate_eff_imperative "Paaukoti EFF"> -<!ENTITY https-everywhere.menu.observatory "SSL observatorijos nuostatos"> -<!ENTITY https-everywhere.menu.globalDisable "HTTPS Everywhere yra IŠJUNGTA"> -<!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere yra ĮJUNGTA"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligibleOn "Šifruoti visas galimas svetaines (EASE) yra ĮJUNGTA"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligibleOff "Šifruoti visas galimas svetaines (EASE) yra IŠJUNGTA"> -<!ENTITY https-everywhere.menu.httpNoWhereExplainedBlocked "Šiuo metu nešifruotos užklausos yra užblokuotos"> -<!ENTITY https-everywhere.menu.httpNoWhereExplainedAllowed "Šiuo metu nešifruotos užklausos yra leidžiamos"> -<!ENTITY https-everywhere.menu.seeMore "Rodyti daugiau"> -<!ENTITY https-everywhere.menu.seeLess "Rodyti mažiau"> -<!ENTITY https-everywhere.menu.httpNoWhereMore "Ši veiksena užblokuoja nešifruotą turinį ir užklausas"> -<!ENTITY https-everywhere.menu.showCounter "Rodyti skaitiklį"> -<!ENTITY https-everywhere.menu.viewAllRules "Rodyti visas taisykles"> +<!ENTITY https-everywhere.menu.donate_eff_imperative ""> +<!ENTITY https-everywhere.menu.observatory ""> +<!ENTITY https-everywhere.menu.globalDisable ""> +<!ENTITY https-everywhere.menu.globalEnable ""> +<!ENTITY https-everywhere.menu.encryptAllSitesEligibleOn ""> +<!ENTITY https-everywhere.menu.encryptAllSitesEligibleOff ""> +<!ENTITY https-everywhere.menu.httpNoWhereExplainedBlocked ""> +<!ENTITY https-everywhere.menu.httpNoWhereExplainedAllowed ""> +<!ENTITY https-everywhere.menu.seeMore ""> +<!ENTITY https-everywhere.menu.seeLess ""> +<!ENTITY https-everywhere.menu.httpNoWhereMore ""> +<!ENTITY https-everywhere.menu.showCounter ""> +<!ENTITY https-everywhere.menu.viewAllRules ""> -<!ENTITY https-everywhere.options.settings "Nustatymai"> +<!ENTITY https-everywhere.options.settings ""> <!ENTITY https-everywhere.options.generalSettings "Bendri nustatymai"> <!ENTITY https-everywhere.options.advancedSettings "Išplėstiniai nustatymai"> <!ENTITY https-everywhere.options.updateChannels "Atnaujinimo kanalai"> @@ -27,41 +27,42 @@ <!ENTITY https-everywhere.options.showDevtoolsTab "Rodyti plėtotojo įrankių kortelę"> <!ENTITY https-everywhere.options.autoUpdateRulesets "Automatiškai atnaujinti taisyklių rinkinius"> <!ENTITY https-everywhere.options.userRulesListed "HTTPS Everywhere naudotojo taisyklės"> -<!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere svetainės išjungtos"> -<!ENTITY https-everywhere.options.updateChannelsWarning "Įspėjimas: Pridėjus atnaujinimo kanalus, užpuolikai gali užgrobti jūsų naršyklę. Taisykite šią sekciją tik tuo atveju, jeigu žinote ką darote!"> -<!ENTITY https-everywhere.options.addUpdateChannel "Pridėti atnaujinimo kanalą"> -<!ENTITY https-everywhere.options.enterUpdateChannelName "Pridėti atnaujinimo kanalo vardą"> +<!ENTITY https-everywhere.options.disabledUrlsListed ""> +<!ENTITY https-everywhere.options.updateChannelsWarning ""> +<!ENTITY https-everywhere.options.addUpdateChannel ""> +<!ENTITY https-everywhere.options.enterUpdateChannelName ""> <!ENTITY https-everywhere.options.delete "Ištrinti"> -<!ENTITY https-everywhere.options.update "Atnaujinti"> -<!ENTITY https-everywhere.options.storedRulesetsVersion "Išsaugotų taisyklių rinkinių versija: "> -<!ENTITY https-everywhere.options.updatesLastChecked "Atnaujinimai paskutinį kartą tikrinti:"> +<!ENTITY https-everywhere.options.update ""> +<!ENTITY https-everywhere.options.storedRulesetsVersion ""> +<!ENTITY https-everywhere.options.updatesLastChecked ""> <!ENTITY https-everywhere.options.updatesLastCheckedNever "niekada"> -<!ENTITY https-everywhere.options.debuggingRulesets "Derinimo taisyklių rinkiniai (išplėstiniai)"> +<!ENTITY https-everywhere.options.debuggingRulesets ""> -<!ENTITY https-everywhere.prefs.export_settings "Eksportuoti nustatymus"> -<!ENTITY https-everywhere.prefs.reset_defaults "Atstatyti numatytas"> -<!ENTITY https-everywhere.prefs.reset_defaults_message "Tai atstatys visus taisyklių rinkinius į jų pirminę būseną. Tęsti?"> +<!ENTITY https-everywhere.prefs.export_settings ""> +<!ENTITY https-everywhere.prefs.reset_defaults ""> +<!ENTITY https-everywhere.prefs.reset_defaults_message ""> -<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere pastebėjo, kad ketinote naršyti į ne HTTPS puslapį ir, vietoj to, bandė jus nukreipti į HTTPS versiją. HTTPS versija yra neprieinama. Greičiausiai, ši svetainė nepalaiko HTTPS, tačiau taip pat gali būti, kad užpuolikas blokuoja HTTPS versiją. Jeigu vis dar norėtumėte matyti nešifruotą šio puslapio versiją, galite tai atlikti, savo HTTPS Everywhere priede išjungę parametrą "Šifruoti visas galimas svetaines" (EASE). Turėkite omenyje, kad šio parametro išjungimas, svetainėse, kuriose lankysitės gali padaryti jūsų naršyklę pažeidžiamą tinklu pagrįstoms sendinimo atakoms."> -<!ENTITY https-everywhere.cancel.he_blocking_network "tinklu pagrįstos sendinimo atakos"> -<!ENTITY https-everywhere.cancel.open_page "Atverti nesaugų puslapį"> +<!ENTITY https-everywhere.cancel.he_blocking_explainer ""> +<!ENTITY https-everywhere.cancel.he_blocking_network ""> +<!ENTITY https-everywhere.cancel.open_page ""> +<!ENTITY https-everywhere.cancel.http_once ""> -<!ENTITY https-everywhere.chrome.settings_for_this_site_header "Nustatymai šiai svetainei"> -<!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "Keiskite savo šifruotų ryšių nuostatas"> -<!ENTITY https-everywhere.chrome.settings_for_this_site_explained "Naršydami įvairiose svetainėse, kiekvienai svetainei galite keisti savo nuostatas"> -<!ENTITY https-everywhere.chrome.stable_rules "Pastovios taisyklės"> -<!ENTITY https-everywhere.chrome.stable_rules_description "Priverstinis prisijungimų šifravimas į šiuos tinklalapius:"> -<!ENTITY https-everywhere.chrome.experimental_rules "Eksperimentinės taisyklės"> -<!ENTITY https-everywhere.chrome.experimental_rules_description "Gali sukelti įspėjimus ar gedimus. Pagal numatymą išjungta."> -<!ENTITY https-everywhere.chrome.disable_on_this_site "Išjungti HTTPS Everywhere šioje svetainėje"> -<!ENTITY https-everywhere.chrome.enable_on_this_site "Įjungti HTTPS Everywhere šioje svetainėje"> -<!ENTITY https-everywhere.chrome.add_rule "Pridėti šiai svetainei taisyklę"> -<!ENTITY https-everywhere.chrome.add_new_rule "Pridėti šiai svetainei naują taisyklę"> -<!ENTITY https-everywhere.chrome.always_https_for_host "Visuomet šiam serveriui naudoti https"> -<!ENTITY https-everywhere.chrome.host "Serveris:"> -<!ENTITY https-everywhere.chrome.show_advanced "Rodyti išplėstinius"> -<!ENTITY https-everywhere.chrome.hide_advanced "Slėpti išplėstinius"> -<!ENTITY https-everywhere.chrome.rule_name "Taisyklės pavadinimas"> -<!ENTITY https-everywhere.chrome.regex "Atitinkamas reguliarusis reiškinys"> -<!ENTITY https-everywhere.chrome.redirect_to "Nukreipti į"> -<!ENTITY https-everywhere.chrome.status_cancel_button "Atsisakyti"> +<!ENTITY https-everywhere.chrome.settings_for_this_site_header ""> +<!ENTITY https-everywhere.chrome.settings_for_this_site_subheader ""> +<!ENTITY https-everywhere.chrome.settings_for_this_site_explained ""> +<!ENTITY https-everywhere.chrome.stable_rules ""> +<!ENTITY https-everywhere.chrome.stable_rules_description ""> +<!ENTITY https-everywhere.chrome.experimental_rules ""> +<!ENTITY https-everywhere.chrome.experimental_rules_description ""> +<!ENTITY https-everywhere.chrome.disable_on_this_site ""> +<!ENTITY https-everywhere.chrome.enable_on_this_site ""> +<!ENTITY https-everywhere.chrome.add_rule ""> +<!ENTITY https-everywhere.chrome.add_new_rule ""> +<!ENTITY https-everywhere.chrome.always_https_for_host ""> +<!ENTITY https-everywhere.chrome.host ""> +<!ENTITY https-everywhere.chrome.show_advanced ""> +<!ENTITY https-everywhere.chrome.hide_advanced ""> +<!ENTITY https-everywhere.chrome.rule_name ""> +<!ENTITY https-everywhere.chrome.regex ""> +<!ENTITY https-everywhere.chrome.redirect_to ""> +<!ENTITY https-everywhere.chrome.status_cancel_button "">

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 05 Nov '19

05 Nov '19

commit b29aafd438d317921ffeddf0dfc5ad50e32c54e2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 5 14:16:08 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- lt/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lt/https-everywhere.dtd b/lt/https-everywhere.dtd index b888b5f94..a1be986a0 100644 --- a/lt/https-everywhere.dtd +++ b/lt/https-everywhere.dtd @@ -45,7 +45,7 @@ <!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere pastebėjo, kad ketinote naršyti į ne HTTPS puslapį ir, vietoj to, bandė jus nukreipti į HTTPS versiją. HTTPS versija yra neprieinama. Greičiausiai, ši svetainė nepalaiko HTTPS, tačiau taip pat gali būti, kad užpuolikas blokuoja HTTPS versiją. Jeigu vis dar norėtumėte matyti nešifruotą šio puslapio versiją, galite tai atlikti, savo HTTPS Everywhere priede išjungę parametrą "Šifruoti visas galimas svetaines" (EASE). Turėkite omenyje, kad šio parametro išjungimas, svetainėse, kuriose lankysitės gali padaryti jūsų naršyklę pažeidžiamą tinklu pagrįstoms sendinimo atakoms."> <!ENTITY https-everywhere.cancel.he_blocking_network "tinklu pagrįstos sendinimo atakos"> <!ENTITY https-everywhere.cancel.open_page "Atverti nesaugų puslapį"> -<!ENTITY https-everywhere.cancel.http_once "Open insecure page for this session only"> +<!ENTITY https-everywhere.cancel.http_once "Atverti nesaugų puslapį tik šiam seansui"> <!ENTITY https-everywhere.chrome.settings_for_this_site_header "Nustatymai šiai svetainei"> <!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "Keiskite savo šifruotų ryšių nuostatas">

1 0

[tor/master] hs-v2: Fix memory leak in error code path
by dgoulet＠torproject.org 05 Nov '19

05 Nov '19

commit 326f82db0420b777038bba826ff0b78ffd307490 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 5 08:24:46 2019 -0500 hs-v2: Fix memory leak in error code path Coverity CID: 1455168 Closes #32356 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/rend/rendclient.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c index bc94c88ef..6f4ee8b8c 100644 --- a/src/feature/rend/rendclient.c +++ b/src/feature/rend/rendclient.c @@ -1058,6 +1058,7 @@ rend_client_get_random_intro_impl(const rend_cache_entry_t *entry, /* Get service ID so we can use it to query the failure cache. If we fail to * parse it, this cache entry is no good. */ if (BUG(rend_get_service_id(entry->parsed->pk, service_id) < 0)) { + smartlist_free(usable_nodes); return NULL; }

1 0

[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