Skip to content

Commit 3caebe5

Browse files
degaudendegauden
committed
Add the new Exit.Code class
1 parent 8dfd9ac commit 3caebe5

18 files changed

Lines changed: 118 additions & 36 deletions

‎ElementsExamples/python/ElementsExamples/PythonProgramExample.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
from ElementsKernel.Program import str_to_bool
66
from ElementsExamples.PythonModuleExample import ClassExample
77

8+
from ElementsKernel import Exit
9+
810

911
def myLocalLogTestFunc():
1012
"""
@@ -148,4 +150,4 @@ def mainMethod(args):
148150

149151
logger.info('Exiting ProgramExample mainMethod()')
150152

151-
return 0
153+
return Exit.Code.OK

‎ElementsExamples/python/ElementsExamples/PythonTestProgramExample.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
""" Small example for a python based script """
22

33
import argparse
4-
from ElementsKernel import Logging
4+
from ElementsKernel import Logging, Exit
55

66

77
def defineSpecificProgramOptions():
@@ -33,4 +33,4 @@ def mainMethod(args):
3333

3434
logger.info('Exiting TestProgramExample mainMethod()')
3535

36-
return 0
36+
return Exit.Code.OK

‎ElementsExamples/python/ElementsExamples/SwigProgramExample.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import argparse
44
import ElementsKernel.Logging as log
5+
from ElementsKernel import Exit
56

67
from SwigExample import functionExample
78

@@ -47,4 +48,4 @@ def mainMethod(args):
4748

4849
logger.info('Exiting SwigProgramExample mainMethod()')
4950

50-
return 0
51+
return Exit.Code.OK

‎ElementsKernel/python/ElementsKernel/AddCppClass.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,13 @@
2727
import argparse
2828
import os
2929
import time
30+
3031
import ElementsKernel.ProjectCommonRoutines as epcr
3132
import ElementsKernel.ParseCmakeListsMacros as pclm
3233
import ElementsKernel.Logging as log
3334

35+
from ElementsKernel import Exit
36+
3437
logger = log.getLogger('AddCppClass')
3538

3639
# Define constants
@@ -352,7 +355,7 @@ def mainMethod(args):
352355
logger.info('# Logging from the mainMethod() of the AddCppClass script ')
353356
logger.info('#')
354357

355-
exit_code = 0
358+
exit_code = Exit.Code.OK
356359

357360
elements_dep_list = args.elements_dependency
358361
library_dep_list = args.external_dependency
@@ -384,7 +387,7 @@ def mainMethod(args):
384387
if str(msg):
385388
logger.error(msg)
386389
logger.error('# Script aborted.')
387-
exit_code = 1
390+
exit_code = Exit.Code.NOT_OK
388391
else:
389392
logger.info('# Script over.')
390393

‎ElementsKernel/python/ElementsKernel/AddCppProgram.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
import ElementsKernel.ParseCmakeListsMacros as pclm
3232
import ElementsKernel.Logging as log
3333

34+
from ElementsKernel import Exit
35+
3436
logger = log.getLogger('AddCppProgram')
3537

3638
# Define constants
@@ -223,7 +225,7 @@ def mainMethod(args):
223225
logger.info('# Logging from the mainMethod() of the AddCppProgram script')
224226
logger.info('#')
225227

226-
exit_code = 0
228+
exit_code = Exit.Code.OK
227229

228230
program_name = args.program_name
229231
module_list = args.module_dependency
@@ -256,7 +258,7 @@ def mainMethod(args):
256258
if str(msg):
257259
logger.error(msg)
258260
logger.error('# Script aborted.')
259-
exit_code = 1
261+
exit_code = Exit.Code.NOT_OK
260262
else:
261263
logger.info('# Script over.')
262264

‎ElementsKernel/python/ElementsKernel/AddModule.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,14 @@
2626

2727
import argparse
2828
import os
29+
2930
import ElementsKernel.ProjectCommonRoutines as epcr
3031
import ElementsKernel.ParseCmakeLists as pcl
3132
import ElementsKernel.ParseCmakeListsMacros as pclm
3233
import ElementsKernel.Logging as log
3334

35+
from ElementsKernel import Exit
36+
3437
try:
3538
from builtins import input
3639
except:
@@ -225,7 +228,7 @@ def mainMethod(args):
225228
Main
226229
"""
227230

