enable elements by default in released artifacts

Author: Lawrence Nahum

.gitlab-ci.yml

@@ -10,10 +10,10 @@ linux_release:
     - ga
   script:
     - cd $CI_PROJECT_DIR
-    - ENABLE_ELEMENTS=--enable-elements ./tools/build_python_wheels.sh
-    - ENABLE_ELEMENTS=--enable-elements python setup.py sdist --dist-dir ./wally_core
-    - ENABLE_ELEMENTS=--enable-elements ./tools/build_android_libraries.sh
-    - ENABLE_ELEMENTS=--enable-elements ./tools/build_js_bindings.sh
+    - ./tools/build_python_wheels.sh
+    - python setup.py sdist --dist-dir ./wally_core
+    - ./tools/build_android_libraries.sh
+    - ./tools/build_js_bindings.sh
     - mv release wallycore-android-jni
     - tar cvf wally_dist/wallycore-android-jni.tar wallycore-android-jni
     - gzip -9 wally_dist/wallycore-android-jni.tar
@@ -49,7 +49,7 @@ ubuntu_release:
     - ga
   script:
     - cd $CI_PROJECT_DIR
-    - ENABLE_ELEMENTS=--enable-elements ./tools/build_python_wheels.sh python3
+    - ./tools/build_python_wheels.sh python3
 
 osx_release:
   tags:
@@ -119,7 +119,6 @@ windows10_release:
     - wally_dist\*
   script:
     - cd %CI_PROJECT_DIR%
-    - set ENABLE_ELEMENTS=-DBUILD_ELEMENTS=1
     - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
     - tools\msvc\wheel.bat
 

README.md

@@ -86,12 +86,6 @@ If you wish to explicitly choose the python version to use, set the
 `PYTHON_VERSION` environment variable (to e.g. `2`, `2.7`, `3` etc) before
 running `setup.py` or (when compiling manually) `./configure`.
 
-To build with Elements/Liquid support, set:
-
-```
-ENABLE_ELEMENTS="--enable-elements"
-```
-
 Before running pip.
 
 You can also install the binary wally releases using the released

setup.py

@@ -88,10 +88,9 @@ def call(cmd):
                 subprocess.check_call(cmd.split(' '), cwd=abs_path)
 
             # Run the autotools/make build to generate a python extension module
-            extra_build_options = os.getenv('ENABLE_ELEMENTS', '')
             call('./tools/cleanup.sh')
             call('./tools/autogen.sh')
-            call('./configure --enable-swig-python --enable-ecmult-static-precomputation {}'.format(extra_build_options))
+            call('./configure --enable-swig-python --enable-ecmult-static-precomputation --enable-elements')
             call('make -j{}'.format(multiprocessing.cpu_count()))
 
             # Copy the so that has just been built to the build_dir that distutils expects it to be in

tools/build_android_libraries.sh

@@ -38,7 +38,7 @@ for arch in $ARCH_LIST; do
     fi
 
     # What we want built
-    useropts="--enable-swig-java $ENABLE_ELEMENTS --enable-ecmult-static-precomputation"
+    useropts="--enable-swig-java --enable-elements --enable-ecmult-static-precomputation"
 
     # Configure and build with the above options
     android_build_wally $arch $toolsdir $api $useropts

tools/build_js_bindings.sh

@@ -4,7 +4,7 @@ set -e
 
 tools/cleanup.sh
 tools/autogen.sh
-./configure --enable-js-wrappers --disable-swig-python --disable-swig-java --enable-ecmult-static-precomputation $DEBUG_WALLY $ENABLE_ELEMENTS
+./configure --enable-js-wrappers --disable-swig-python --disable-swig-java --enable-ecmult-static-precomputation --enable-elements $DEBUG_WALLY
 num_jobs=4
 if [ -f /proc/cpuinfo ]; then
     num_jobs=$(grep ^processor /proc/cpuinfo | wc -l)

tools/msvc/swig.bat

@@ -1,5 +1,5 @@
 REM You need to set SWIG_PATH to the location where the swig zip
 REM file is expanded to
-%SWIG_PATH%\swig -python -Isrc -I%SWIG_PATH%\Lib\python %ENABLE_ELEMENTS% src\swig_python\swig.i
+%SWIG_PATH%\swig -python -Isrc -I%SWIG_PATH%\Lib\python -DBUILD_ELEMENTS=1 src\swig_python\swig.i
 copy src\swig_python\wallycore.py + src\swig_python\python_extra.py_in src\swig_python\wallycore\__init__.py /B
 del src\swig_python\wallycore.py