Merge pull request #2 from alfred-bratterud/master

Reorganize scripts

Author: alfreb

.editorconfig

@@ -0,0 +1,26 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+draw_white_space = all
+trim_trailing_white_space_on_save = true
+
+[Makefile]
+indent_style = tab
+
+[Makelib]
+indent_style = tab
+
+[*.py]
+indent_size = 4
+
+[boot]
+indent_size = 4
+
+[*.asm]
+indent_size = 4

conanfile.py

@@ -0,0 +1,49 @@
+import os
+from conans import ConanFile,tools
+
+def get_version():
+    git = tools.Git()
+    try:
+        prev_tag = git.run("describe --tags --abbrev=0")
+        commits_behind = int(git.run("rev-list --count %s..HEAD" % (prev_tag)))
+        # Commented out checksum due to a potential bug when downloading from bintray
+        #checksum = git.run("rev-parse --short HEAD")
+        if prev_tag.startswith("v"):
+            prev_tag = prev_tag[1:]
+        if commits_behind > 0:
+            prev_tag_split = prev_tag.split(".")
+            prev_tag_split[-1] = str(int(prev_tag_split[-1]) + 1)
+            output = "%s-%d" % (".".join(prev_tag_split), commits_behind)
+        else:
+            output = "%s" % (prev_tag)
+        return output
+    except:
+        return '0.0.0'
+    
+
+class VmrunnerConan(ConanFile):
+    name = "vmrunner"
+    version = get_version()
+    license = "Apache-2.0"
+    description = "A set of tools for booting IncludeOS binaries as VM's"
+    scm = {
+        "type" : "git",
+        "url" : "auto",
+        "subfolder": ".",
+        "revision" : "auto"
+    }
+    no_copy_source=True
+    default_user="includeos"
+    default_channel="test"
+
+    def package(self):
+        self.copy("*", dst="vmrunner", src="vmrunner")
+        self.copy("*", dst="bin", src="scripts")        
+
+    def package_info(self):
+        self.env_info.INCLUDEOS_VMRUNNER=self.package_folder
+        self.env_info.path.append((os.path.join(self.package_folder, "bin")))
+        
+    def deploy(self):
+        self.copy("*", dst="vmrunner",src="vmrunner")
+        self.copy("*", dst="bin",src="bin")

etc/boot scripts/bootetc/boot renamed to scripts/boot

@@ -11,21 +11,20 @@ import argparse
 import subprocess
 import re
 
-INCLUDEOS_PREFIX = None
-default_prefix = "/usr/local/includeos"
-
-# Locate IncludeOS installation
-if "INCLUDEOS_PREFIX" not in os.environ:
-    INCLUDEOS_PREFIX = default_prefix
-else:
-    INCLUDEOS_PREFIX = os.environ['INCLUDEOS_PREFIX']
-
-if not os.path.isdir(INCLUDEOS_PREFIX):
-    print "Couldn't find IncludeOS installation. If you installed to a non-default location (e.g. not " + default_prefix + ") please set the environment variable INCLUDEOS_PREFIX to point to this location."
+INCLUDEOS_VMRUNNER = None
+
+# Locate vmrunner installation
+if "INCLUDEOS_VMRUNNER" not in os.environ or not os.path.isdir(os.environ['INCLUDEOS_VMRUNNER']):
+    errmsg="""
+    Couldn't find vmrunner installation. Please set the environment variable
+    INCLUDEOS_VMRUNNER to point to this location (if your using conan virtualenv
+    this should have been done for you)
+    """
+    print(errmsg)
     sys.exit(0)
 
 # Location of vmrunner
-sys.path.append(INCLUDEOS_PREFIX+'/tools')
+sys.path.append(os.environ["INCLUDEOS_VMRUNNER"])
 
 from vmrunner.prettify import color
 
@@ -160,10 +159,13 @@ hyper_name = "qemu"
 if args.solo5:
     hyper_name = "solo5"
     os.environ['PLATFORM'] = "x86_solo5"
-    solo5_hvt = INCLUDEOS_PREFIX + "/x86_64/bin/solo5-hvt"
+
+    # We expect these to be added to path now, e.g. by conan virtualenv
+    solo5_hvt  = "solo5-hvt"
+    solo5_ifup = "solo5-ifup.sh"
 
     subprocess.call(['chmod', '+x', solo5_hvt])
-    subprocess.call(['sudo', INCLUDEOS_PREFIX + "/scripts/solo5-ifup.sh" ])
+    subprocess.call(['sudo', solo5_ifup])
 
 vm = vmrunner.add_vm(config = config, hyper_name = hyper_name)
 
@@ -182,7 +184,7 @@ if (args.debug):
 
 if args.bridge:
     print INFO, "Creating bridge"
-    subprocess.call(INCLUDEOS_PREFIX + "/scripts/create_bridge.sh", shell=True)
+    subprocess.call("create_bridge.sh", shell=True)
 
 # If the binary name is a folder, such as ".", build the service
 if os.path.isdir(image_name):
@@ -207,7 +209,7 @@ if (args.grub or args.grub_reuse):
     if args.grub_reuse:
         opts += "-u "
 
-    subprocess.call(INCLUDEOS_PREFIX + "/scripts/grubify.sh " + opts + image_name, shell=True)
+    subprocess.call("grubify.sh " + opts + image_name, shell=True)
     image_name = image_name + ".grub.img"
     has_bootloader = True