Merge pull request #9 from cbrainerd/feat_build_rebased

Prepare for automated builds

Author: dmoxon

Makefile

@@ -4,6 +4,8 @@ PYLINT=`which pylint`
 HEXAPARSE=./hexaparse.py
 
 DIST_DIR=dist
+BROWSER_VERS_STRING=`git describe --tags --exact-match --abbrev=0 || git rev-parse --short HEAD`
+
 
 clean:
 	-rm -rf $(DIST_DIR)
@@ -44,4 +46,4 @@ dist: check_cluster clean unittests tags
 	cp README.md $(DIST_DIR)
 	cp -r stat_key_browser $(DIST_DIR)
 	cp -r web_app $(DIST_DIR)
-	zip -r isilon_stat_browser_$$(git describe --exact-match --abbrev=0).zip dist/*
+	zip -r isilon_stat_browser_$(BROWSER_VERS_STRING).zip dist/*

stat_key_browser/cluster_config.py

@@ -1,11 +1,15 @@
 import sys
 try:
-    import isi_sdk
+    import isi_sdk_7_2 as isi_sdk
 except ImportError as err:
-    print('Unable to import isi_sdk. Please install the Isilon SDK.')
-    print('See https://github.com/isilon')
-    print(err)
-    sys.exit(1)
+    try:
+        # Try the original SDK library name
+        import isi_sdk
+    except ImportError as err:
+        print('Unable to import isi_sdk_7_2. Please install the Isilon SDK.')
+        print('See https://github.com/isilon')
+        print(err)
+        sys.exit(1)
 
 
 class ApiException(Exception):

stat_key_browser/key_collector.py

@@ -9,12 +9,16 @@
 import logging
 import sys
 try:
-    import isi_sdk
+    import isi_sdk_7_2 as isi_sdk
 except ImportError as err:
-    print('Unable to import isi_sdk. Please install the Isilon SDK.')
-    print('See https://github.com/isilon')
-    print(err)
-    sys.exit(1)
+    try:
+        # Try the original SDK library name
+        import isi_sdk
+    except ImportError as err:
+        print('Unable to import isi_sdk_7_2. Please install the Isilon SDK.')
+        print('See https://github.com/isilon')
+        print(err)
+        sys.exit(1)
 
 PRIMARY = 0
 

test1

@@ -1 +1,3 @@
-pass
+class TestBrowserBuilderFunctional(object):
+    def test_001_stub(self):
+        pass