# Rework the logic of determining the version (didn't work) diff --git a/Cura/util/version.py b/Cura/util/version.py index 56faeee..add5eb0 100644 --- a/Cura/util/version.py +++ b/Cura/util/version.py @@ -17,70 +17,12 @@ except: from Cura.util import resources def getVersion(getGitVersion = True): - gitPath = os.path.abspath(os.path.join(os.path.split(os.path.abspath(__file__))[0], "../..")) - if hasattr(sys, 'frozen'): - versionFile = os.path.normpath(os.path.join(resources.resourceBasePath, "version")) - else: - versionFile = os.path.abspath(os.path.join(os.path.split(os.path.abspath(__file__))[0], "../version")) - - if getGitVersion: - try: - gitProcess = subprocess.Popen(args = "git show -s --pretty=format:%H", shell = True, cwd = gitPath, stdout = subprocess.PIPE, stderr = subprocess.PIPE) - (stdoutdata, stderrdata) = gitProcess.communicate() - - if gitProcess.returncode == 0: - return stdoutdata - except: - pass - - gitHeadFile = gitPath + "/.git/refs/heads/SteamEngine" - if os.path.isfile(gitHeadFile): - if not getGitVersion: - return "dev" - f = open(gitHeadFile, "r") - version = f.readline() - f.close() - return version.strip() - if os.path.exists(versionFile): - f = open(versionFile, "r") - version = f.readline() - f.close() - return version.strip() - versionFile = os.path.abspath(os.path.join(os.path.split(os.path.abspath(__file__))[0], "../../version")) - if os.path.exists(versionFile): - f = open(versionFile, "r") - version = f.readline() - f.close() - return version.strip() - return "UNKNOWN" #No idea what the version is. TODO:Tell the user. + return "REPLACE_THIS_IN_SPEC" def isDevVersion(): - gitPath = os.path.abspath(os.path.join(os.path.split(os.path.abspath(__file__))[0], "../../.git")) - hgPath = os.path.abspath(os.path.join(os.path.split(os.path.abspath(__file__))[0], "../../.hg")) - return os.path.exists(gitPath) or os.path.exists(hgPath) + return False def checkForNewerVersion(): - if isDevVersion(): - return None - try: - updateBaseURL = 'http://software.ultimaker.com' - localVersion = map(int, getVersion(False).split('.')) - while len(localVersion) < 3: - localVersion += [1] - latestFile = urllib2.urlopen("%s/latest.xml" % (updateBaseURL)) - latestXml = latestFile.read() - latestFile.close() - xmlTree = ElementTree.fromstring(latestXml) - for release in xmlTree.iter('release'): - os = str(release.attrib['os']) - version = [int(release.attrib['major']), int(release.attrib['minor']), int(release.attrib['revision'])] - filename = release.find("filename").text - if platform.system() == os: - if version > localVersion: - return "%s/current/%s" % (updateBaseURL, filename) - except: - #print sys.exc_info() - return None return None if __name__ == '__main__':