Change the default value of PDO_DEBUG_BUILD to 1.

This increases consistency with the SGX_MODE,
which is set to SIM by default.

Signed-off-by: Bruno Vavala <[email protected]>

.github/workflows/ci.yaml

@@ -23,7 +23,6 @@ jobs:
               if: "!contains(github.event.commits[0].message, '[debug]')"
               env:
                   PDO_INTERPRETER: ${{ matrix.interpreter }}
-                  PDO_DEBUG_BUILD: 1
                   PDO_LOG_LEVEL: warning
               run: |
                   # The creation of a dummy branch is necessary for the CI tests
@@ -38,7 +37,6 @@ jobs:
               if: "contains(github.event.commits[0].message, '[debug]')"
               env:
                   PDO_INTERPRETER: ${{ matrix.interpreter }}
-                  PDO_DEBUG_BUILD: 1
                   PDO_LOG_LEVEL: debug
               run: |
                   # The creation of a dummy branch is necessary for the CI tests

build/cmake/ProjectVariables.cmake

@@ -20,7 +20,7 @@
 ADD_COMPILE_OPTIONS(-m64 -fvisibility=hidden -fpie -fPIC -fstack-protector)
 ADD_COMPILE_OPTIONS($<$<COMPILE_LANGUAGE:CXX>:-std=c++11>)
 
-OPTION(PDO_DEBUG_BUILD "Build with debugging turned on" 0)
+OPTION(PDO_DEBUG_BUILD "Build with debugging turned on" 1)
 
 IF (DEFINED ENV{PDO_DEBUG_BUILD})
   SET(PDO_DEBUG_BUILD $ENV{PDO_DEBUG_BUILD})

docker/Makefile

@@ -26,7 +26,7 @@ PDO_SOURCE_ROOT ?= $(realpath $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/../
 
 # PDO_DEBUG_BUILD
 # The flag that determines the build type (debug or not).
-PDO_DEBUG_BUILD ?= ${PDO_DEBUG_BUILD:-0}
+PDO_DEBUG_BUILD ?= 1
 
 # PDO_REPO --
 #   The URL or path to the git repository, the default uses the current repository
@@ -69,6 +69,9 @@ TIMESTAMP := $(shell /bin/date "+%Y%m%d%H%M%S")
 
 all : $(addprefix build_,$(IMAGES))
 
+show:
+	echo ${PDO_DEBUG_BUILD}
+
 rebuild_% : repository
 	$(DOCKER_COMMAND) build $(DOCKER_ARGS) \
 		--build-arg REBUILD=$(TIMESTAMP) \

docker/pdo_ccf.dockerfile

@@ -30,7 +30,7 @@ ARG REBUILD=0
 ARG SGX_MODE=SIM
 ENV SGX_MODE=$SGX_MODE
 
-ARG PDO_DEBUG_BUILD=0
+ARG PDO_DEBUG_BUILD=1
 ENV PDO_DEBUG_BUILD=${PDO_DEBUG_BUILD}
 
 # XFER_DIR is the directory where the networkcert.pem file is

docker/pdo_client.dockerfile

@@ -42,7 +42,7 @@ USER $UNAME
 # -----------------------------------------------------------------
 ARG REBUILD=0
 
-ARG PDO_DEBUG_BUILD=0
+ARG PDO_DEBUG_BUILD=1
 ENV PDO_DEBUG_BUILD=${PDO_DEBUG_BUILD}
 
 ARG PDO_LEDGER_TYPE=ccf

docker/pdo_services.dockerfile

@@ -30,7 +30,7 @@ ARG REBUILD=0
 ARG SGX_MODE=SIM
 ENV SGX_MODE $SGX_MODE
 
-ARG PDO_DEBUG_BUILD=0
+ARG PDO_DEBUG_BUILD=1
 ENV PDO_DEBUG_BUILD=${PDO_DEBUG_BUILD}
 
 ARG PDO_LEDGER_TYPE=ccf

docker/test.yaml

@@ -29,12 +29,12 @@ services:
     environment:
       - PDO_VERSION=${PDO_VERSION}
       - PDO_LOG_LEVEL=${PDO_LOG_LEVEL:-info}
-      - PDO_DEBUG_BUILD=${PDO_DEBUG_BUILD:-0}
+      - PDO_DEBUG_BUILD=${PDO_DEBUG_BUILD:-1}
     entrypoint: /project/pdo/tools/run_services_tests.sh
 
   client_container:
     environment:
       - PDO_VERSION=${PDO_VERSION}
       - PDO_LOG_LEVEL=${PDO_LOG_LEVEL:-info}
-      - PDO_DEBUG_BUILD=${PDO_DEBUG_BUILD:-0}
+      - PDO_DEBUG_BUILD=${PDO_DEBUG_BUILD:-1}
     entrypoint: /project/pdo/tools/run_client_tests.sh

docker/tools/environment.sh

@@ -25,7 +25,7 @@ export SGX_MODE=${SGX_MODE:-SIM}
 export PDO_LEDGER_TYPE=${PDO_LEDGER_TYPE:-ccf}
 export PDO_INTERPRETER=${PDO_INTERPRETER:-wawaka}
 export WASM_MEM_CONFIG=${WASM_MEM_CONFIG:-MEDIUM}
-export PDO_DEBUG_BUILD=${PDO_DEBUG_BUILD:-0}
+export PDO_DEBUG_BUILD=${PDO_DEBUG_BUILD:-1}
 
 # these variables are internal to the layout of the container and immutable
 export PDO_SOURCE_ROOT=/project/pdo/src

docs/environment.md

@@ -90,7 +90,7 @@ will be exported. Defaults to HOSTNAME.
 
 <!-- -------------------------------------------------- -->
 ### `PDO_DEBUG_BUILD`
-(default: 0)
+(default: 1)
 
 `PDO_DEBUG_BUILD` builds PDO modules for debugging. This includes
 compile flags, logging statements in the enclave, etc. Since

eservice/setup.py

@@ -54,7 +54,7 @@
 ## -----------------------------------------------------------------
 ## set up the contract enclave
 ## -----------------------------------------------------------------
-debug_flag_env = os.environ.get('PDO_DEBUG_BUILD', '0')
+debug_flag_env = os.environ.get('PDO_DEBUG_BUILD', '1')
 if debug_flag_env not in ['0', '1'] :
     print(f'error: PDO_DEBUG_BUILD must be 0 or 1, current value is {debug_flag_env}')
     sys.exit(2)

pservice/setup.py

@@ -52,7 +52,7 @@
 ## -----------------------------------------------------------------
 ## set up the PService enclave
 ## -----------------------------------------------------------------
-debug_flag_env = os.environ.get('PDO_DEBUG_BUILD', '0')
+debug_flag_env = os.environ.get('PDO_DEBUG_BUILD', '1')
 if debug_flag_env not in ['0', '1'] :
     print(f'error: PDO_DEBUG_BUILD must be 0 or 1, current value is {debug_flag_env}')
     sys.exit(2)

python/setup.py

@@ -48,7 +48,7 @@
 # note that setuptools does not make it easy to pass custom command
 # line parameters so we have to use environment variables
 # -----------------------------------------------------------------
-debug_flag = int(os.environ.get('PDO_DEBUG_BUILD', 0))
+debug_flag = int(os.environ.get('PDO_DEBUG_BUILD', 1))
 if debug_flag :
     print("Build debug")