Commit 8b0920bb authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'split_or_directory'

parents 4eac5c6c 50963f36

.gitignore

+9 −10
Original line number Diff line number Diff line
@@ -206,16 +206,15 @@ uptime-*.json 
/src/lib/libtor-wallclock.a

/src/lib/libtor-wallclock-testing.a



# /src/or/

/src/or/Makefile

/src/or/Makefile.in

/src/or/tor

/src/or/tor.exe

/src/or/tor-cov

/src/or/tor-cov.exe

/src/or/libtor-app.a

/src/or/libtor-app-testing.a

/src/or/libtor.lib

# /src/tor

/src/core/libtor-app.a

/src/core/libtor-app-testing.a



# /src/app

/src/app/tor

/src/app/tor.exe

/src/app/tor-cov

/src/app/tor-cov.exe



# /src/rust

/src/rust/.cargo/config

Doxyfile.in

+579 −577
Original line number Diff line number Diff line
@@ -528,8 +528,10 @@ WARN_LOGFILE = 
# directories like "/usr/src/myproject". Separate the files or directories

# with spaces.



INPUT                  = @top_srcdir@/src/common \

                         @top_srcdir@/src/or

INPUT                  = @top_srcdir@/src/lib \

		         @top_srcdir@/src/core \

 		         @top_srcdir@/src/feature \

 		         @top_srcdir@/src/app



# This tag can be used to specify the character encoding of the source files

# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

Makefile.am

+7 −7
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ AM_CFLAGS=@TOR_SYSTEMD_CFLAGS@ @CFLAGS_BUGTRAP@ @TOR_LZMA_CFLAGS@ @TOR_ZSTD_CFLA 
SHELL=@SHELL@



if COVERAGE_ENABLED

TESTING_TOR_BINARY=$(top_builddir)/src/or/tor-cov$(EXEEXT)

TESTING_TOR_BINARY=$(top_builddir)/src/app/tor-cov$(EXEEXT)

else

TESTING_TOR_BINARY=$(top_builddir)/src/or/tor$(EXEEXT)

TESTING_TOR_BINARY=$(top_builddir)/src/app/tor$(EXEEXT)

endif



if USE_RUST
@@ -108,7 +108,7 @@ TOR_CRYPTO_TESTING_LIBS = \ 


# All static libraries used to link tor.

TOR_INTERNAL_LIBS = \

	src/or/libtor-app.a \

	src/core/libtor-app.a \

	src/lib/libtor-compress.a \

	src/lib/libtor-evloop.a \

	$(TOR_CRYPTO_LIBS) \
@@ -119,7 +119,7 @@ TOR_INTERNAL_LIBS = \ 
# Variants of the above for linking the testing variant of tor (for coverage

# and tests)

TOR_INTERNAL_TESTING_LIBS = \

	src/or/libtor-app-testing.a \

	src/core/libtor-app-testing.a \

	src/lib/libtor-compress-testing.a \

	src/lib/libtor-evloop-testing.a \

	$(TOR_CRYPTO_TESTING_LIBS) \
@@ -302,10 +302,10 @@ coverage-html-full: all 
check-spaces:

if USE_PERL

	$(PERL) $(top_srcdir)/scripts/maint/checkSpace.pl -C \

		$(top_srcdir)/src/common/*.[ch] \

		$(top_srcdir)/src/lib/*/*.[ch] \

		$(top_srcdir)/src/or/*.[ch] \

		$(top_srcdir)/src/or/*/*.[ch] \

		$(top_srcdir)/src/core/*/*.[ch] \

		$(top_srcdir)/src/feature/*/*.[ch] \

		$(top_srcdir)/src/app/*/*.[ch] \

		$(top_srcdir)/src/test/*.[ch] \

		$(top_srcdir)/src/test/*/*.[ch] \

		$(top_srcdir)/src/tools/*.[ch]

configure.ac

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ dnl See LICENSE for licensing information 


AC_PREREQ([2.63])

AC_INIT([tor],[0.3.5.0-alpha-dev])

AC_CONFIG_SRCDIR([src/or/main.c])

AC_CONFIG_SRCDIR([src/app/main/tor_main.c])

AC_CONFIG_MACRO_DIR([m4])



# "foreign" means we don't follow GNU package layout standards

contrib/include.am

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ EXTRA_DIST+= \ 
	contrib/operator-tools/linux-tor-prio.sh	\

	contrib/operator-tools/tor-exit-notice.html	\

	contrib/or-tools/exitlist			\

	contrib/win32build/package_nsis-mingw.sh	\

	contrib/win32build/tor-mingw.nsi.in		\

	contrib/win32build/tor.ico			\

	contrib/win32build/tor.nsi.in