fix tools changelog creation

stonebig · stonebig · commit c6c7866804be · 2015-12-26T17:41:30.000+01:00
diff --git a/make.py b/make.py
@@ -130,7 +130,7 @@ def __init__(self, build_number, release_level, target, wheeldir,
     @property
     def package_index_wiki(self):
         """Return Package Index page in Wiki format"""
-        installed_tools = [('SciTE', '3.3.7')]
+        installed_tools = []
 
         def get_tool_path(relpath, checkfunc):
             if self.simulation:
@@ -142,6 +142,10 @@ def get_tool_path(relpath, checkfunc):
                 path = self.winpydir + relpath
                 if checkfunc(path):
                     return path
+        
+        if get_tool_path (r'\tools\SciTE.exe', osp.isfile):
+            installed_tools += [('SciTE', '3.3.7')]
+
         gccpath = get_tool_path(self.MINGW32_PATH, osp.isdir)
         if gccpath is not None:
             gccver = utils.get_gcc_version(gccpath)
@@ -157,6 +161,12 @@ def get_tool_path(relpath, checkfunc):
             juliaver = utils.get_julia_version(juliapath)
             installed_tools += [('Julia', juliaver)]
 
+        pandocexe = get_tool_path (r'\tools\pandoc.exe', osp.isfile)
+        if pandocexe is not None:
+            pandocver = utils.get_pandoc_version(osp.dirname(pandocexe))
+            installed_tools += [('Pandoc', pandocver)]
+
+
         tools = []
         for name, ver in installed_tools:
             metadata = wppm.get_package_metadata('tools.ini', name)
diff --git a/winpython/data/tools.ini b/winpython/data/tools.ini
@@ -10,6 +10,10 @@ url=http://julialang.org/
 description=C/C++ and Fortran compilers (Mingwpy static toolchain version) 
 url=https://github.com/numpy/numpy/wiki/Mingw-static-toolchain
 
+[pandoc]
+description=a universal document converter
+url=http://pandoc.org/
+
 [r]
 description=The R Project for Statistical Computing
 url=http://www.r-project.org
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -254,6 +254,9 @@ def get_thg_version(path):
     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 python_query(cmd, path):
     """Execute Python command using the Python interpreter located in *path*"""
