Browse Source

support release (default)/debug build (engine only): for debug set BUILD_CONFIG=~/common/debug.conf

master
Arian Sanusi (untrusted build machine) Arian Sanusi (p≡p Foundation) 2 years ago
parent
commit
7404a757e1
No known key found for this signature in database GPG Key ID: 49B08FCFF6BC3B2
6 changed files with 26 additions and 15 deletions
  1. +2
    -2
      Makefile
  2. +11
    -0
      debug.conf
  3. +0
    -12
      local.conf
  4. +1
    -0
      local.conf
  5. +1
    -1
      prepareEnigmailTree.sh
  6. +11
    -0
      release.conf

+ 2
- 2
Makefile View File

@@ -44,10 +44,10 @@ build/bin/asn1c: | build
pepengine: build/include/libetpan.h | build/bin/asn1c
hg clone -r $(ENGINEREV) https://pep.foundation/dev/repos/pEpEngine/ pepengine || ( cd $@ ; hg pull ; hg update -r $(ENGINEREV) )

pepengine/local.conf: ~/common/local.conf pepengine
pepengine/%.conf: ~/common/%.conf pepengine
cp $< $@

pepengine/src/libpEpEngine.so: pepengine/local.conf yml2 build/include/libetpan.h build/bin/asn1c pepengine
pepengine/src/libpEpEngine.so: pepengine/local.conf pepengine/release.conf pepengine/debug.conf yml2 build/include/libetpan.h build/bin/asn1c pepengine
$(MAKE) -C pepengine all db #test

build/lib/libpEpEngine.so: pepengine/src/libpEpEngine.so


+ 11
- 0
debug.conf View File

@@ -0,0 +1,11 @@
#CFLAGS += -DDEBUG_ERRORSTACK=1
PREFIX=$(HOME)/build
SYSTEM_DB=./system.db
YML2_path=$(HOME)/yml2
ETPAN_LIB=-L$(PREFIX)/lib
ETPAN_INC=-I$(PREFIX)/include
ASN1C=$(PREFIX)/bin/asn1c
ASN1C_INC=-I$(PREFIX)/share

CFLAGS=-fPIC -fstrict-aliasing -g
CXXFLAGS=-I../src -I../asn.1 -I$(ETPAN_INC) -g

+ 0
- 12
local.conf View File

@@ -1,12 +0,0 @@
#CFLAGS += -DDEBUG_ERRORSTACK=1
PREFIX=$(HOME)/build
SYSTEM_DB=./system.db
YML2_path=$(HOME)/yml2
ETPAN_LIB=-L$(PREFIX)/lib
ETPAN_INC=-I$(PREFIX)/include
ASN1C=$(PREFIX)/bin/asn1c
ASN1C_INC=-I$(PREFIX)/share

CFLAGS=-fPIC -fstrict-aliasing -DDEBUG_ERRORSTACK
CXXFLAGS=-I../src -I../asn.1 -I$(ETPAN_INC) -DDEBUG_ERRORSTACK


+ 1
- 0
local.conf View File

@@ -0,0 +1 @@
release.conf

+ 1
- 1
prepareEnigmailTree.sh View File

@@ -43,7 +43,7 @@ cp "$systemDB" "${enigDist}/share/pEp"
cp "$mda" "$cpmda"
getMissingDeps "$cpmda"

find "${enigDist}/"{bin,lib} -exec strings {} \; | grep -P '.*\.so.*' | sort | uniq |
find "${enigDist}/"{bin,lib} -exec strings {} \; | grep -P '\.so\.' | sort | uniq |
while read dep ; do
dep=`basename "$dep"`
depAlreadyCopied=`find "$enigDist" "$target" -name "$dep"`


+ 11
- 0
release.conf View File

@@ -0,0 +1,11 @@
#CFLAGS += -DDEBUG_ERRORSTACK=1
PREFIX=$(HOME)/build
SYSTEM_DB=./system.db
YML2_path=$(HOME)/yml2
ETPAN_LIB=-L$(PREFIX)/lib
ETPAN_INC=-I$(PREFIX)/include
ASN1C=$(PREFIX)/bin/asn1c
ASN1C_INC=-I$(PREFIX)/share

CFLAGS=-fPIC -fstrict-aliasing -O3 -DNDEBUG
CXXFLAGS=-I../src -I../asn.1 -I$(ETPAN_INC) -O3 -DNDEBUG

Loading…
Cancel
Save