Skip to content

Commit e3d74f0

Browse files
author
stonebig
committed
reduce "tools" path to "t" + default install dir is "WinPython"
1 parent 41169d3 commit e3d74f0

File tree

3 files changed

+32
-31
lines changed

3 files changed

+32
-31
lines changed

‎make.py‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ def build_nsis(srcname, dstname, data):
9393

9494
class WinPythonDistribution(object):
9595
"""WinPython distribution"""
96-
MINGW32_PATH = r'\tools\mingw32\bin'
97-
R_PATH = r'\tools\R\bin'
98-
JULIA_PATH = r'\tools\Julia\bin'
99-
NODEJS_PATH = r'\tools\n'
96+
MINGW32_PATH = r'\t\mingw32\bin'
97+
R_PATH = r'\t\R\bin'
98+
JULIA_PATH = r'\t\Julia\bin'
99+
NODEJS_PATH = r'\t\n'
100100

101101
def __init__(self, build_number, release_level, target, wheeldir,
102102
toolsdirs=None, verbose=False, simulation=False,
@@ -134,15 +134,15 @@ def package_index_wiki(self):
134134
def get_tool_path(relpath, checkfunc):
135135
if self.simulation:
136136
for dirname in self.toolsdirs:
137-
path = dirname + relpath.replace(r'\tools', '')
137+
path = dirname + relpath.replace(r'\t', '')
138138
if checkfunc(path):
139139
return path
140140
else:
141141
path = self.winpydir + relpath
142142
if checkfunc(path):
143143
return path
144144

145-
if get_tool_path (r'\tools\SciTE.exe', osp.isfile):
145+
if get_tool_path (r'\t\SciTE.exe', osp.isfile):
146146
installed_tools += [('SciTE', '3.3.7')]
147147

148148
rpath = get_tool_path(self.R_PATH, osp.isdir)
@@ -162,12 +162,12 @@ def get_tool_path(relpath, checkfunc):
162162
npmver = utils.get_npmjs_version(nodepath)
163163
installed_tools += [('npmjs', npmver)]
164164

165-
pandocexe = get_tool_path (r'\tools\pandoc.exe', osp.isfile)
165+
pandocexe = get_tool_path (r'\t\pandoc.exe', osp.isfile)
166166
if pandocexe is not None:
167167
pandocver = utils.get_pandoc_version(osp.dirname(pandocexe))
168168
installed_tools += [('Pandoc', pandocver)]
169169

170-
ffmpegexe = get_tool_path (r'\tools\ffmpeg.exe', osp.isfile)
170+
ffmpegexe = get_tool_path (r'\t\ffmpeg.exe', osp.isfile)
171171
if ffmpegexe is not None:
172172
ffmpegver = utils.get_ffmpeg_version(osp.dirname(ffmpegexe))
173173
installed_tools += [('ffmpeg', ffmpegver)]
@@ -241,7 +241,7 @@ def prepath(self):
241241
"""Return PATH contents to be prepend to the environment variable"""
242242
path = [r"Lib\site-packages\PyQt5", r"Lib\site-packages\PyQt4",
243243
"", # Python root directory (python.exe)
244-
"DLLs", "Scripts", r"..\tools", r"..\tools\mingw32\bin"
244+
"DLLs", "Scripts", r"..\t", r"..\t\mingw32\bin"
245245
]
246246
if self.distribution.architecture == 32 \
247247
and osp.isdir(self.winpydir + self.MINGW32_PATH):
@@ -264,13 +264,13 @@ def postpath(self):
264264
"""Return PATH contents to be append to the environment variable"""
265265
path = []
266266
# if osp.isfile(self.winpydir + self.THG_PATH):
267-
# path += [r"..\tools\TortoiseHg"]
267+
# path += [r"..\t\TortoiseHg"]
268268
return path
269269

270270
@property
271271
def toolsdirs(self):
272272
"""Return tools directory list"""
273-
return [osp.join(osp.dirname(osp.abspath(__file__)), 'tools')] + self._toolsdirs
273+
return [osp.join(osp.dirname(osp.abspath(__file__)), 't')] + self._toolsdirs
274274

275275
@property
276276
def docsdirs(self):
@@ -473,15 +473,15 @@ def _install_all_other_packages(self):
473473
def _copy_dev_tools(self):
474474
"""Copy dev tools"""
475475
self._print("Copying tools")
476-
toolsdir = osp.join(self.winpydir, 'tools')
476+
toolsdir = osp.join(self.winpydir, 't')
477477
os.mkdir(toolsdir)
478-
for dirname in self.toolsdirs:
478+
for dirname in self.toolsdirs: # the ones in the make.py script environment
479479
for name in os.listdir(dirname):
480480
path = osp.join(dirname, name)
481481
copy = shutil.copytree if osp.isdir(path) else shutil.copyfile
482-
copy(path, osp.join(toolsdir, name))
483482
if self.verbose:
484483
print(path + ' --> ' + osp.join(toolsdir, name))
484+
copy(path, osp.join(toolsdir, name))
485485
self._print_done()
486486

487487
def _copy_dev_docs(self):
@@ -600,8 +600,8 @@ def _create_batch_scripts_initial(self):
600600
rem ******************
601601
rem handle R if included
602602
rem ******************
603-
if not exist "%WINPYDIRBASE%\tools\R\bin" goto r_bad
604-
set R_HOME=%WINPYDIRBASE%\tools\R
603+
if not exist "%WINPYDIRBASE%\t\R\bin" goto r_bad
604+
set R_HOME=%WINPYDIRBASE%\t\R
605605
if "%WINPYARCH%"=="WIN32" set R_HOMEbin=%R_HOME%\bin\i386
606606
if not "%WINPYARCH%"=="WIN32" set R_HOMEbin=%R_HOME%\bin\x64
607607
:r_bad
@@ -610,8 +610,8 @@ def _create_batch_scripts_initial(self):
610610
rem ******************
611611
rem handle Julia if included
612612
rem ******************
613-
if not exist "%WINPYDIRBASE%\tools\Julia\bin" goto julia_bad
614-
set JULIA_HOME=%WINPYDIRBASE%\tools\Julia\bin\
613+
if not exist "%WINPYDIRBASE%\t\Julia\bin" goto julia_bad
614+
set JULIA_HOME=%WINPYDIRBASE%\t\Julia\bin\
615615
set JULIA_EXE=julia.exe
616616
set JULIA=%JULIA_HOME%%JULIA_EXE%
617617
set JULIA_PKGDIR=%WINPYDIRBASE%\settings\.julia
@@ -620,8 +620,8 @@ def _create_batch_scripts_initial(self):
620620
rem ******************
621621
rem handle ffmpeg if included
622622
rem ******************
623-
if not exist "%WINPYDIRBASE%\tools\ffmpeg.exe" goto ffmpeg_bad
624-
set IMAGEIO_FFMPEG_EXE=%WINPYDIRBASE%\tools\ffmpeg.exe
623+
if not exist "%WINPYDIRBASE%\t\ffmpeg.exe" goto ffmpeg_bad
624+
set IMAGEIO_FFMPEG_EXE=%WINPYDIRBASE%\t\ffmpeg.exe
625625
626626
:ffmpeg_bad
627627
@@ -681,8 +681,8 @@ def _create_batch_scripts_initial(self):
681681
#####################
682682
### handle R if included
683683
#####################
684-
if (Test-Path "$env:WINPYDIR\..\tools\R\bin") {
685-
$env:R_HOME = "$env:WINPYDIR\..\tools\R"
684+
if (Test-Path "$env:WINPYDIR\..\t\R\bin") {
685+
$env:R_HOME = "$env:WINPYDIR\..\t\R"
686686
$env:R_HOMEbin = "$env:R_HOME\bin\x64"
687687
if ("$env:WINPYARCH" -eq "WIN32") {
688688
$env:R_HOMEbin = "$env:R_HOME\bin\i386"
@@ -692,8 +692,8 @@ def _create_batch_scripts_initial(self):
692692
#####################
693693
### handle Julia if included
694694
#####################
695-
if (Test-Path "$env:WINPYDIR\..\tools\Julia\bin") {
696-
$env:JULIA_HOME = "$env:WINPYDIR\..\tools\Julia\bin\"
695+
if (Test-Path "$env:WINPYDIR\..\t\Julia\bin") {
696+
$env:JULIA_HOME = "$env:WINPYDIR\..\t\Julia\bin\"
697697
$env:JULIA_EXE = "julia.exe"
698698
$env:JULIA = "$env:JULIA_HOME$env:JULIA_EXE"
699699
$env:JULIA_PKGDIR = "$env:WINPYDIR\..\settings\.julia"
@@ -702,8 +702,8 @@ def _create_batch_scripts_initial(self):
702702
#####################
703703
### handle ffmpeg if included
704704
#####################
705-
if (Test-Path "$env:WINPYDIR\..\tools\ffmpeg.exe") {
706-
$env:IMAGEIO_FFMPEG_EXE = "%WINPYDIRBASE%\tools\ffmpeg.exe"
705+
if (Test-Path "$env:WINPYDIR\..\t\ffmpeg.exe") {
706+
$env:IMAGEIO_FFMPEG_EXE = "%WINPYDIRBASE%\t\ffmpeg.exe"
707707
}
708708
709709
#####################
@@ -1370,6 +1370,6 @@ def make_all(build_number, release_level, pyver, architecture,
13701370
install_options=r'--no-index --pre --trusted-host=None',
13711371
find_links=r'D:\Winpython\packages.srcreq',
13721372
source_dirs=r'D:\WinPython\basedir34\packages.src D:\WinPython\basedir34\packages.win-amd64',
1373-
toolsdirs=r'D:\WinPython\basedir34\Tools.Slim',
1373+
toolsdirs=r'D:\WinPython\basedir34\t.Slim',
13741374
docsdirs=r'D:\WinPython\basedir34\docs.Slim'
13751375
)

‎portable/installer.nsi‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Licensed under the terms of the MIT License
2020
;================================================================
2121

2222
!define ID "WinPython"
23-
!define ID_INSTALL "WinPy"
23+
!define ID_INSTALL "WinPython"
2424
!define FILE_DESCRIPTION "${ID} Installer"
2525
!define COMPANY "${ID}"
2626
!define BRANDING "${ID}, the portable Python Distribution for Scientists"
@@ -43,7 +43,8 @@ OutFile "${DISTDIR}\..\${ID}${ARCH}-${VERSION}${RELEASELEVEL}.exe"
4343
;InstallDir "$EXEDIR\${ID}${ARCH}-${VERSION}${RELEASELEVEL}"
4444
; 2018-04-04 need to minimize path length of installation further: remove arch + flavor
4545
;InstallDir "$EXEDIR\${ID_INSTALL}${ARCH}-${VERSION}${RELEASELEVEL}"
46-
InstallDir "$EXEDIR\${ID_INSTALL}-${VERSION_INSTALL}${RELEASELEVEL}"
46+
;InstallDir "$EXEDIR\${ID_INSTALL}-${VERSION_INSTALL}${RELEASELEVEL}"
47+
InstallDir "$EXEDIR\${ID_INSTALL}"
4748
BrandingText "${BRANDING}"
4849
XPStyle on
4950
RequestExecutionLevel user

‎winpython/utils.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131

3232
# Development only
33-
TOOLS_DIR = osp.abspath(osp.join(osp.dirname(__file__), os.pardir, 'tools'))
33+
TOOLS_DIR = osp.abspath(osp.join(osp.dirname(__file__), os.pardir, 't'))
3434
if osp.isdir(TOOLS_DIR):
3535
os.environ['PATH'] += ';%s' % TOOLS_DIR
3636
ROOT_DIR = os.environ.get('WINPYTHONROOTDIR')
@@ -629,7 +629,7 @@ def do_script(this_script, python_exe=None, copy_to=None,
629629

630630

631631
if __name__ == '__main__':
632-
thg = get_thg_version(osp.join(BASE_DIR, 'tools', 'tortoisehg'))
632+
thg = get_thg_version(osp.join(BASE_DIR, 't', 'tortoisehg'))
633633
print(("thg version: %r" % thg))
634634

635635
print_box("Test")

0 commit comments

Comments
 (0)