Skip to content

Commit 4baf5dc

Browse files
committed
Add quarantine_support configuration option
Convert the --enable-quarantine-support installation option in a quarantine_support configuration option. When this option is enabled the autoinit sub-command produces the module shell code with quarantine mecahnism support. When disabled, code is generated without quarantine support. This way decision to have or not the quarantine mechanism code can also be made in initrc configuration file. As a result --enable-quarantine-support installation option new controls the default behavior to generate or not the quarantine code, but this could now be superseded in initrc configuration file. Different setup cases are foreseen: 1. quarantine code has been included in module shell function, then quarantine_support config is disabled > config disablement is not effective as shell code is already set 2. quarantine code has not been included in module shell function, then quarantine_support config is enabled > config enablement is not effective as shell code is already set 3. during module initialization, quarantine_support config is enabled in initrc > shell code generated with quarantine code 4. during module initialization, quarantine_support config is disabled in initrc > shell code generated without quarantine code 5. during module initialization, quarantine_support config is enabled by default or via env > shell code generated with quarantine code 6. during module initialization, quarantine_support config is disabled by default or via env > shell code generated with quarantine code
1 parent c273b56 commit 4baf5dc

File tree

4 files changed

+214
-183
lines changed

4 files changed

+214
-183
lines changed

Makefile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,9 @@ else
175175
endif
176176

177177
ifeq ($(quarantinesupport),y)
178-
setquarantinesupport :=
179-
setnotquarantinesupport := \#
178+
setquarantinesupport := 1
180179
else
181-
setquarantinesupport := \#
182-
setnotquarantinesupport :=
180+
setquarantinesupport := 0
183181
endif
184182

185183
ifeq ($(libtclenvmodules),y)
@@ -317,7 +315,6 @@ sed -e 's|@prefix@|$(prefix)|g' \
317315
-e 's|@setshellstartup@|$(setsetshellstartup)|g' \
318316
-e 's|@mcookieversioncheck@|$(setmcookieversioncheck)|g' \
319317
-e 's|@quarantinesupport@|$(setquarantinesupport)|g' \
320-
-e 's|@notquarantinesupport@|$(setnotquarantinesupport)|g' \
321318
-e 's|@libtclenvmodules@|$(setlibtclenvmodules)|g' \
322319
-e 's|@SHLIB_SUFFIX@|$(SHLIB_SUFFIX)|g' \
323320
-e 's|@multilibsupport@|$(setmultilibsupport)|g' \

init/Makefile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,6 @@ ifeq ($(silentshdbgsupport),y)
109109
else
110110
silentshdbgsupportre := /@silentshdbgsupport@/d
111111
endif
112-
ifeq ($(quarantinesupport),y)
113-
quarantinesupportre := s|@quarantinesupport@||g
114-
notquarantinesupportre := /@notquarantinesupport@/d
115-
else
116-
quarantinesupportre := /@quarantinesupport@/d
117-
notquarantinesupportre := s|@notquarantinesupport@||g
118-
endif
119112

120113
# comment entries if feature not enabled
121114
ifeq ($(versioning),y)
@@ -189,8 +182,6 @@ sed -e 's|@prefix@|$(prefix)|g' \
189182
-e '$(appendbinpathre)' \
190183
-e '$(prependbinpathre)' \
191184
-e '$(silentshdbgsupportre)' \
192-
-e '$(quarantinesupportre)' \
193-
-e '$(notquarantinesupportre)' \
194185
-e '$(usemanpathre)' \
195186
-e '$(notusemanpathre)' \
196187
-e $$'s|@modulerc@|$(modulerc)|g' \

0 commit comments

Comments
 (0)