Skip to content
This repository has been archived by the owner on Jan 13, 2024. It is now read-only.

Commit

Permalink
start to add support for tdm
Browse files Browse the repository at this point in the history
  • Loading branch information
sdpython committed Sep 8, 2015
1 parent 8e64bc7 commit 2df871c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
6 changes: 4 additions & 2 deletions src/pymyinstall/win_installer/win_setup_main.py
Expand Up @@ -82,7 +82,7 @@ def win_python_setup(folder="dist/win_python_setup_" + architecture(),
download_only=False,
no_setup=False,
notebooks=None,
selection={"R", "mingw"},
selection={"R", "mingw", "tgm"},
documentation=True,
last_function=None,
r_packages=True,
Expand Down Expand Up @@ -115,6 +115,7 @@ def win_python_setup(folder="dist/win_python_setup_" + architecture(),
* `R <http://www.r-project.org/>`_
* `Julia <http://julialang.org/>`_
* `MinGW <http://www.mingw.org/>`_
* `TGM-GCC <http://tdm-gcc.tdragon.net/>`_
* `VS <https://www.visualstudio.com/en-us/products/visual-studio-express-vs.aspx>`_
By default, only R is included. Julia requires too much work.
Expand Down Expand Up @@ -159,6 +160,7 @@ def last_function(inno_script, folders, verbose=False, fLOG=print):
* 7z setup needs a last click to complete
* pandoc needs a last click to complete
* R must be manually installed in the right folder
* TGM-GCC is manually installed in the right folder
* Julia produces a file exe, for the time being it must be done manually
* MinGW is also installed manually, the command line is different from others tools,
once it is installed, you should run the command line::
Expand All @@ -171,7 +173,7 @@ def last_function(inno_script, folders, verbose=False, fLOG=print):
also while building IJulia (the package to use Julia in a notebook).
The Julia should be stopped instead of stopping the python script.
That trick shows the standard output of Julia.
* Juilia kernel cannot be used with the others: it requires a different
* Julia kernel cannot be used with the others: it requires a different
configuration which prevents others kernel to be available at the same time.
We will skip for the time being.
* If the R kernel fails to start, you should manually run the script
Expand Down
9 changes: 8 additions & 1 deletion src/pymyinstall/win_installer/win_setup_main_helper.py
Expand Up @@ -18,6 +18,7 @@
from ..installhelper.install_custom_sqlitespy import install_sqlitespy
from ..installhelper.install_custom_python import install_python
from ..installhelper.install_custom_mingw import install_mingw
from ..installhelper.install_custom_tgm_gcc import install_tgm_gcc
from ..installhelper.install_custom_7z import install_7z
from ..installhelper.install_custom_vs import install_vs
from ..installhelper.install_custom import download_page
Expand Down Expand Up @@ -113,6 +114,12 @@ def is_here(program):
operations.append(("download", r))
fLOG("done")

if not is_here("tgm") and "tgm" in selection:
fLOG("--- download", "tgm")
r = install_tgm_gcc(dest_folder=folder, fLOG=fLOG, install=False)
operations.append(("download", r))
fLOG("done")

if not is_here("SQLiteSpy") and "sqlitespy" in selection:
fLOG("--- download", "sqllitespy")
r = install_sqlitespy(temp_folder=folder, fLOG=fLOG, install=False)
Expand Down Expand Up @@ -185,7 +192,7 @@ def win_install(folders,
verbose=False,
fLOG=print,
names=[
"Julia", "Scite", "7z", "MinGW", "R", "pandoc", "Python", "SQLiteSpy", "VS", "Putty"],
"Julia", "Scite", "7z", "TGM", "MinGW", "R", "pandoc", "Python", "SQLiteSpy", "VS", "Putty"],
selection=None):
"""
Install setups
Expand Down

0 comments on commit 2df871c

Please sign in to comment.