cura-version.patch

   1 # Rework the logic of determining the version (didn't work)
   2 diff --git a/Cura/util/version.py b/Cura/util/version.py
   3 index 56faeee..add5eb0 100644
   4 --- a/Cura/util/version.py
   5 +++ b/Cura/util/version.py
   6 @@ -17,70 +17,12 @@ except:
   7  from Cura.util import resources
   8
   9  def getVersion(getGitVersion = True):
  10 -       gitPath = os.path.abspath(os.path.join(os.path.split(os.path.abspath(__file__))[0], "../.."))
  11 -       if hasattr(sys, 'frozen'):
  12 -               versionFile = os.path.normpath(os.path.join(resources.resourceBasePath, "version"))
  13 -       else:
  14 -               versionFile = os.path.abspath(os.path.join(os.path.split(os.path.abspath(__file__))[0], "../version"))
  15 -
  16 -       if getGitVersion:
  17 -               try:
  18 -                       gitProcess = subprocess.Popen(args = "git show -s --pretty=format:%H", shell = True, cwd = gitPath, stdout = subprocess.PIPE, stderr = subprocess.PIPE)
  19 -                       (stdoutdata, stderrdata) = gitProcess.communicate()
  20 -
  21 -                       if gitProcess.returncode == 0:
  22 -                               return stdoutdata
  23 -               except:
  24 -                       pass
  25 -
  26 -       gitHeadFile = gitPath + "/.git/refs/heads/SteamEngine"
  27 -       if os.path.isfile(gitHeadFile):
  28 -               if not getGitVersion:
  29 -                       return "dev"
  30 -               f = open(gitHeadFile, "r")
  31 -               version = f.readline()
  32 -               f.close()
  33 -               return version.strip()
  34 -       if os.path.exists(versionFile):
  35 -               f = open(versionFile, "r")
  36 -               version = f.readline()
  37 -               f.close()
  38 -               return version.strip()
  39 -       versionFile = os.path.abspath(os.path.join(os.path.split(os.path.abspath(__file__))[0], "../../version"))
  40 -       if os.path.exists(versionFile):
  41 -               f = open(versionFile, "r")
  42 -               version = f.readline()
  43 -               f.close()
  44 -               return version.strip()
  45 -       return "UNKNOWN" #No idea what the version is. TODO:Tell the user.
  46 +       return "REPLACE_THIS_IN_SPEC"
  47
  48  def isDevVersion():
  49 -       gitPath = os.path.abspath(os.path.join(os.path.split(os.path.abspath(__file__))[0], "../../.git"))
  50 -       hgPath  = os.path.abspath(os.path.join(os.path.split(os.path.abspath(__file__))[0], "../../.hg"))
  51 -       return os.path.exists(gitPath) or os.path.exists(hgPath)
  52 +       return False
  53
  54  def checkForNewerVersion():
  55 -       if isDevVersion():
  56 -               return None
  57 -       try:
  58 -               updateBaseURL = 'http://software.ultimaker.com'
  59 -               localVersion = map(int, getVersion(False).split('.'))
  60 -               while len(localVersion) < 3:
  61 -                       localVersion += [1]
  62 -               latestFile = urllib2.urlopen("%s/latest.xml" % (updateBaseURL))
  63 -               latestXml = latestFile.read()
  64 -               latestFile.close()
  65 -               xmlTree = ElementTree.fromstring(latestXml)
  66 -               for release in xmlTree.iter('release'):
  67 -                       os = str(release.attrib['os'])
  68 -                       version = [int(release.attrib['major']), int(release.attrib['minor']), int(release.attrib['revision'])]
  69 -                       filename = release.find("filename").text
  70 -                       if platform.system() == os:
  71 -                               if version > localVersion:
  72 -                                       return "%s/current/%s" % (updateBaseURL, filename)
  73 -       except:
  74 -               #print sys.exc_info()
  75 -               return None
  76         return None
  77
  78  if __name__ == '__main__':