@@ -56,12 +56,22 @@ def work_func(x,outdir):
5656 parser .add_argument ( '--parallel' , default = False , action = "store_true" , help = "run parallelly default : run on single thread" )
5757 args = parser .parse_args ()
5858
59+ doc_target = [] # get sub directory under services (core/variant)
60+ for t in os .listdir ('.' ):
61+ if os .path .isdir (t ) and t .startswith (prefixDir ):
62+ doc_target .append (t )
63+ if len (doc_target ):
64+ print ('already existed doc_target' ,doc_target , 'len' ,len (doc_target ),'doc targets' )
65+ print ('move _doc_service_* to done_doc_service_*' )
66+ for t in doc_target :
67+ ret = subprocess .run ('mv -f {f} {t}' .format (f = t ,t = 'done' + t ),stdout = subprocess .PIPE , stderr = subprocess .PIPE , shell = True ,text = True )
68+
5969 os .makedirs (args .outReportDir ,exist_ok = True )
6070 startList = [ x .strip () for x in args .startDirname .split (',' ) ]
6171 extList = [ x .strip () for x in args .endExt .split (',' ) ]
6272 excludeList = ['mock' ,'unittest' ,'uts' ]
6373 filecnt = {}
64-
74+
6575 target = [] # get sub directory under services (core/variant)
6676 print (args .inDir )
6777 for t in os .listdir (args .inDir ):
@@ -72,10 +82,10 @@ def work_func(x,outdir):
7282 for t in target :
7383 if t .find ('telephony-service' ) >= 0 :
7484 inputDir = os .path .join (args .inDir , t )
75- shutil .rmtree (prefixDir + 'telephony-interface' ,ignore_errors = True )
76- targetDir = os .path .join (prefixDir + 'telephony-interface' ,'_hpp_' )
85+ shutil .rmtree (prefixDir + 'telephony-interface' + args . variant ,ignore_errors = True )
86+ targetDir = os .path .join (prefixDir + 'telephony-interface' + args . variant ,'_hpp_' )
7787 os .makedirs (targetDir ,exist_ok = True )
78- shutil .copy ('taf-doc.mk' , prefixDir + 'telephony-interface' )
88+ shutil .copy ('taf-doc.mk' , prefixDir + 'telephony-interface' + args . variant )
7989 for root , dirs ,files in os .walk (inputDir + '/interface' ):
8090 for file in files :
8191 exclFlag = False
@@ -87,7 +97,7 @@ def work_func(x,outdir):
8797 continue
8898 if file .split ('.' )[- 1 ] in extList :
8999 #print('copy',os.path.join(root, file), targetDir)
90- tname = 'telephony-interface'
100+ tname = 'telephony-interface' + args . variant
91101 if tname not in filecnt :
92102 filecnt [tname ] = 0
93103 filecnt [tname ] += 1
@@ -98,17 +108,17 @@ def work_func(x,outdir):
98108 #print('file:',servicefile)
99109 if servicefile .split ('.' )[- 1 ] in extList :
100110 #print('copy',os.path.join(args.inDir + '/' + t + '/service', servicefile), targetDir)
101- tname = 'telephony-interface'
111+ tname = 'telephony-interface' + args . variant
102112 if tname not in filecnt :
103113 filecnt [tname ] = 0
104114 filecnt [tname ] += 1
105115 shutil .copy (os .path .join (args .inDir + '/' + t + '/service' ,servicefile ), targetDir )
106116 elif os .path .isdir (os .path .join (args .inDir + '/' + t + '/service' ,servicefile )):
107117 inputDirSub = os .path .join (args .inDir + '/' + t + '/service' , servicefile )
108- shutil .rmtree (prefixDir + 'telephony-service-' + servicefile ,ignore_errors = True )
109- targetDirSub = os .path .join (prefixDir + 'telephony-service-' + servicefile ,'_hpp_' )
118+ shutil .rmtree (prefixDir + 'telephony-service-' + servicefile + args . variant ,ignore_errors = True )
119+ targetDirSub = os .path .join (prefixDir + 'telephony-service-' + servicefile + args . variant ,'_hpp_' )
110120 os .makedirs (targetDirSub ,exist_ok = True )
111- shutil .copy ('taf-doc.mk' , prefixDir + 'telephony-service-' + servicefile )
121+ shutil .copy ('taf-doc.mk' , prefixDir + 'telephony-service-' + servicefile + args . variant )
112122 #print('dir:',servicefile , inputDirSub , targetDirSub )
113123 for root , dirs ,files in os .walk (inputDirSub ):
114124 #print(files)
@@ -122,7 +132,7 @@ def work_func(x,outdir):
122132 continue
123133 if file .split ('.' )[- 1 ] in extList :
124134 #print('copy',os.path.join(root, file), targetDirSub)
125- tname = 'telephony-service-' + servicefile
135+ tname = 'telephony-service-' + servicefile + args . variant
126136 if tname not in filecnt :
127137 filecnt [tname ] = 0
128138 filecnt [tname ] += 1
@@ -131,10 +141,10 @@ def work_func(x,outdir):
131141 print ('error:' , file )
132142 continue
133143 inputDir = os .path .join (args .inDir , t )
134- shutil .rmtree (prefixDir + t ,ignore_errors = True )
135- targetDir = os .path .join (prefixDir + t ,'_hpp_' )
144+ shutil .rmtree (prefixDir + t + args . variant ,ignore_errors = True )
145+ targetDir = os .path .join (prefixDir + t + args . variant ,'_hpp_' )
136146 os .makedirs (targetDir ,exist_ok = True )
137- shutil .copy ('taf-doc.mk' , prefixDir + t )
147+ shutil .copy ('taf-doc.mk' , prefixDir + t + args . variant )
138148 for s in startList :
139149 for root , dirs ,files in os .walk (inputDir + '/' + s ):
140150 #print(root,files)
@@ -148,9 +158,10 @@ def work_func(x,outdir):
148158 continue
149159 if file .split ('.' )[- 1 ] in extList :
150160 #print('copy',os.path.join(root, file), targetDir)
151- if t not in filecnt :
152- filecnt [t ] = 0
153- filecnt [t ] += 1
161+ tname = t + args .variant
162+ if tname not in filecnt :
163+ filecnt [tname ] = 0
164+ filecnt [tname ] += 1
154165 shutil .copy (os .path .join (root , file ), targetDir )
155166
156167 pprint ( {'copy file count of ' + sys .argv [0 ] : filecnt } )
@@ -160,6 +171,8 @@ def work_func(x,outdir):
160171
161172 ret = subprocess .run ('taf_create_docker.sh' ,stdout = subprocess .PIPE , stderr = subprocess .PIPE , shell = True ,text = True )
162173 print ('taf_create_docker.sh : return code' , ret .returncode ,flush = True )
174+ print ('==> Done : make running environment' )
175+ print ()
163176
164177 doc_target = [] # get sub directory under services (core/variant)
165178 for t in os .listdir ('.' ):
0 commit comments