1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-core.git synced 2025-10-06 03:50:08 +02:00
Commit graph

34 commits

Author SHA1 Message Date
Floris Bruynooghe
fd60e43d72 Support new libetpan via pkg-config
The newest libetpan switched to pkg-config.  If it's present use it,
no further questions asked.
2019-05-10 21:42:25 +02:00
Floris Bruynooghe
6c97186d83 Hack at libetpan 2019-04-28 22:40:06 +03:00
Floris Bruynooghe
12ef73c8e7 Provide deltachat/deltachat.h in builddir
This makes sure that there is a deltachat/deltacht.h file in the
build directory before it is installed.  This allows code to
to #include <deltachat/deltachat.h> when building against an
uninstalled library just like they would for building against an
installed library.
2019-04-27 12:31:03 +03:00
holger krekel
515e5ebba7
replace travis with circle-ci, cleanup of build steps (#639)
Travis is getting slower and was already hard to debug. This commit: 

- moves from travis to Circle-CI
- has a ci-scripts/README.md which explains what is contained there
- puts all build and CI scripts into "ci_scripts" directory
- allows to run full ci runs locally
- trims down the base Docker image where tests/docs/wheels are run from 4.4GB to 1.7GB
- fixes #628

Using circle-ci also means that we can probably integrate Mac-OS build steps more easily.

I am sure that my initial circle-ci config (helped by kind hints from @dignifiedquire ) can be improved.
2019-04-01 09:45:56 +02:00
jikstra
119db0644c Use pkg-config to find rpgp library 2019-03-26 14:13:30 +01:00
dignifiedquire
a88c8e086c
feat: no more netpgp when using rpgp 2019-03-12 20:25:09 +01:00
Floris Bruynooghe
00ab1c37ae
Add support in meson to conditionally use rpgp 2019-03-12 20:25:05 +01:00
dignifiedquire
38dce967a2
basic key generation using rpgp 2019-03-12 20:25:03 +01:00
Floris Bruynooghe
6b59ce0416 Add support for the stress test in meson
Now invoking `ninja test` will run the stress test built into the
command line tool.
2019-02-09 17:40:16 +01:00
Floris Bruynooghe
dccdc2fa92 Small etpan/osx tweaks
- Use build_machine as we don't support any form of cross-compilation
  yet.

- Do not try to build the fallback etpan on osx.

Fixes #512
2019-01-31 19:34:14 -03:00
Jikstra
0c2af3a54c remove playground code 2019-01-07 18:34:11 +01:00
bb
21c357bfcf libetpan uses different version accross the different platforms. Therefore when we're doing a version check we also need to check the host platform. 2019-01-07 18:22:45 +01:00
Floris Bruynooghe
1b216663c2 NetPGP needs -std=gnu99 for gcc
Otherwise a bunch of features it relies on are not present in older
compilers.  We could try and figure out the individual feature macros
or we could just insist on modern compilers, let's do the latter.
2018-11-25 12:40:48 +01:00
B. Petersen
972a3a1462
improve finding the math library with meson; targets comments of @flub 2018-11-12 14:04:15 +01:00
B. Petersen
786a496909
add linker flag -lm to link against the math library; required on some systems 2018-11-12 13:50:57 +01:00
holger krekel
f8019af4f6 this seems to be needed for git describe to ignore "py" tags which relate to python bindings not core 2018-10-04 22:10:30 +02:00
björn petersen
cf5de87d11
Merge pull request #332 from flub/soversion
Version the libdeltachat.so file
2018-10-04 09:26:39 +02:00
Floris Bruynooghe
27352104f3 Fix typos and simplify else clauses
Thanks @ralphtheninja for the review.
2018-09-27 20:22:21 -05:00
Floris Bruynooghe
a0310ff42e Version the libdeltachat.so file
This creates a version scheme extracted from the existing git tagging
schema being used.  It therefore relies on this schema not changing.

Since there appear no way to do all of this reading things from git
before the project() call we can sadly not use the correct version
in the project itself.
2018-09-27 19:16:45 -05:00
Lars-Magnus Skog
6f6b99257b
Merge pull request #311 from flub/etpan-fallback
Hack around libetpan not respecting wrap-mode
2018-09-27 19:53:36 +02:00
Floris Bruynooghe
951d8f584f Use features for openssl-camellia and openssl-idea
These actually switch on and off code, as opposed to the other HAVE
detction macros which only switch off header includes (and maybe
things would break if they're not there, but that's an existing bug
in netpgp).  So we want to be sure that they are present when we
need them.  This is what features are for.

This configures these features in delta-core as well.
2018-09-26 12:34:53 -05:00
Floris Bruynooghe
a855c36138 Hack around libetpan not respecting wrap-mode
Since we do not have access to the value of wrap-mode we can not
make the etpan dependency to behave correctly.  Hack around it by
introducing a new option just for etpan.
2018-09-25 23:10:06 -05:00
Floris Bruynooghe
1621ec4791 Apparently delta-core does use camellia
Also swithc to the static-pic-lib scheme.  The build_target() call
still does not work transparently for --default_library=both in case
of not a subproject, so there's not much to gain from it.  Basically
meson does not support building monolith libraries very easily (no
one does afaik).
2018-09-25 17:41:16 -05:00
Floris Bruynooghe
04dffc5a77 Update netpgp build scripts
These now do all the dection rather than hardcoding things.  It
also removes the dependency of bzip2 for the delta-core build,
bzip2 is now a feature and delta-core disables it.
2018-09-25 16:43:10 -05:00
Floris Bruynooghe
a251dcc42f Tweak buildscripts a little
- Require a minimum meson version, so we can tell people to use
  --wrap-mode=forcefallback

- Rename the option "fat" to "monolith"

- Error when trying to build a monolith static library, that's a lot
  of work since meson does not natively support this.

- Create a dependency for our main lib and use that in the
  commandline.  This fixes some duplication.
2018-09-18 23:33:34 +02:00
Floris Bruynooghe
80e7a4ca6b Build all the bundled libraries when appropriate
This can now create a few things:

- Build a shared lib linked against system libs
- Build a static lib linked against system libs
- Build a shared "fat" lib using internal deps
- Build a static lib using interal deps

The readme needs updating.
2018-09-17 14:34:43 +02:00
Floris Bruynooghe
702b3ccc49 Use bundeled libetpan by default
Using the system-libetpan causes pain to people who have out-dated
library versions, additionally it is nice to by default create a
library which uses dependencies as close as possible to the android
version for testing purposes.  This makes sure that the bundeled
sub-projects are used by default.

Additionally it makes sure to not install these bundeled dependencies
and only statically link the libdeltachat.so against them.  This is
beneficial to not conflict with any system-installed versions of these
libraries, especially since some bundled libraries are stripped down
and would not provide indirect users of the library the full library
functionality.

It does still provide an option to use the system-provided libetpan if
desired however, this makes sure libdeltachat plays nice with normal
package managers etc.
2018-06-10 19:52:54 +02:00
holger krekel
46513f1942
Merge pull request #184 from flub/static-etpan
Link against bundled libetpan
2018-06-10 16:49:18 +02:00
Floris Bruynooghe
8a7509b4e0
Merge pull request #133 from mogorman/pkg-config
patch makes meson create pkg-config file so apps can make use of it
2018-06-10 16:43:58 +02:00
Floris Bruynooghe
5f3c12f0bc Link against bundled libetpan
This should still be made optional.
2018-06-10 16:37:39 +02:00
Floris Bruynooghe
c5b8113032 Fix etpan deps creation
This was comparing a list with a string, which will start failing in
the future (as it should!).  But there's simply no need for this,
declare_dependency() function is quite happy with an empty list for
argument.  This was probably a leftover from an earlier attempt to get
things working.
2018-06-10 11:07:15 +02:00
Matthew O'Gorman
9f0a912256 patch makes meson create pkg-config file so apps can make use of it 2018-03-11 23:18:32 -04:00
Floris Bruynooghe
5555705883 Update build instructions for meson 2017-12-29 18:59:05 +01:00
Floris Bruynooghe
e8180dda9a Add very basic meson build infrastructure
This manages to build the .so and test binary on Debian stretch.
2017-12-29 13:38:39 +01:00