Skip to content
Snippets Groups Projects
Commit 028f3eee authored by Aline Gondim Santos's avatar Aline Gondim Santos
Browse files

sdk: add merge option

The merging of JPL where only possible through the interactive
script. Having the merge as a python script option we can improve the
plugins packaging job.

Change-Id: I0f5b20c734a61fdef48a42dc72a12c665f3c9f79
parent ce3e8831
No related branches found
No related tags found
No related merge requests found
...@@ -62,9 +62,9 @@ def checkValidityJpls(filePaths): ...@@ -62,9 +62,9 @@ def checkValidityJpls(filePaths):
class JPLStructure: class JPLStructure:
def __init__(self, paths): def __init__(self, paths, output = ""):
self.paths = paths self.paths = paths
self.outputName = '' self.outputName = output
self.pluginNames = [] self.pluginNames = []
self.ZipObjcts = {} self.ZipObjcts = {}
self.getOutName() self.getOutName()
...@@ -212,14 +212,25 @@ def parser(): ...@@ -212,14 +212,25 @@ def parser():
help='output intermediate Path') help='output intermediate Path')
parser.add_argument('--distribution', type=str, default='', parser.add_argument('--distribution', type=str, default='',
help="GNU/Linux or Windows, leave empty. Android, type android") help="GNU/Linux or Windows, leave empty. Android, type android")
# to build or not to build # to build or not to build
parser.add_argument('--build', action='store_true') parser.add_argument('--build', action='store_true')
parser.add_argument(
'--preassemble', # to preassemble or not
action='store_true') # to preassemble or not parser.add_argument('--preassemble', action='store_true')
# to assemble jpl or not # to assemble jpl or not
parser.add_argument('--assemble', action='store_true') parser.add_argument('--assemble', action='store_true')
# to assemble jpl or not
parser.add_argument('--merge', action='store_true')
# to merge two or more jpl
parser.add_argument('--path', nargs='*', required=False,
help="Jpl full path")
parser.add_argument('--output', type=str, default='',
help="Jpl output full path")
args = parser.parse_args() args = parser.parse_args()
return args return args
...@@ -233,6 +244,8 @@ def main(): ...@@ -233,6 +244,8 @@ def main():
build(args.plugin) build(args.plugin)
if (args.assemble): if (args.assemble):
assemble(args.plugin, args.extraPath, args.distribution) assemble(args.plugin, args.extraPath, args.distribution)
if (args.merge):
JPLStructure(args.path, args.output)
if __name__ == '__main__': if __name__ == '__main__':
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment