Merge pull request #53 from stonebig/master

stonebig · stonebig · commit 66ee6c8c27b6 · 2015-02-09T15:24:18.000+01:00
Various change to adapt to Ipython3.0
diff --git a/make.py b/make.py
@@ -174,6 +174,11 @@ def get_tool_path(relpath, checkfunc):
             rver = utils.get_r_version(rpath)
             installed_tools += [('R', rver)]
 
+        juliapath = get_tool_path(self.JULIA_PATH, osp.isdir)
+        if juliapath is not None:
+            juliaver = utils.get_julia_version(juliapath)
+            installed_tools += [('Julia', juliaver)]
+
         tools = []
         for name, ver in installed_tools:
             metadata = wppm.get_package_metadata('tools.ini', name)
@@ -903,6 +908,24 @@ def _create_batch_scripts(self):
 
         self._print_done()
 
+    def _run_complement_batch_scripts(self):
+        """ tools\..\run_complement.bat for final complements"""
+        print('now run_complement.bat in tooldirs\..')
+        for post_complement in list(set([osp.dirname(s)
+                                         for s in self._toolsdirs])):
+            filepath = osp.join(post_complement, "run_complement.bat")
+            if osp.isfile(filepath):
+                print('launch "%s"  for  "%s"' % (filepath,  self.winpydir))
+                try:
+                    retcode = subprocess.call('"%s"   "%s"' % (filepath,  self.winpydir),
+                                  shell=True, stdout=sys.stderr)
+                    if retcode < 0:
+                        print("Child was terminated by signal", -retcode, file=sys.stderr)
+                except OSError as e:
+                    print("Execution failed:", e, file=sys.stderr)
+
+        self._print_done()
+
     def make(self, remove_existing=True):
         """Make WinPython distribution in target directory from the installers
         located in wheeldir
@@ -957,6 +980,7 @@ def make(self, remove_existing=True):
         if not self.simulation:
             self._create_launchers()
             self._create_batch_scripts()
+            self._run_complement_batch_scripts()
 
         if remove_existing and not self.simulation:
             self._print("Cleaning up distribution")
@@ -1131,3 +1155,5 @@ def make_all(build_number, release_level, pyver,
     #          verbose=False, archis=(32, ), flavor='FlavorRfull')
     #make_all(5, '', pyver='3.4', rootdir=r'D:\Winpython',
     #          verbose=False, archis=(64, ), flavor='FlavorRfull')
+    #make_all(5, '', pyver='3.4', rootdir=r'D:\Winpython',
+    #          verbose=False, archis=(32, ), flavor='FlavorJulia')
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -237,11 +237,17 @@ def get_gcc_version(path):
     """Return version of the GCC compiler installed in *path*"""
     return exec_shell_cmd('gcc --version', path).splitlines()[0].split()[-1]
 
+
 def get_r_version(path):
     """Return version of the R installed in *path*"""
     return exec_shell_cmd('dir ..\README.R*', path).splitlines()[-3].split("-")[-1]
 
 
+def get_julia_version(path):
+    """Return version of the Julia installed in *path*"""
+    return exec_shell_cmd('julia.exe -v', path).splitlines()[0].split(" ")[-1]
+
+
 def get_thg_version(path):
     """Return version of TortoiseHg installed in *path*"""
     txt = exec_shell_cmd('thg version', path).splitlines()[0]
@@ -306,6 +312,23 @@ def patch_shebang_line(fname, pad=b' '):
         print("failed to patch", fname)
 
 
+# =============================================================================
+# Patch sourcefile (instead of forking packages)
+# =============================================================================
+def patch_sourcefile(fname, in_text, out_text, silent_mode=False):
+    """Replace a string in a source file"""
+    import io
+    if osp.isfile(fname) and not in_text == out_text:
+        with io.open(fname, 'r') as fh:
+            content = fh.read()
+        new_content = content.replace(in_text, out_text)
+        if not new_content == content:
+            if not silent_mode:
+                print("patching " , fname, "from", in_text, "to", out_text)
+            with io.open(fname, 'wt') as fh:
+                fh.write(new_content)
+
+
 # =============================================================================
 # Extract functions
 # =============================================================================
diff --git a/winpython/wppm.py b/winpython/wppm.py
@@ -390,20 +390,17 @@ def install(self, package, install_options=None):
             import glob
             for ffname in glob.glob(r'%s\Scripts\*.exe' % self.target):
                 utils.patch_shebang_line(ffname)
-            do_replace = self.target + (r"\Lib\site-packages\pip\_vendor" +
-                         r"\distlib\scripts.py"  )
-            print("do_replace" , do_replace)
-            fh = open(do_replace,"r")
-            the_thing =  fh.read()             
-            fh.close()
-            the_thing_after = the_thing.replace(
+            utils.patch_sourcefile(
+              self.target + (
+              r"\Lib\site-packages\pip\_vendor\distlib\scripts.py"),
               " executable = get_executable()",
-              " executable = os.path.join(os.path.basename(get_executable()))") 
-            if not the_thing_after == the_thing:
-                print("do_replace_ok" , do_replace)
-                fh = open(do_replace,"w")
-                fh.write(the_thing_after)
-                fh.close()
+              " executable = os.path.join(os.path.basename(get_executable()))")
+        # We patch IPython\kernel\kernelspec.py live (around line 51) !!!!
+        if package.name == "ipython":
+            utils.patch_sourcefile(
+              self.target + r"\Lib\site-packages\IPython\kernel\kernelspec.py",
+              r" kernel_dict = json.load(f)", 
+              r" kernel_dict = json.loads(('\n'.join(f.readlines())).replace('[WINPYDIR]',(os.environ['WINPYDIR']).replace('\\','\\\\')))") 
 
     def handle_specific_packages(self, package):
         """Packages requiring additional configuration"""
