Merge pull request #310 from mwrlabs/develop

versioning fixes and updates to appveyor config

.appveyor.yml

@@ -1,8 +1,6 @@
 environment:
 
   matrix:
-    - PYTHON: "C:\\Python27"
-      JAVA_HOME: "C:\\Program Files (x86)\\Java\\jdk1.7.0"
     - PYTHON: "C:\\Python27-x64"
       JAVA_HOME: "C:\\Program Files\\Java\\jdk1.7.0"
 

setup.py

@@ -117,9 +117,17 @@ def get_package_data():
 				data[""].append(os.path.join(root, filename)[11:])
 	return data
 
+def get_version():
+	version_cmd = ['git', 'describe', '--tags', '|' ,'cut', '-c', '1-5']
+
+	if platform == "linux2" or platform == "linux":
+		return subprocess.check_output(' '.join(version_cmd),shell=True)
+	elif platform == "win32":
+		return subprocess.check_output(version_cmd,shell=True)
+
 setuptools.setup(
   name = meta.name,
-  version = str(meta.version),
+  version = get_version(),
   author = meta.vendor,
   author_email = meta.contact,
   description = meta.description,

src/drozer/meta.py

@@ -30,7 +30,7 @@ def __str__(self):
 
 name = "drozer"
 vendor = "MWR InfoSecurity"
-version = Version("2.4.3", "2017-03-09")
+version = Version("2.4.4", "2017-11-09")
 
 contact = "[email protected]"
 description = "The Leading Android Security Testing Framework"