Fixing Maven coordinates for Bazel and adding feature artifact bundle.
Change-Id: Ic6a3120e5316afa2c394a1c904cf848bb7ed3c76
diff --git a/tools/build/bazel/onos_feature.py b/tools/build/bazel/onos_feature.py
index 731ce71..368d281 100755
--- a/tools/build/bazel/onos_feature.py
+++ b/tools/build/bazel/onos_feature.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
#FIXME Add license
-from zipfile import ZipFile
+from zipfile import ZipFile, ZipInfo
def generateOar(output, files=[]):
# Note this is not a compressed zip
@@ -12,9 +12,9 @@
dest = filename
else:
parts = mvnCoords.split(':')
- if len(parts) > 3:
- parts.insert(2, parts.pop()) # move version to the 3rd position
- groupId, artifactId, version = parts[0:3]
+ if len(parts) > 4:
+ parts.insert(3, parts.pop()) # move version to the 3rd position
+ groupId, artifactId, version = parts[1:4]
groupId = groupId.replace('.', '/')
extension = filename.split('.')[-1]
if extension == 'jar':
@@ -22,7 +22,9 @@
elif 'features.xml' in filename:
filename = '%s-%s-features.xml' % ( artifactId, version )
dest = '%s/%s/%s/%s' % ( groupId, artifactId, version, filename )
- zip.write(file, dest)
+ f = open(file, 'rb')
+ zip.writestr(ZipInfo(dest, date_time=(1980, 1, 1, 0, 0, 0)), f.read())
+ f.close()
if __name__ == '__main__':
import sys