Merge pull request #138 from stonebig/master

stonebig · stonebig · commit 52b673619cf2 · 2015-07-28T08:17:47.000+02:00
remove unused code
diff --git a/make.py b/make.py
@@ -95,8 +95,6 @@ def build_nsis(srcname, dstname, data):
 
 class WinPythonDistribution(object):
     """WinPython distribution"""
-    THG_PATH = r'\tools\TortoiseHg\thgw.exe'
-    WINMERGE_PATH = r'\tools\WinMerge\WinMergeU.exe'
     MINGW32_PATH = r'\tools\mingw32\bin'
     R_PATH = r'\tools\R\bin'
     JULIA_PATH = r'\tools\Julia\bin'
@@ -149,12 +147,6 @@ def get_tool_path(relpath, checkfunc):
                 path = self.winpydir + relpath
                 if checkfunc(path):
                     return path
-        thgpath = get_tool_path(self.THG_PATH, osp.isfile)
-        if thgpath is not None:
-            thgver = utils.get_thg_version(osp.dirname(thgpath))
-            installed_tools += [('TortoiseHg', thgver)]
-        if get_tool_path(self.WINMERGE_PATH, osp.isfile) is not None:
-            installed_tools += [('WinMerge', '2.12.4')]
         gccpath = get_tool_path(self.MINGW32_PATH, osp.isdir)
         if gccpath is not None:
             gccver = utils.get_gcc_version(gccpath)
@@ -253,8 +245,8 @@ def prepath(self):
     def postpath(self):
         """Return PATH contents to be append to the environment variable"""
         path = []
-        if osp.isfile(self.winpydir + self.THG_PATH):
-            path += [r"..\tools\TortoiseHg"]
+        # if osp.isfile(self.winpydir + self.THG_PATH):
+        #     path += [r"..\tools\TortoiseHg"]
         return path
 
     @property
@@ -575,14 +567,6 @@ def _create_launchers(self):
                                  workdir=r'${WINPYDIR}\..\notebooks')
                                  # --notebook-dir=%~dp0
                                  # workdir='${WINPYDIR}\Scripts')
-        if osp.isfile(self.winpydir + self.THG_PATH):
-            self.create_launcher('TortoiseHg.exe', 'tortoisehg.ico',
-                                 command=r'${WINPYDIR}\..'+self.THG_PATH,
-                                 workdir=r'${WINPYDIR}')
-        if osp.isfile(self.winpydir + self.WINMERGE_PATH):
-            self.create_launcher('WinMergeU.exe', 'winmerge.ico',
-                                 command=r'${WINPYDIR}\..'+self.WINMERGE_PATH,
-                                 workdir=r'${WINPYDIR}')
 
         # R console launchers
         r_exe = self.R_PATH + r"\i386\R.exe"