228-
exit_code = 0
231+
exit_code = Exit.Code.OK
229232

230233
logger.info('#')
231234
logger.info('# Logging from the mainMethod() of the AddModule script ')
@@ -251,7 +254,7 @@ def mainMethod(args):
251254
if str(msg):
252255
logger.error(msg)
253256
logger.error('# Script aborted.')
254-
exit_code = 1
257+
exit_code = Exit.Code.NOT_OK
255258
else:
256259
logger.info('# Script over.')
257260

‎ElementsKernel/python/ElementsKernel/AddPythonModule.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
import ElementsKernel.ParseCmakeLists as pcl
3232
import ElementsKernel.Logging as log
3333

34+
from ElementsKernel import Exit
35+
3436
logger = log.getLogger('AddPythonModule')
3537

3638
# Define constants
@@ -198,7 +200,7 @@ def mainMethod(args):
198200
logger.info('# Logging from the mainMethod() of the AddPythonModule script')
199201
logger.info('#')
200202

201-
exit_code = 0
203+
exit_code = Exit.Code.OK
202204

203205
python_module_name = args.module_name
204206

@@ -230,7 +232,7 @@ def mainMethod(args):
230232
if str(msg):
231233
logger.error(msg)
232234
logger.error('# Script aborted.')
233-
exit_code = 1
235+
exit_code = Exit.Code.NOT_OK
234236
else:
235237
logger.info('# Script over.')
236238

‎ElementsKernel/python/ElementsKernel/AddPythonProgram.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
import ElementsKernel.ParseCmakeListsMacros as pclm
3333
import ElementsKernel.Logging as log
3434

35+
from ElementsKernel import Exit
36+
3537
logger = log.getLogger('AddPythonProgram')
3638

3739
# Define constants
@@ -194,7 +196,7 @@ def mainMethod(args):
194196
logger.info('# Logging from the mainMethod() of the AddPythonProgram script')
195197
logger.info('#')
196198

197-
exit_code = 0
199+
exit_code = Exit.Code.OK
198200

199201
program_name = args.program_name
200202

@@ -226,7 +228,7 @@ def mainMethod(args):
226228
if str(msg):
227229
logger.error(msg)
228230
logger.error('# Script aborted.')
229-
exit_code = 1
231+
exit_code = Exit.Code.NOT_OK
230232
else:
231233
logger.info('# Script over.')
232234

‎ElementsKernel/python/ElementsKernel/AddScript.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
import ElementsKernel.ParseCmakeLists as pcl
3232
import ElementsKernel.Logging as log
3333

34+
from ElementsKernel import Exit
35+
3436
logger = log.getLogger('AddScript')
3537

3638
# Define constants
@@ -163,7 +165,7 @@ def mainMethod(args):
163165
logger.info('# Logging from the mainMethod() of the AddScript script')
164166
logger.info('#')
165167

166-
exit_code = 0
168+
exit_code = Exit.Code.OK
167169

168170
program_name = args.program_name
169171

@@ -194,7 +196,7 @@ def mainMethod(args):
194196
if str(msg):
195197
logger.error(msg)
196198
logger.error('# Script aborted.')
197-
exit_code = 1
199+
exit_code = Exit.Code.NOT_OK
198200
else:
199201
logger.info('# Script over.')
200202

‎ElementsKernel/python/ElementsKernel/CreateProject.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import argparse
2828
import ElementsKernel.Logging as log
2929
from ElementsKernel import Project, ProjectCommonRoutines
30+
from ElementsKernel import Exit
3031

3132
def defineSpecificProgramOptions():
3233
"""
@@ -100,7 +101,7 @@ def mainMethod(args):
100101
Main
101102
"""
102103

103-
exit_code = 0
104+
exit_code = Exit.Code.OK
104105

105106
logger = log.getLogger('CreateElementsProject')
106107

@@ -139,7 +140,7 @@ def mainMethod(args):
139140
if str(msg):
140141
logger.error(msg)
141142
logger.error('# Script aborted.')
142-
exit_code = 1
143+
exit_code = Exit.Code.NOT_OK
143144
else:
144145
logger.info('# Script over.')
145146

0 commit comments

Comments
 (0)