Merge pull request #2 from blimmer/add-flag-to-strip-so-strip

Add a flag to skip .so file strip.

Author: tobilg

README.md

@@ -53,6 +53,7 @@ Usage: build.sh [-p PYTHON_VER] [-n NAME] [-r] [-h] [-v]
   -n NAME       : Name of the layer
   -r            : Raw mode, don't zip layer contents
   -d            : Don't install Python dependencies
+  -s            : Don't strip .so files
   -h            : Help
   -v            : Display build.sh version
 ```

_make.sh

@@ -56,8 +56,10 @@ rm -rf pip*
 find . -type d -name "tests" -exec rm -rf {} +
 find . -type d -name "test" -exec rm -rf {} +
 find . -type d -name "__pycache__" -exec rm -rf {} +
-find -name "*.so" -not -path "*/PIL/*" | xargs strip
-find -name "*.so.*" -not -path "*/PIL/*" | xargs strip
+if [[ "$STRIP" == true ]]; then
+    find -name "*.so" -not -path "*/PIL/*" | xargs strip
+    find -name "*.so.*" -not -path "*/PIL/*" | xargs strip
+fi
 find . -name '*.pyc' -delete
 if [[ -f "/temp/build/_clean.sh" ]]; then
     echo "Running custom cleaning script"

build.sh

@@ -32,17 +32,19 @@ usage() {
   echo -e "  -n NAME\t: Name of the layer"
   echo -e "  -r\t\t: Raw mode, don't zip layer contents"
   echo -e "  -d\t\t: Don't install Python dependencies"
+  echo -e "  -s\t\t: Don't strip .so files"
   echo -e "  -h\t\t: Help"
   echo -e "  -v\t\t: Display ${scriptname} version"
 }
 
 # Handle configuration
-while getopts ":p:n:drhv" arg; do
+while getopts ":p:n:dsrhv" arg; do
   case "${arg}" in
     p)  PYTHON_VER=${OPTARG};;
     n)  NAME=${OPTARG};;
     r)  RAW_MODE=true;;
     d)  NO_DEPS=true;;
+    s)  STRIP=false;;
     h)  usage; exit;;
     v)  displayVer; exit;;
     \?) echo -e "Error - Invalid option: $OPTARG"; usage; exit;;
@@ -59,6 +61,7 @@ BASE_DIR=$(basename $CURRENT_DIR)
 PARENT_DIR=${CURRENT_DIR%"${BASE_DIR}"}
 RAW_MODE="${RAW_MODE:-false}"
 NO_DEPS="${NO_DEPS:-false}"
+STRIP="${STRIP:-true}"
 
 # Find location of requirements.txt
 if [[ -f "${CURRENT_DIR}/requirements.txt" ]]; then
@@ -93,12 +96,12 @@ fi
 
 if [[ "$RAW_MODE" = true ]]; then
   echo "Using RAW mode"
-else 
+else
   echo "Using ZIP mode"
 fi
 
 # Run build
-docker run --rm -e PYTHON_VER="$PYTHON_VER" -e NAME="$NAME" -e RAW_MODE="$RAW_MODE" -e NO_DEPS="$NO_DEPS" -e PARENT_DIR="${PARENT_DIR}" -e SUBDIR_MODE="$SUBDIR_MODE" -v "$CURRENT_DIR":/var/task -v "$REQ_PATH":/temp/build/requirements.txt -v "$CLEAN_PATH":/temp/build/_clean.sh "lambci/lambda:build-python${PYTHON_VER}" bash /var/task/_make.sh
+docker run --rm -e PYTHON_VER="$PYTHON_VER" -e NAME="$NAME" -e RAW_MODE="$RAW_MODE" -e NO_DEPS="$NO_DEPS" -e STRIP="$STRIP" -e PARENT_DIR="${PARENT_DIR}" -e SUBDIR_MODE="$SUBDIR_MODE" -v "$CURRENT_DIR":/var/task -v "$REQ_PATH":/temp/build/requirements.txt -v "$CLEAN_PATH":/temp/build/_clean.sh "lambci/lambda:build-python${PYTHON_VER}" bash /var/task/_make.sh
 
 # Move ZIP to parent dir if SUBDIR_MODE set
 if [[ "$SUBDIR_MODE" ]]; then