merge pEp4Thunderbird Release_2.1.0-RC13
authorbuff <andreas@pep-project.org>
Wed, 09 Sep 2020 16:38:19 +0200
changeset 10664b1c95ca483b
parent 1064 8398649f7eb2
parent 1065 db65b4a0a3f2
child 1067 c5db645eae07
merge pEp4Thunderbird
.hgignore
server/Makefile
     1.1 --- a/.hgignore	Wed Sep 09 16:23:22 2020 +0200
     1.2 +++ b/.hgignore	Wed Sep 09 16:38:19 2020 +0200
     1.3 @@ -64,6 +64,8 @@
     1.4  build-windows/pEpJSONServerAdapter/Release/*
     1.5  build-windows/pEpJSONServerAdapter/Debug/*
     1.6  
     1.7 +server/pEp-mini-json-adapter
     1.8 +
     1.9  *.d.*
    1.10  .??*.swp
    1.11  tags
     2.1 --- a/server/Makefile	Wed Sep 09 16:23:22 2020 +0200
     2.2 +++ b/server/Makefile	Wed Sep 09 16:38:19 2020 +0200
     2.3 @@ -10,12 +10,13 @@
     2.4  
     2.5  PEP_WEBSERVER?=../../webserver
     2.6  PEP_ADAPTER_LIBRARY=../../libpEpAdapter
     2.7 -PEP_ENGINE?=../../pEpEngine
     2.8 -LIBETPAN_FDIK?=../../libetpan
     2.9 -SEQOUIA_PGP?=../../sequoia
    2.10 +PEP_ENGINE?=../../pEpEngine/src
    2.11 +LIBETPAN_FDIK?=../../libetpan/src/.libs
    2.12 +SEQUOIA_PGP?=../../sequoia/target/release
    2.13  NETTLE?=../../nettle
    2.14  BOOST_INCLUDE_PATH?=../../boost_1_72_0
    2.15  BOOST_LIBRARY_PATH?=../../boost_1_72_0/stage/lib
    2.16 +ASN1_PATH?=$(PEP_ENGINE)/asn.1
    2.17  
    2.18  # path to installed libraries
    2.19  
    2.20 @@ -93,10 +94,11 @@
    2.21  		$(SQLITE3_LIBRARY_PATH)/libsqlite3.a \
    2.22  		$(GMP_LIBRARY_PATH)/libgmp.a \
    2.23  		$(NETTLE)/libnettle.a $(NETTLE)/libhogweed.a \
    2.24 -		$(SEQOUIA_PGP)/target/release/libsequoia_ffi.a \
    2.25 -		$(SEQOUIA_PGP)/target/release/libsequoia_openpgp_ffi.a \
    2.26 -		$(LIBETPAN_FDIK)/src/.libs/libetpan.a \
    2.27 -		$(PEP_ENGINE)/src/libpEpEngine.a $(PEP_ENGINE)/asn.1/libasn1.a \
    2.28 +		$(SEQUOIA_PGP)/libsequoia_ffi.a \
    2.29 +		$(SEQUOIA_PGP)/libsequoia_openpgp_ffi.a \
    2.30 +		$(LIBETPAN_FDIK)/libetpan.a \
    2.31 +		$(PEP_ENGINE)/libpEpEngine.a \
    2.32 +		$(ASN1_PATH)/libasn1.a \
    2.33  		$(PEP_ADAPTER_LIBRARY)/libpEpAdapter.a \
    2.34  		$(MA_OBJECTS) $(SPIRIT_OBJECTS) $(LIB_TARGET) -o "$@"
    2.35  
    2.36 @@ -144,7 +146,7 @@
    2.37  	@echo >> local.conf
    2.38  	@echo "# path to Sequoia PGP" >> local.conf
    2.39  	@echo >> local.conf
    2.40 -	@echo "SEQOUIA_PGP=$(SEQOUIA_PGP)" >> local.conf
    2.41 +	@echo "SEQUOIA_PGP=$(SEQUOIA_PGP)" >> local.conf
    2.42  	@echo >> local.conf
    2.43  	@echo "# path to nettle and hogweed crypto libraries" >> local.conf
    2.44  	@echo >> local.conf