Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
e3-require
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Anders Lindh Olsson
e3-require
Commits
e800f9b7
Commit
e800f9b7
authored
3 years ago
by
Juntong Liu
Browse files
Options
Downloads
Patches
Plain Diff
remove e3.cfg and ess-env.conf from .gitlabignore and delete DEFINES_REQUIRE
parent
9f842b91
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitignore
+0
-2
0 additions, 2 deletions
.gitignore
configure/E3/DEFINES_REQUIRE
+0
-34
0 additions, 34 deletions
configure/E3/DEFINES_REQUIRE
configure/RULES
+0
-1
0 additions, 1 deletion
configure/RULES
with
0 additions
and
37 deletions
.gitignore
+
0
−
2
View file @
e800f9b7
...
...
@@ -21,5 +21,3 @@ __pycache__
require-ess/require.Makefile
require-ess/Db/*.db
require-ess/Db/*.d
e3.cfg
tools/ess-env.conf
This diff is collapsed.
Click to expand it.
configure/E3/DEFINES_REQUIRE
deleted
100644 → 0
+
0
−
34
View file @
9f842b91
# 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
This diff is collapsed.
Click to expand it.
configure/RULES
+
0
−
1
View file @
e800f9b7
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment