Sketching out packaging via Bazel
- modified onos-gen-lib to generate http_file properly
- fixed deps.json entries for apache-karaf & patches .tar.gz files
- sketching tools/package/BUILD file
Change-Id: I311d66095e8d744b8f61a2f3b53a635a2a42732e
diff --git a/tools/build/bazel/generate_workspace.bzl b/tools/build/bazel/generate_workspace.bzl
index 6e3a5d4..d899c70 100644
--- a/tools/build/bazel/generate_workspace.bzl
+++ b/tools/build/bazel/generate_workspace.bzl
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Wed, 6 Jun 2018 21:12:50 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Mon, 11 Jun 2018 22:35:42 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
load("//tools/build/bazel:variables.bzl", "ONOS_GROUP_ID", "ONOS_VERSION")
@@ -790,16 +790,16 @@
sha1 = "d7cd09c4d1240b3acc3041fcb47fd74ae351698b",
)
- native.http_jar(
+ native.http_file(
name = "apache_karaf",
- url = "mvn:org.onosproject:apache-karaf-offline:tar.gz:3.0.8",
- sha256 = "2503c5853285e3414da15aef8d8f3f629747c927",
+ url = "http://repo1.maven.org/maven2/org/onosproject/apache-karaf-offline/3.0.8/apache-karaf-offline-3.0.8.tar.gz",
+ sha256 = "2f20bb25ded39f1e9e4148bb840473c89249bbb592106f5451b5a829a5ec8603",
)
- native.http_jar(
+ native.http_file(
name = "apache_karaf_patches",
- url = "mvn:org.onosproject:onos-apache-karaf-patches:tar.gz:3.0.8",
- sha256 = "be5d620a2c4f4c5faa520d2c1b949ad0cc29c84f",
+ url = "http://repo1.maven.org/maven2/org/onosproject/onos-apache-karaf-patches/3.0.8/onos-apache-karaf-patches-3.0.8.tar.gz",
+ sha256 = "1f9e3e8a53a462f776a931fe851819a43dfe7728b31fbde339b98d04908e702b",
)
native.maven_jar(
@@ -2208,8 +2208,8 @@
artifact_map[str(Label("@typesafe_config//jar"))] = "mvn:com.typesafe:config:jar:1.2.1"
artifact_map[str(Label("@validation_api//jar"))] = "mvn:javax.validation:validation-api:jar:1.1.0.Final"
artifact_map[str(Label("@checkstyle//jar"))] = "mvn:com.puppycrawl.tools:checkstyle:jar:8.10"
-artifact_map[str(Label("@apache_karaf//jar"))] = "mvn:org.onosproject:apache-karaf-offline:tar.gz:3.0.8"
-artifact_map[str(Label("@apache_karaf_patches//jar"))] = "mvn:org.onosproject:onos-apache-karaf-patches:tar.gz:3.0.8"
+artifact_map[str(Label("@apache_karaf//jar"))] = "http://repo1.maven.org/maven2/org/onosproject/apache-karaf-offline/3.0.8/apache-karaf-offline-3.0.8.tar.gz"
+artifact_map[str(Label("@apache_karaf_patches//jar"))] = "http://repo1.maven.org/maven2/org/onosproject/onos-apache-karaf-patches/3.0.8/onos-apache-karaf-patches-3.0.8.tar.gz"
artifact_map[str(Label("@bndlib//jar"))] = "mvn:biz.aQute.bnd:biz.aQute.bndlib:jar:3.1.0"
artifact_map[str(Label("@bndexe//jar"))] = "mvn:biz.aQute.bnd:biz.aQute.bnd:jar:3.1.0"
artifact_map[str(Label("@libthrift//jar"))] = "mvn:org.apache.thrift:libthrift:jar:0.9.3"
diff --git a/tools/build/bazel/onos_stage.py b/tools/build/bazel/onos_stage.py
deleted file mode 100755
index 8991dfa..0000000
--- a/tools/build/bazel/onos_stage.py
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/env python
-#FIXME Add license
-
-import re
-import os
-from zipfile import ZipFile
-from tarfile import TarFile, TarInfo
-import tarfile
-import time
-from cStringIO import StringIO
-import subprocess
-
-
-written_files = set()
-now = time.time()
-
-def addFile(tar, dest, file, file_size):
- if dest not in written_files:
- info = TarInfo(dest)
- info.size = file_size
- info.mtime = now
- info.mode = 0777
- tar.addfile(info, fileobj=file)
- written_files.add(dest)
-
-def addString(tar, dest, string):
- if dest not in written_files:
- print dest, string
- info = TarInfo(dest)
- info.size = len(string)
- info.mtime = now
- info.mode = 0777
- file = StringIO(string)
- tar.addfile(info, fileobj=file)
- file.close()
- written_files.add(dest)
-
-def getHash():
- p = subprocess.Popen('git rev-parse --verify HEAD --short', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
- (output, err) = p.communicate()
- return output if p.wait() == 0 else '0000000000'
-
-def stageOnos(output, version, files=[]):
- base = 'onos-%s/' % version
-
- runtimeVersion = version
- if version.endswith('-SNAPSHOT'):
- runtimeVersion = version.replace('-SNAPSHOT', '.%s' % getHash())
-
- # Note this is not a compressed zip
- with tarfile.open(output, 'w:gz') as output:
- for file in files:
- if '.zip' in file:
- with ZipFile(file, 'r') as zip_part:
- for f in zip_part.infolist():
- dest = f.filename
- if base not in dest:
- dest = base + 'apache-karaf-3.0.8/system/' + f.filename
- addFile(output, dest, zip_part.open(f), f.file_size)
- elif '.oar' in file:
- with ZipFile(file, 'r') as oar:
- app_xml = oar.open('app.xml').read()
- app_name = re.search('name="([^"]+)"', app_xml).group(1)
- dest = base + 'apps/%(name)s/%(name)s.oar' % { 'name': app_name}
- addFile(output, dest, open(file), os.stat(file).st_size)
- dest = base + 'apps/%s/app.xml' % app_name
- addString(output, dest, app_xml)
- for f in oar.infolist():
- filename = f.filename
- if 'm2' in filename:
- dest = base + 'apache-karaf-3.0.8/system/' + filename[3:]
- if dest not in written_files:
- addFile(output, dest, oar.open(f), f.file_size)
- written_files.add(dest)
- elif 'features.xml' in file:
- dest = base + 'apache-karaf-3.0.8/system/org/onosproject/onos-features/%s/' % version
- dest += 'onos-features-%s-features.xml' % version
- with open(file) as f:
- addFile(output, dest, f, os.stat(file).st_size)
- addString(output, base + 'apps/org.onosproject.drivers/active', '')
- addString(output, base + 'VERSION', runtimeVersion)
-
-if __name__ == '__main__':
- import sys
-
- if len(sys.argv) < 3:
- print 'USAGE' #FIXME
- sys.exit(1)
-
- output = sys.argv[1]
- version = sys.argv[2]
- args = sys.argv[3:]
-
- stageOnos(output, version, args)