mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-26 23:52:30 +01:00
Code Issues Projects Releases Wiki Activity
tor/src/core/include.am

54 lines
1.7 KiB
Text
Raw Normal View History

Start splitting src/or This is a very gentle commit that just lays the groundwork in the build system: it puts the include files to build libtor-app.a into src/core, and to build the tor executable into src/app. The executable is now "src/app/tor".
2018-07-05 16:04:32 -04:00
mod: Build system changes for dirauth module Make our build system support a disable dirauth module option. It can only be disabled explicitly with: $ ./configure --disable-module-dirauth If *not* specified that is enabled, an automake conditional variable is set to true and a defined value for the C code: AM_CONDITIONAL: BUILD_MODULE_DIRAUTH AC_DEFINE: HAVE_MODULE_DIRAUTH=1 This introduces the dirauth/ module directory in src/or/ for which .c files are only compiled if the BUILD_MODULE_DIRAUTH is set. All the header files are compiled in regardless of the support so we can use the alternative entry point functions of the dirauth subsystem. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-03 15:06:34 -04:00
#
core/include.am: spelling fix
2020-01-08 20:50:02 -05:00
# Modules are conditionally compiled in tor starting here. We add the C files
build: Always compile module support for tests The --disable-module-* configure option removes code from the final binary but we still build the unit tests with the disable module(s) so we can actually test that code path all the time and not forget about it. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-27 11:33:22 -04:00
# only if the modules has been enabled at configure time. We always add the
# source files of every module to libtor-testing.a so we can build the unit
Fix linker errors when building Tor. This patch fixes linking errors when compiling Tor with the dirauth module disabled. See: https://bugs.torproject.org/26418
2018-06-19 23:10:12 +02:00
# tests for everything. See the UNITTESTS_ENABLED branch below.
mod: Build system changes for dirauth module Make our build system support a disable dirauth module option. It can only be disabled explicitly with: $ ./configure --disable-module-dirauth If *not* specified that is enabled, an automake conditional variable is set to true and a defined value for the C code: AM_CONDITIONAL: BUILD_MODULE_DIRAUTH AC_DEFINE: HAVE_MODULE_DIRAUTH=1 This introduces the dirauth/ module directory in src/or/ for which .c files are only compiled if the BUILD_MODULE_DIRAUTH is set. All the header files are compiled in regardless of the support so we can use the alternative entry point functions of the dirauth subsystem. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-03 15:06:34 -04:00
#
Rename libtor.a to libtor-app.a
2018-06-21 11:01:10 -04:00
LIBTOR_APP_TESTING_A_SOURCES = $(LIBTOR_APP_A_SOURCES)
mod: Build system changes for dirauth module Make our build system support a disable dirauth module option. It can only be disabled explicitly with: $ ./configure --disable-module-dirauth If *not* specified that is enabled, an automake conditional variable is set to true and a defined value for the C code: AM_CONDITIONAL: BUILD_MODULE_DIRAUTH AC_DEFINE: HAVE_MODULE_DIRAUTH=1 This introduces the dirauth/ module directory in src/or/ for which .c files are only compiled if the BUILD_MODULE_DIRAUTH is set. All the header files are compiled in regardless of the support so we can use the alternative entry point functions of the dirauth subsystem. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-03 15:06:34 -04:00
Add "stub" files for disabled modules. These modules are only built when the selected modules are disabled. The provide stub implementations of the subsystem blocks. Later, other stub implementations could move here. Having real subsystem blocks here will let us handle disabled configuration options better.
2019-12-15 18:10:11 -05:00
src_core_libtor_app_a_SOURCES = \
$(LIBTOR_APP_A_SOURCES) \
$(LIBTOR_APP_A_STUB_SOURCES)
Split core/include.am into per-subdirectory include.am files Closes ticket 32137.
2020-01-13 09:34:17 -05:00
Heed --disable-unittests properly
2018-06-02 12:53:04 +03:00
if UNITTESTS_ENABLED
Fix linker errors when building Tor. This patch fixes linking errors when compiling Tor with the dirauth module disabled. See: https://bugs.torproject.org/26418
2018-06-19 23:10:12 +02:00
# Add the sources of the modules that are needed for tests to work here.
relay: Implement HAVE_MODULE_RELAY for routermode.c Part of 32123.
2019-10-18 13:28:02 +10:00
LIBTOR_APP_TESTING_A_SOURCES += $(MODULE_RELAY_SOURCES)
Disable feature/dircache files when dircache module is disabled. To make Tor still work, we define a minimal dircache_stub.c file that defines the entry points to the module that can actually be seen by the compiler when we're building with dircache and relay disabled.
2020-01-08 21:13:29 -05:00
LIBTOR_APP_TESTING_A_SOURCES += $(MODULE_DIRCACHE_SOURCES)
Rename libtor.a to libtor-app.a
2018-06-21 11:01:10 -04:00
LIBTOR_APP_TESTING_A_SOURCES += $(MODULE_DIRAUTH_SOURCES)
Fix linker errors when building Tor. This patch fixes linking errors when compiling Tor with the dirauth module disabled. See: https://bugs.torproject.org/26418
2018-06-19 23:10:12 +02:00
Start splitting src/or This is a very gentle commit that just lays the groundwork in the build system: it puts the include files to build libtor-app.a into src/core, and to build the tor executable into src/app. The executable is now "src/app/tor".
2018-07-05 16:04:32 -04:00
src_core_libtor_app_testing_a_SOURCES = $(LIBTOR_APP_TESTING_A_SOURCES)
Heed --disable-unittests properly
2018-06-02 12:53:04 +03:00
else
Start splitting src/or This is a very gentle commit that just lays the groundwork in the build system: it puts the include files to build libtor-app.a into src/core, and to build the tor executable into src/app. The executable is now "src/app/tor".
2018-07-05 16:04:32 -04:00
src_core_libtor_app_testing_a_SOURCES =
Heed --disable-unittests properly
2018-06-02 12:53:04 +03:00
endif
Start work on fancy compiler tricks to expose extra stuff to our tests This is mainly a matter of automake trickery: we build each static library in two versions now: one with the TOR_UNIT_TESTS macro defined, and one without. When TOR_UNIT_TESTS is defined, we can enable mocking and expose more functions. When it's not defined, we can lock the binary down more. The alternatives would be to have alternate build modes: a "testing configuration" for building the libraries with test support, and a "production configuration" for building them without. I don't favor that approach, since I think it would mean more people runnning binaries build for testing, or more people not running unit tests.
2013-06-06 14:56:05 -04:00
Use tabs in src/or/include.am
2015-08-18 04:30:02 +02:00
AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \
-DLOCALSTATEDIR="\"$(localstatedir)\"" \
-DBINDIR="\"$(bindir)\""
Move to non-recursive make This gives us a few benefits: 1) make -j clean all this will start working, as it should. It currently doesn't. 2) increased parallel build recursive make will max out at number of files in a directory, non-recursive make doesn't have such a limitation 3) Removal of duplicate information in make files, less error prone I've also slightly updated how we call AM_INIT_AUTOMAKE, as the way that was used was not only deprecated but will be *removed* in the next major automake release (1.13).... so probably best that we can continue to bulid tor without requiring old automake. (see http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html ) For more reasons why, see resources such as: http://miller.emu.id.au/pmiller/books/rmch/
2012-08-02 23:31:43 +10:00
Start splitting src/or This is a very gentle commit that just lays the groundwork in the build system: it puts the include files to build libtor-app.a into src/core, and to build the tor executable into src/app. The executable is now "src/app/tor".
2018-07-05 16:04:32 -04:00
src_core_libtor_app_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
src_core_libtor_app_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
Coverage support: build with --enable-coverage to have tests run with gcov If you pass the --enable-coverage flag on the command line, we build our testing binaries with appropriate options eo enable coverage testing. We also build a "tor-cov" binary that has coverage enabled, for integration tests. On recent OSX versions, test coverage only works with clang, not gcc. So we warn about that. Also add a contrib/coverage script to actually run gcov with the appropriate options to generate useful .gcov files. (Thanks to automake, the .o files will not have the names that gcov expects to find.) Also, remove generated gcda and gcno files on clean.
2013-07-09 12:37:11 -04:00
build: minimal adjustments to make out-of-tree build work
2012-08-27 10:00:22 -04:00
micro-revision.i: FORCE
Silence two make rules
2015-05-18 11:29:07 -04:00
$(AM_V_at)rm -f micro-revision.tmp; \
Test for .git as readable instead of a dir to support worktrees Fixes #20492.
2016-12-04 21:16:59 -06:00
if test -r "$(top_srcdir)/.git" && \
Clean up generated files. Remove src/or/or_sha1.i and src/common/common_sha1.i on `make clean` and remove the temporary micro-revision file when its no longer needed. Additional changes; - show a message when generating the micro-revision file. - add the temporary micro revision file to the list of files to be removed on `make clean` just in case. - fix indentation of the make rule to improve readability.
2015-02-25 16:04:02 +01:00
test -x "`which git 2>&1;true`"; then \
HASH="`cd "$(top_srcdir)" && git rev-parse --short=16 HEAD`"; \
echo \"$$HASH\" > micro-revision.tmp; \
fi; \
if test ! -f micro-revision.tmp; then \
if test ! -f micro-revision.i; then \
echo '""' > micro-revision.i; \
fi; \
elif test ! -f micro-revision.i || \
test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \
mv micro-revision.tmp micro-revision.i; \
fi; \
rm -f micro-revision.tmp; \
true
Move to non-recursive make This gives us a few benefits: 1) make -j clean all this will start working, as it should. It currently doesn't. 2) increased parallel build recursive make will max out at number of files in a directory, non-recursive make doesn't have such a limitation 3) Removal of duplicate information in make files, less error prone I've also slightly updated how we call AM_INIT_AUTOMAKE, as the way that was used was not only deprecated but will be *removed* in the next major automake release (1.13).... so probably best that we can continue to bulid tor without requiring old automake. (see http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html ) For more reasons why, see resources such as: http://miller.emu.id.au/pmiller/books/rmch/
2012-08-02 23:31:43 +10:00
Fix our build system to know the new locations of the src/or stuff
2018-07-05 16:52:12 -04:00
CLEANFILES+= micro-revision.i micro-revision.tmp
Move to non-recursive make This gives us a few benefits: 1) make -j clean all this will start working, as it should. It currently doesn't. 2) increased parallel build recursive make will max out at number of files in a directory, non-recursive make doesn't have such a limitation 3) Removal of duplicate information in make files, less error prone I've also slightly updated how we call AM_INIT_AUTOMAKE, as the way that was used was not only deprecated but will be *removed* in the next major automake release (1.13).... so probably best that we can continue to bulid tor without requiring old automake. (see http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html ) For more reasons why, see resources such as: http://miller.emu.id.au/pmiller/books/rmch/
2012-08-02 23:31:43 +10:00
Make the _sha1.i file generation quieter
2012-08-23 13:14:41 -04:00
FORCE:
Reference in a new issue Copy permalink