remove thg and ffmpeg legacy

stonebig · stonebig · commit 4d84b2ba4b1b · 2019-04-27T21:02:55.000+02:00
diff --git a/make.py b/make.py
@@ -270,10 +270,6 @@ def get_tool_path(relpath, checkfunc):
             pandocver = utils.get_pandoc_version(osp.dirname(pandocexe))
             installed_tools += [('Pandoc', pandocver)]
 
-        ffmpegexe = get_tool_path (r'\t\ffmpeg.exe', osp.isfile)
-        if ffmpegexe is not None:
-            ffmpegver = utils.get_ffmpeg_version(osp.dirname(ffmpegexe))
-            installed_tools += [('ffmpeg', ffmpegver)]
 
         tools = []
         for name, ver in installed_tools:
@@ -755,14 +751,6 @@ def _create_batch_scripts_initial(self):
 set JULIA_PKGDIR=%WINPYDIRBASE%\settings\.julia
 :julia_bad
 
-rem ******************
-rem handle ffmpeg if included
-rem ******************
-if not exist "%WINPYDIRBASE%\t\ffmpeg.exe" goto ffmpeg_bad
-set IMAGEIO_FFMPEG_EXE=%WINPYDIRBASE%\t\ffmpeg.exe
-
-:ffmpeg_bad
-
 
 rem ******************
 rem handle PySide2 if included
@@ -879,13 +867,6 @@ def _create_batch_scripts_initial(self):
     $env:JULIA_PKGDIR = "$env:WINPYDIR\..\settings\.julia"
 }
 
-#####################
-### handle ffmpeg if included
-#####################
-if (Test-Path "$env:WINPYDIR\..\t\ffmpeg.exe") {
-    $env:IMAGEIO_FFMPEG_EXE = "%WINPYDIRBASE%\t\ffmpeg.exe"
-}
-
 #####################
 ### handle PySide2 if included
 #####################
@@ -1429,7 +1410,6 @@ def make(self, remove_existing=True, requirements=None, my_winpydir=None):  #, f
             if not self.simulation:
                 self._create_batch_scripts_initial()
                 self._create_batch_scripts()  # which set mingwpy as compiler
-                self._run_complement_batch_scripts("run_required_first.bat")
                 # launchers at the beginning
                 self._create_launchers()
 
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -236,20 +236,11 @@ def get_npmjs_version(path):
     """Return version of the Nodejs installed in *path*"""
     return exec_shell_cmd('npm -v', path).splitlines()[0]
     
-def get_thg_version(path):
-    """Return version of TortoiseHg installed in *path*"""
-    txt = exec_shell_cmd('thg version', path).splitlines()[0]
-    match = re.match('TortoiseHg Dialogs \(version ([0-9\.]*)\)', txt)
-    if match is not None:
-        return match.groups()[0]
 
 def get_pandoc_version(path):
     """Return version of the Pandoc executable in *path*"""
     return exec_shell_cmd('pandoc -v', path).splitlines()[0].split(" ")[-1]
 
-def get_ffmpeg_version(path):
-    """Return version of the Pandoc executable in *path*"""
-    return exec_shell_cmd('ffmpeg -version', path).splitlines()[0].split(" ")[2]
 
 def python_query(cmd, path):
     """Execute Python command using the Python interpreter located in *path*"""
@@ -601,8 +592,6 @@ def do_script(this_script, python_exe=None, copy_to=None,
 
 
 if __name__ == '__main__':
-    thg = get_thg_version(osp.join(BASE_DIR, 't', 'tortoisehg'))
-    print(("thg version: %r" % thg))
 
     print_box("Test")
     dname = sys.prefix
