Skip to content

a 'student' usage of WinPython #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 28, 2016
Merged

a 'student' usage of WinPython #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7c83fd
a simpler launcher script
Feb 28, 2016
8b152a7
a 'student' usage of WinPython
Feb 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
150 changes: 135 additions & 15 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,8 @@ def create_batch_script(self, name, contents):

def create_launcher(self, name, icon, command=None,
args=None, workdir=None, settingspath=None,
bettercommand=None, betterworkdir=None, betterargs=None):
bettercommand=None, betterworkdir=None, betterargs=None,
launcher='launcher.nsi'):
"""Create exe launcher with NSIS"""
assert name.endswith('.exe')
portable_dir = osp.join(osp.dirname(osp.abspath(__file__)), 'portable')
Expand Down Expand Up @@ -365,7 +366,7 @@ def create_launcher(self, name, icon, command=None,
data += [('SETTINGSDIR', osp.dirname(settingspath)),
('SETTINGSNAME', osp.basename(settingspath))]

build_nsis('launcher.nsi', fname, data)
build_nsis(launcher, fname, data)

def create_python_batch(self, name, script_name,
workdir=None, options=None, command=None):
Expand Down Expand Up @@ -513,6 +514,8 @@ def _copy_dev_docs(self):

def _create_launchers(self):
"""Create launchers"""


self._print("Creating launchers")
self.create_launcher('WinPython Command Prompt.exe', 'cmd.ico',
command='$SYSDIR\cmd.exe',
Expand All @@ -526,13 +529,13 @@ def _create_launchers(self):
self.create_launcher('IDLEX (Python GUI).exe', 'python.ico',
args='idlex.pyw',
workdir='${WINPYDIR}\Scripts')
settingspath = osp.join('.spyder2', '.spyder.ini')
settingspath = osp.join('.spyder-py3', '.spyder2', '.spyder.ini')
self.create_launcher('Spyder.exe', 'spyder.ico',
command='${WINPYDIR}\python.exe',
args='-m spyderlib.start_app',
workdir='${WINPYDIR}\Scripts',
settingspath=settingspath)
self.create_launcher('Spyder (reset).exe', 'spyder_reset.ico',
self.create_launcher('Spyder reset.exe', 'spyder_reset.ico',
command='${WINPYDIR}\python.exe',
args='-m spyderlib.start_app --reset',
workdir='${WINPYDIR}\Scripts',
Expand Down Expand Up @@ -572,35 +575,71 @@ def _create_launchers(self):
bettercommand=Qt5_dir + r'\linguist.exe')

# Jupyter launchers
if osp.isfile(osp.join(self.python_dir, 'Scripts', 'jupyter.exe')):
self.create_launcher('IPython Qt Console.exe', 'ipython.ico',
self.create_launcher('IPython Qt Console.exe', 'ipython.ico',
command='${WINPYDIR}\Scripts\%s' %
'jupyter-qtconsole.exe',
workdir=r'${WINPYDIR}\..\notebooks')
workdir=r'$EXEDIR\notebooks')

self.create_launcher('Jupyter Notebook.exe', 'jupyter.ico',
self.create_launcher('Jupyter Notebook.exe', 'jupyter.ico',
command='${WINPYDIR}\Scripts\%s' %
'jupyter-notebook.exe',
workdir=r'${WINPYDIR}\..\notebooks')
workdir=r'$EXEDIR\notebooks')

# 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')
command='$EXEDIR' + r_exe,
workdir=r'$EXEDIR\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')
command='$EXEDIR' + r_exe,
workdir=r'$EXEDIR\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')
command='$EXEDIR'+ julia_exe,
workdir=r'$EXEDIR\notebooks')

# ******* Student Experiment (start)

#self.create_launcher('IDLEX (students).exe', 'python.ico',
# command='$SYSDIR\cmd.exe',
# args= r'/k IDLEX_for_student.bat %*',
# workdir='$EXEDIR\scripts')
self.create_launcher('IDLEX (student).exe', 'python.ico',
command='wscript.exe',
args= r'Noshell.vbs IDLEX_for_student.bat',
workdir='$EXEDIR\scripts',
launcher='launcher_basic.nsi')

self.create_launcher('Spyder (student).exe', 'spyder.ico',
command='wscript.exe',
args=r'Noshell.vbs spyder_for_student.bat',
workdir='$EXEDIR\Scripts',
launcher='launcher_basic.nsi')

self.create_launcher('Spyder reset (student).exe', 'spyder_reset.ico',
command='wscript.exe',
args=r'Noshell.vbs spyder_for_student.bat',
workdir='$EXEDIR\Scripts',
launcher='launcher_basic.nsi')

self.create_launcher('IPython Qt Console (student).exe', 'ipython.ico',
command='wscript.exe',
args=r'Noshell.vbs qtconsole_for_student.bat',
workdir='$EXEDIR\Scripts',
launcher='launcher_basic.nsi')

