[couchdb] branch main updated: Remove emilio

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/main by this push:
     new 904618e  Remove emilio
904618e is described below

commit 904618e29982f8a051fbf2dfcdbc0e51c83e65b3
Author: ncshaw <nc...@ibm.com>
AuthorDate: Mon Jul 19 13:57:48 2021 -0400

    Remove emilio
---
 .gitignore    |  1 -
 Makefile      |  7 +------
 Makefile.win  |  4 ----
 configure     | 14 --------------
 configure.ps1 | 14 --------------
 emilio.config | 18 ------------------
 6 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/.gitignore b/.gitignore
index f77e97f..1733a63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,7 +51,6 @@ src/couch/priv/couch_js/**/*.d
 src/couch/priv/icu_driver/couch_icu_driver.d
 src/mango/src/mango_cursor_text.nocompile
 src/docs/
-src/emilio/
 src/erlfdb/
 src/erlfmt/
 src/ets_lru/
diff --git a/Makefile b/Makefile
index 262a566..8400b70 100644
--- a/Makefile
+++ b/Makefile
@@ -147,7 +147,6 @@ fauxton: share/www
 .PHONY: check-all-tests
 # target: check - Test everything
 check-all-tests: all python-black
-	@$(MAKE) emilio
 	@$(MAKE) eunit
 	@$(MAKE) mango-test
 	@$(MAKE) elixir
@@ -159,8 +158,7 @@ subdirs=$(shell ls src)
 endif
 
 .PHONY: check
-check:  all
-	@$(MAKE) emilio
+check:  all 
 	@$(MAKE) erlfmt-check
 	@$(MAKE) eunit
 	@$(MAKE) elixir-suite
@@ -208,9 +206,6 @@ soak-eunit: couch
 	@$(REBAR) setup_eunit 2> /dev/null
 	while [ $$? -eq 0 ] ; do $(REBAR) -r eunit $(EUNIT_OPTS) ; done
 
-emilio:
-	@bin/emilio -c emilio.config src/ | bin/warnings_in_scope -s 3 || exit 0
-
 erlfmt-check:
 	ERLFMT_PATH=$(ERLFMT) python3 dev/format_check.py
 
diff --git a/Makefile.win b/Makefile.win
index 4add8e4..a6966c1 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -132,7 +132,6 @@ fauxton: share\www
 .PHONY: check
 # target: check - Test everything
 check: all python-black
-	@$(MAKE) emilio
 	@$(MAKE) erlfmt-check
 	@$(MAKE) eunit
 	@$(MAKE) mango-test
@@ -175,9 +174,6 @@ just-eunit: export ERL_AFLAGS = "-config $(shell echo %cd%)/rel/files/eunit.conf
 just-eunit:
 	@$(REBAR) -r eunit $(EUNIT_OPTS)
 
-emilio:
-	@bin\emilio -c emilio.config src\ | python.exe bin\warnings_in_scope -s 3 || exit 0
-
 erlfmt-check:
 	ERLFMT_PATH=bin\erlfmt python3 dev\format_check.py
 
diff --git a/configure b/configure
index adceffb..d5e9c20 100755
--- a/configure
+++ b/configure
@@ -314,18 +314,6 @@ install_local_erlfmt() {
     fi
 }
 
-install_local_emilio() {
-    if [ ! -x "${rootdir}/bin/emilio" ]; then
-        if [ ! -d "${rootdir}/src/emilio" ]; then
-            git clone --depth 1 https://github.com/cloudant-labs/emilio ${rootdir}/src/emilio
-        fi
-        cd ${rootdir}/src/emilio && ${REBAR} compile escriptize; cd ${rootdir}
-        mv ${rootdir}/src/emilio/emilio ${rootdir}/bin/emilio
-        chmod +x ${rootdir}/bin/emilio
-        cd ${rootdir}/src/emilio && ${REBAR} clean; cd ${rootdir}
-    fi
-}
-
 if [ -z "${REBAR}" ]; then
     install_local_rebar
     REBAR=${rootdir}/bin/rebar
@@ -341,8 +329,6 @@ if [ -z "${ERLFMT}" ]; then
     ERLFMT=${rootdir}/bin/erlfmt
 fi
 
-install_local_emilio
-
 # only update dependencies, when we are not in a release tarball
 if [ -d .git  -a $SKIP_DEPS -ne 1 ]; then
     echo "==> updating dependencies"
diff --git a/configure.ps1 b/configure.ps1
index 8935c3c..f66c0d8 100644
--- a/configure.ps1
+++ b/configure.ps1
@@ -201,20 +201,6 @@ if ((Get-Command "rebar.cmd" -ErrorAction SilentlyContinue) -eq $null)
    $env:Path += ";$rootdir\bin"
 }
 
-# check for emilio; if not found, get it and build it
-if ((Get-Command "emilio.cmd" -ErrorAction SilentlyContinue) -eq $null)
-{
-   Write-Verbose "==> emilio.cmd not found; bootstrapping..."
-   if (-Not (Test-Path "src\emilio"))
-   {
-      git clone --depth 1 https://github.com/wohali/emilio $rootdir\src\emilio
-   }
-   cmd /c "cd $rootdir\src\emilio && rebar compile escriptize; cd $rootdir"
-   cp $rootdir\src\emilio\emilio $rootdir\bin\emilio
-   cp $rootdir\src\emilio\bin\emilio.cmd $rootdir\bin\emilio.cmd
-   cmd /c "cd $rootdir\src\emilio && rebar clean; cd $rootdir"
-}
-
 # only update dependencies, when we are not in a release tarball
 if ( (Test-Path .git -PathType Container) -and (-not $SkipDeps) ) {
     Write-Verbose "==> updating dependencies"
diff --git a/emilio.config b/emilio.config
deleted file mode 100644
index 84a6571..0000000
--- a/emilio.config
+++ /dev/null
@@ -1,18 +0,0 @@
-{ignore, [
-    "src[\/]bear[\/]*",
-    "src[\/]b64url[\/]*",
-    "src[\/]docs[\/]*",
-    "src[\/]*[\/].eunit[\/]*",
-    "src[\/]fauxton[\/]*",
-    "src[\/]rebar[\/]*",
-    "src[\/]emilio[\/]*",
-    "src[\/]folsom[\/]*",
-    "src[\/]mochiweb[\/]*",
-    "src[\/]ssl_verify_fun[\/]*",
-    "src[\/]ibrowse[\/]*",
-    "src[\/]jiffy[\/]*",
-    "src[\/]meck[\/]*",
-    "src[\/]proper[\/]*",
-    "src[\/]recon[\/]*",
-    "src[\/]hyper[\/]*"
-]}.