From e800f9b7b0e1ead8b6f149dc98349cb5263b182e Mon Sep 17 00:00:00 2001
From: Juntong Liu <juntong.liu@ess.eu>
Date: Fri, 15 Oct 2021 12:50:15 +0000
Subject: [PATCH] remove e3.cfg and ess-env.conf from .gitlabignore and delete
 DEFINES_REQUIRE

---
 .gitignore                   |  2 --
 configure/E3/DEFINES_REQUIRE | 34 ----------------------------------
 configure/RULES              |  1 -
 3 files changed, 37 deletions(-)
 delete mode 100644 configure/E3/DEFINES_REQUIRE

diff --git a/.gitignore b/.gitignore
index f7d2fae6..52c69f2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,5 +21,3 @@ __pycache__
 require-ess/require.Makefile
 require-ess/Db/*.db
 require-ess/Db/*.d
-e3.cfg
-tools/ess-env.conf
diff --git a/configure/E3/DEFINES_REQUIRE b/configure/E3/DEFINES_REQUIRE
deleted file mode 100644
index c457312b..00000000
--- a/configure/E3/DEFINES_REQUIRE
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# Generate E3 setE3Env.bash configuration
-
-# Remove the genrated indent
-define G_E3_VAR0
-endef
-
-# EPICS_BASE
-define G_E3_VAR1
-declare -g DEFAULT_EPICS_BASE=$(E3_MODULES_PATH)
-endef
-
-# E3_REQUIRE_NAME
-define G_E3_VAR2
-declare -g DEFAULT_REQUIRE_NAME=$(E3_REQUIRE_NAME)
-endef
-
-
-# E3_REQUIRE_VERSION
-
-define G_E3_VAR3
-declare -g DEFAULT_REQUIRE_VERSION=$(E3_REQUIRE_VERSION)
-endef
-
-define E3_CFG_VARS :=
-$(G_E3_VAR0)
-$(G_E3_VAR1)
-$(G_E3_VAR2)
-$(G_E3_VAR3)
-endef
-
-
-VARS_EXCLUDES+=E3_CFG_VARS
-VARS_EXCLUDES+=G_E3_VAR0
diff --git a/configure/RULES b/configure/RULES
index 49e2bba9..e35fe641 100644
--- a/configure/RULES
+++ b/configure/RULES
@@ -5,7 +5,6 @@ include $(TOP)/configure/E3/DEFINES_FT
 #
 # We cannot use file operation in CentOS7.4,
 # because Makefile version is 3.8.
-# include $(TOP)/configure/E3/DEFINES_REQUIRE
 include $(TOP)/configure/E3/RULES_E3
 include $(TOP)/configure/E3/RULES_EPICS
 
-- 
GitLab