# this one needs a shell to kill fantom processes
self.create_launcher('Jupyter Notebook (student).exe', 'jupyter.ico',
command='$SYSDIR\cmd.exe',
args=r'/k ipython_notebook_for_student.bat',
workdir='$EXEDIR\Scripts',
launcher='launcher_basic.nsi')

self._print_done()

Expand Down Expand Up @@ -639,6 +678,51 @@ def _create_batch_scripts_initial(self):
rem keep nbextensions in Winpython directory, rather then %APPDATA% default
set JUPYTER_DATA_DIR=%WINPYDIR%\..\settings
""")

self.create_batch_script('env_for_student.bat', r"""
@echo off
rem to have WinPython working in a local account
if "%WINPYDIR%"=="" call %~dp0env.bat

rem ******* Classic WinPython *******
rem set JUPYTER_DATA_DIR=%WINPYDIR%\..\settings
rem set HOME=%WINPYDIR%\..\settings

rem ******* Student WinPython *******
set HOME=%HOMEDRIVE%%HOMEPATH%\Documents\WinPython%WINPYVER%
set JUPYTER_DATA_DIR=%HOME%

if not exist "%HOME%\Notebooks" mkdir "%HOME%\Notebooks"

if exist "%HOME%\Notebooks\docs" goto ok_docs
mkdir "%HOME%\Notebooks\docs"
xcopy /i "%WINPYDIR%\..\Notebooks\docs\*.ipynb" "%HOME%\Notebooks\docs"
:ok_docs


if not exist "%HOME%\.spyder-py%WINPYVER:~0,1%" mkdir "%HOME%\.spyder-py%WINPYVER:~0,1%"
if not exist "%HOME%\.spyder-py%WINPYVER:~0,1%\workingdir" echo %HOME%\Notebooks>"%HOME%\.spyder-py%WINPYVER:~0,1%\workingdir"

rem ******* make cython use mingwpy part *******
if not exist "%HOME%\pydistutils.cfg" xcopy "%WINPYDIR%\..\settings\pydistutils.cfg" "%HOME%"
""")

self.create_batch_script('Noshell.vbs',
r"""
'from http://superuser.com/questions/140047/how-to-run-a-batch-file-without-launching-a-command-window/390129
If WScript.Arguments.Count >= 1 Then
ReDim arr(WScript.Arguments.Count-1)
For i = 0 To WScript.Arguments.Count-1
Arg = WScript.Arguments(i)
If InStr(Arg, " ") > 0 Then Arg = chr(34) & Arg & chr(34)
arr(i) = Arg
Next

RunCmd = Join(arr)
CreateObject("Wscript.Shell").Run RunCmd, 0 , True
End If
""")


def _create_batch_scripts(self):
"""Create batch scripts"""
Expand Down Expand Up @@ -708,6 +792,7 @@ def _create_batch_scripts(self):
call %~dp0env.bat
cmd.exe /k""")
self.create_python_batch('python.bat', '')

self.create_python_batch('spyder.bat', 'spyderlib.start_app',
workdir='Scripts',
command = '%WINPYDIR%\python.exe -m')
Expand Down Expand Up @@ -742,6 +827,41 @@ def _create_batch_scripts(self):
pause
""")

# ******* Student Experiment (start)
self.create_batch_script('idlex_for_student.bat',r"""@echo off
call "%~dp0env_for_student.bat"
cd/D "%HOME%\Notebooks"
"%WINPYDIR%\python.exe" "%WINPYDIR%\scripts\idlex.pyw" %*
""")

self.create_batch_script('spyder_for_student.bat',r"""@echo off
call "%~dp0env_for_student.bat"
cd/D "%HOME%\Notebooks"
"%WINPYDIR%\python.exe" -m spyderlib.start_app %*
""")
self.create_batch_script('spyder_reset_for_student.bat',r"""@echo off
call "%~dp0env_for_student.bat"
cd/D "%HOME%\Notebooks"
%WINPYDIR%\python.exe -m spyderlib.start_app --reset %*
echo %HOME%\Notebooks>"%HOME%\.spyder-py%WINPYVER:~0,1%\workingdir"
rem legacy if ever needed
echo %HOME%\Notebooks>"%HOME%\.spyder2\workingdir"
echo %HOME%\Notebooks>"%HOME%\.spyder\workingdir"
""")

self.create_batch_script('ipython_notebook_for_student.bat',r"""@echo off
call "%~dp0env_for_student.bat"
cd/D "%HOME%\Notebooks"
"%WINPYDIR%\scripts\jupyter-notebook.exe" --notebook-dir="%HOME%\Notebooks" %*
""")

self.create_batch_script('qtconsole_for_student.bat',r"""@echo off
call "%~dp0env_for_student.bat"
cd/D "%HOME%\Notebooks"
"%WINPYDIR%\scripts\jupyter-qtconsole.exe" %*
""")
# ******* Student Experiment (end)

# pre-run mingw batch
print('now pre-running extra mingw')
filepath = osp.join(self.winpydir, 'scripts', 'make_cython_use_mingw.bat')
Expand Down
152 changes: 152 additions & 0 deletions portable/launcher_basic.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
/*

WinPython launcher template script

Copyright � 2012 Pierre Raybaut
Licensed under the terms of the MIT License
(see winpython/__init__.py for details)

*/

;================================================================
; These lines are automatically replaced when creating launchers:
; (see winpython/make.py)
!addincludedir ""

!define COMMAND ""
!define PARAMETERS ""
!define WORKDIR ""
!define PREPATH ""
!define POSTPATH ""
!define SETTINGSDIR ""
!define SETTINGSNAME ""

; prefered command (if it is a file)
!define BETTERCOMMAND ""
!define BETTERWORKDIR ""
!define BETTERPARAMETERS ""

Icon ""
OutFile ""
;================================================================

# Standard NSIS plugins
!include "WordFunc.nsh"
!include "FileFunc.nsh"
!include "TextReplace.nsh"

# Custom NSIS plugins
!include "ReplaceInFileWithTextReplace.nsh"
!include "EnumIni.nsh"

SilentInstall silent
AutoCloseWindow true
ShowInstDetails nevershow
RequestExecutionLevel user

Section ""
Call Execute
SectionEnd

Function Execute
; prefered command (if it is a file)
StrCmp "${BETTERCOMMAND}" "" no_better_workdir
StrCpy $R8 "${BETTERCOMMAND}"
IfFileExists $R8 do_better_workdircheck
Goto no_better_workdir

do_better_workdircheck:
StrCpy $R8 "${BETTERWORKDIR}"
IfFileExists $R8 do_better_workdir
Goto no_better_workdir

do_better_workdir:
StrCmp ${BETTERWORKDIR} "" 0 betterworkdir
System::Call "kernel32::GetCurrentDirectory(i ${NSIS_MAX_STRLEN}, t .r0)"
SetOutPath $0
Goto end_workdir
betterworkdir:
SetOutPath "${BETTERWORKDIR}"
Goto end_workdir

no_better_workdir:
;normal workdir
StrCmp ${WORKDIR} "" 0 workdir
System::Call "kernel32::GetCurrentDirectory(i ${NSIS_MAX_STRLEN}, t .r0)"
SetOutPath $0
Goto end_workdir
workdir:
SetOutPath "${WORKDIR}"
end_workdir:

;================================================================
; Settings directory HOME (will affect $PROFILE)
IfFileExists "$EXEDIR\settings\*.*" 0 end_settings
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("HOME", "$EXEDIR\settings").r0'
StrCmp "${SETTINGSDIR}" "" end_settings
CreateDirectory "$EXEDIR\settings\${SETTINGSDIR}"

end_settings:
;================================================================


; WinPython settings
IfFileExists "$EXEDIR\settings\*.*" 0 winpython_settings_profile
StrCpy $R6 "$EXEDIR\settings\winpython.ini"
Goto winpython_settings_continue
winpython_settings_profile:
StrCpy $R6 "$PROFILE\winpython.ini"
winpython_settings_continue:
IfFileExists $R6 winpython_settings_done
ClearErrors
FileOpen $0 $R6 w
IfErrors winpython_settings_done
FileWrite $0 "[debug]$\r$\nstate = disabled"
FileWrite $0 "$\r$\n"
FileWrite $0 "$\r$\n[environment]"
FileWrite $0 "$\r$\n## <?> Uncomment lines to override environment variables"
FileWrite $0 "$\r$\n#PATH = "
FileWrite $0 "$\r$\n#PYTHONPATH = "
FileWrite $0 "$\r$\n#PYTHONSTARTUP = "
FileClose $0
winpython_settings_done:


; Debug state
IfFileExists $R6 0 no_debug
ReadINIStr $R7 $R6 "debug" "state"
StrCmp $R7 "" no_debug
StrCmp $R7 "disabled" no_debug
StrCpy $R7 "enabled"
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("WINPYDEBUG", "True").r0'
no_debug:


;================================================================
; NO PATH Environment variables
ReadEnvStr $R0 "PATH"

;================================================================


; Command line parameters
${GetParameters} $R1
StrCmp "${PARAMETERS}" "" end_param 0
StrCpy $R1 "${PARAMETERS} $R1"
end_param:

; prefered command (if it is a file)
StrCmp "${BETTERCOMMAND}" "" no_better_command
StrCpy $R8 "${BETTERCOMMAND}"
IfFileExists $R8 do_better_command
Goto no_better_command

do_better_command:
Exec '"${BETTERCOMMAND}" $R1'
Goto end_of_command

no_better_command:
Exec '"${COMMAND}" $R1'

end_of_command:
FunctionEnd