optional R console and Julia console

stonebig · stonebig · commit 0ea833a6c609 · 2015-03-01T14:05:34.000+01:00
diff --git a/make.py b/make.py
@@ -573,7 +573,7 @@ def _create_launchers(self):
                                         ipython_exe,
                                  args=' qtconsole --matplotlib=inline',
                                  workdir=r'${WINPYDIR}\..\notebooks')
-            self.create_launcher('IPython Notebook.exe', 'ipython.ico',
+            self.create_launcher('IPython Notebook.exe', 'jupyter.ico',
                                  command='${WINPYDIR}\Scripts\%s' %
                                         ipython_exe,
                                  args=' notebook --matplotlib=inline',
@@ -588,6 +588,26 @@ def _create_launchers(self):
             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"
+        if osp.isfile(self.winpydir + r_exe):
+            self.create_launcher('R Console32.exe', 'r.ico',
+                                 command='${WINPYDIR}\..' + r_exe,
+                                 workdir=r'${WINPYDIR}\..\notebooks')
+        r_exe = self.R_PATH + r"\x64\R.exe"
+        if osp.isfile(self.winpydir + r_exe):
+            self.create_launcher('R Console64.exe', 'r.ico',
+                                 command='${WINPYDIR}\..' + r_exe,
+                                 workdir=r'${WINPYDIR}\..\notebooks')
+
+        # Julia console launcher
+        julia_exe   =  self.JULIA_PATH + r"\julia.exe"
+        if osp.isfile(self.winpydir + julia_exe):
+            self.create_launcher('Julia Console.exe', 'julia.ico',
+                                 command='${WINPYDIR}\..'+ julia_exe,
+                                 workdir=r'${WINPYDIR}\..\notebooks')
+
         self._print_done()
 
     def _create_batch_scripts(self):
@@ -1157,3 +1177,5 @@ def make_all(build_number, release_level, pyver,
     #          verbose=False, archis=(64, ), flavor='FlavorRfull')
     #make_all(5, '', pyver='3.4', rootdir=r'D:\Winpython',
     #          verbose=False, archis=(32, ), flavor='FlavorJulia')
+    #make_all(5, '', pyver='3.4', rootdir=r'D:\Winpython',
+    #          verbose=False, archis=(64, ), flavor='FlavorJulia')
diff --git a/winpython/data/packages.ini b/winpython/data/packages.ini
@@ -19,6 +19,9 @@ description=Connect colorbrewer2.org color maps to Python and matplotlib
 [certifi]
 description=Python package for providing Mozilla's CA Bundle.
 
+[cffi]
+description=Foreign Function Interface for Python calling C code.
+
 [configparser]
 description=This library brings the updated configparser from Python 3.5 to Python 2.6-3.5.
 
@@ -66,6 +69,9 @@ description=Module for creating form dialogs/widgets to edit various type of par
 url=http://formlayout.googlecode.com
 category=gui
 
+[funcsigs]
+description=Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+
+
 [guidata]
 description=Automatically generated graphical user interfaces for easy data set edition and display
 url=http://packages.python.org/guidata
@@ -259,6 +265,9 @@ description=Python bindings for the cairo library
 [pycosat]
 description=bindings to picosat (a SAT solver)
 
+[pycparser]
+description=C parser in Python
+
 [pyeda]
 description=PyEDA is a Python library for electronic design automation.
 
