Visitar URL original
Merge pull request #598 from stonebig/master · winpython/winpython@ce1fb1c · GitHub
Skip to content

Commit ce1fb1c

Browse files
stonebigstonebig
authored
Merge pull request #598 from stonebig/master
adapt to nodejs8 (reduce build path)
2 parents 307132b + e4ace29 commit ce1fb1c

8 files changed

Lines changed: 72 additions & 116 deletions

‎build_dist.bat‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎diff.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def diff_package_dicts(dict1_in, dict2_in):
152152

153153
def find_closer_version(version1, basedir=None, flavor='', architecture=64):
154154
"""Find version which is the closest to `version`"""
155-
builddir = osp.join(basedir, 'build%s' % flavor)
155+
builddir = osp.join(basedir, 'bu%s' % flavor)
156156
func = lambda name: re.match(r'WinPython%s-%sbit-([0-9\.]*)\.(txt|md)' %
157157
(flavor, architecture), name)
158158
versions = [func(name).groups()[0]
@@ -192,23 +192,25 @@ def compare_package_indexes(version2, version1=None, basedir=None, flavor='',
192192
return text
193193

194194

195-
def _copy_all_changelogs(version, basedir, flavor='', architecture=64):
195+
def _copy_all_changelogs(version, basedir, flavor='',
196+
architecture=64):
196197
basever = '.'.join(version.split('.')[:2])
197198
for name in os.listdir(CHANGELOGS_DIR):
198199
if re.match(r'WinPython%s-%sbit-%s([0-9\.]*)\.(txt|md)' %
199200
(flavor, architecture, basever), name):
200201
shutil.copyfile(osp.join(CHANGELOGS_DIR, name),
201-
osp.join(basedir, 'build%s' % flavor, name))
202+
osp.join(basedir, 'bu%s' % flavor, name))
202203

203204

204205
def write_changelog(version2, version1=None, basedir=None, flavor='',
205206
release_level='', architecture=64):
206207
"""Write changelog between version1 and version2 of WinPython"""
207-
_copy_all_changelogs(version2, basedir, flavor=flavor, architecture=architecture)
208+
_copy_all_changelogs(version2, basedir, flavor=flavor,
209+
architecture=architecture)
208210
print ('comparing_package_indexes', version2, basedir, flavor, architecture)
209211
text = compare_package_indexes(version2, version1, basedir=basedir,
210212
flavor=flavor, architecture=architecture)
211-
fname = osp.join(basedir, 'build%s' % flavor,
213+
fname = osp.join(basedir, 'bu%s' % flavor,
212214
'WinPython%s-%sbit-%s_History.md' % (flavor, architecture,
213215
version2))
214216
with open(fname, 'w', encoding='utf-8-sig') as fdesc: # python 3 need

‎generate_a_winpython_distro.bat‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ rem to launch from a winpython package directory, where 'make.py' is
33
rem this is initialised per the calling .bat
44
rem set my_original_path=%path%
55
rem set my_buildenv=C:\winpython-64bit-3.4.3.7Qt5
6-
rem set my_root_dir_for_builds=D:\Winpython
6+
rem set my_root_dir_for_builds=D:\Winp
77

88
rem set my_python_target=34
99
rem set my_pyver=3.4
@@ -14,37 +14,40 @@ rem v2 2016-03-19 change
1414
rem we don't use building rootdir (D:\winPython) anymore
1515
rem we use only building basedir (D:\WinPython\basedir34Qt5)
1616

17-
set my_basedir=%my_root_dir_for_builds%\basedir%my_python_target%
17+
set my_basedir=%my_root_dir_for_builds%\bd%my_python_target%
1818
rem set my_basedir=%my_root_dir_for_builds%\build%my_python_target%\%my_arch%
1919

2020
rem ***********************************************************
2121
rem Override other scripts (simpler maintenance)
2222

2323
set my_buildenv=C:\winpython-64bit-3.4.3.7Qt5
2424

25-
set my_release_level=
25+
rem handle alpha
26+
if "%my_release_level%"=="" set my_release_level=b5
2627

2728
if %my_python_target%==27 set my_release=2
2829

2930
if %my_python_target%==34 set my_release=8
3031

31-
if %my_python_target%==35 set my_release=0
32+
if %my_python_target%==35 set my_release=2
3233

3334
if %my_python_target%==36 set my_release=0
3435

36+
if %my_python_target%==37 set my_release=0
37+
3538
rem ***********************************************************
3639

3740
rem set my_flavor=Slim
3841

3942
rem set my_arch=32
4043
rem set my_preclear_build_directory=Yes
4144

42-
rem set my_requirements=d:\my_req1.txt d:\my_req2.txt d:\my_req3.txt d:\my_req4.txt
45+
rem set my_requi=C:\Winpents=d:\my_req1.txt d:\my_req2.txt d:\my_req3.txt d:\my_req4.txt
4346
rem set my_find_links=D:\WinPython\packages.srcreq
4447

45-
rem set my_source_dirs=D:\WinPython\basedir34\packages.src D:\WinPython\basedir34\packages.win32.Slim
46-
rem set my_toolsdirs=D:\WinPython\basedir34\Tools.Slim
47-
rem set my_docsdirs=D:\WinPython\basedir34\docs.Slim
48+
rem set my_source_dirs=D:\WinPython\bd34\packages.src D:\WinPython\bd34\packages.win32.Slim
49+
rem set my_toolsdirs=D:\WinPython\bd34\Tools.Slim
50+
rem set my_docsdirs=D:\WinPython\bd34\docs.Slim
4851

4952

5053
rem set my_install_options=--no-index --pre
@@ -79,19 +82,19 @@ echo 1.0 Do Pre-clear >>%my_archive_log%
7982
echo ------------------>>%my_archive_log%
8083

8184

82-
cd /D %my_root_dir_for_builds%\basedir%my_python_target%
85+
cd /D %my_root_dir_for_builds%\bd%my_python_target%
8386

8487
set build_det=\%my_flavor%
8588
if "%my_flavor%"=="" set build_det=
8689

8790
dir %build_det%
88-
echo rmdir /S /Q build%my_flavor%
91+
echo rmdir /S /Q bu%my_flavor%
8992
rem pause
90-
rmdir /S /Q build%my_flavor%
91-
rmdir /S /Q build%my_flavor%
92-
rmdir /S /Q build%my_flavor%
93-
rmdir /S /Q build%my_flavor%
94-
rmdir /S /Q build%my_flavor%
93+
rmdir /S /Q bu%my_flavor%
94+
rmdir /S /Q bu%my_flavor%
95+
rmdir /S /Q bu%my_flavor%
96+
rmdir /S /Q bu%my_flavor%
97+
rmdir /S /Q bu%my_flavor%
9598
rmdir /S /Q dist
9699

97100
echo %date% %time%

‎generate_winpython_distros34_qt5.bat‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎generate_winpython_distros35_qt5.bat‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ rem to launch from a winpython module 'make' directory
44
set my_original_path=%path%
55
set my_buildenv=C:\winpython-64bit-3.4.3.7Qt5
66

7-
set my_root_dir_for_builds=C:\Winpython
7+
set my_root_dir_for_builds=C:\Winp
88
set my_python_target=35
99
set my_pyver=3.5
1010

@@ -13,28 +13,30 @@ set my_flavor=Qt5
1313
set my_release=3
1414
set my_release_level=
1515

16+
set my_install_options=--no-index --pre --trusted-host=None
17+
set my_find_links=C:\Winp\packages.srcreq
18+
set my_docsdirs=C:\Winp\bd35\docs
19+
1620
set my_arch=32
17-
set my_preclear_build_directory=Yes
1821

19-
set tmp_reqdir=%my_root_dir_for_builds%\basedir%my_python_target%
22+
set tmp_reqdir=%my_root_dir_for_builds%\bd%my_python_target%
23+
2024
set my_requirements=%tmp_reqdir%\Qt5_requirements.txt
2125

22-
set my_find_links=C:\WinPython\packages.srcreq
2326

24-
set my_source_dirs=C:\WinPython\basedir35\packages.win32.Qt5
25-
set my_toolsdirs=C:\WinPython\basedir35\tools
26-
set my_docsdirs=C:\WinPython\basedir35\docs
27+
set my_source_dirs=C:\Winp\bd35\packages.win32.Qt5
28+
set my_toolsdirs=C:\Winp\bd35\tools
2729

28-
set my_install_options=--no-index --pre --trusted-host=None
2930

31+
set my_preclear_build_directory=Yes
3032
call %~dp0\generate_a_winpython_distro.bat
3133

32-
set my_requirements=%tmp_reqdir%\Qt5_requirements64.txt
3334
set my_arch=64
34-
set my_toolsdirs=C:\WinPython\basedir35\tools64
35-
set my_preclear_build_directory=No
35+
set my_requirements=%tmp_reqdir%\Qt5_requirements64.txt
36+
set my_source_dirs=C:\Winp\bd35\packages.win-amd64.Qt5
37+
set my_toolsdirs=C:\Winp\bd35\tools64
3638

37-
set my_source_dirs=C:\WinPython\basedir35\packages.win-amd64.Qt5
39+
set my_preclear_build_directory=No
3840

3941

4042
call %~dp0\generate_a_winpython_distro.bat

‎generate_winpython_distros36_qt5.bat‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ rem to launch from a winpython module 'make' directory
44
set my_original_path=%path%
55
set my_buildenv=C:\winpython-64bit-3.4.3.7Qt5
66

7-
set my_root_dir_for_builds=C:\Winpython
7+
set my_root_dir_for_builds=C:\Winp
88
set my_python_target=36
99
set my_pyver=3.6
1010

@@ -14,29 +14,31 @@ set my_release=0
1414

1515
set my_release_level=
1616

17-
set my_arch=32
18-
set my_preclear_build_directory=Yes
17+
set my_install_options=--no-index --pre --trusted-host=None
18+
set my_find_links=C:\Winp\packages.srcreq
19+
set my_docsdirs=C:\Winp\bd36\docs
1920

20-
set tmp_reqdir=%my_root_dir_for_builds%\basedir%my_python_target%
21+
set my_arch=32
2122

22-
set my_requirements=C:\Winpython\basedir36\Qt5_requirements.txt
23+
set tmp_reqdir=%my_root_dir_for_builds%\bd%my_python_target%
2324

24-
set my_find_links=C:\WinPython\packages.srcreq
25+
set my_requirements=C:\Winp\bd36\Qt5_requirements.txt
2526

26-
set my_source_dirs=C:\WinPython\basedir36\packages.win32.Qt5
27-
set my_toolsdirs=C:\WinPython\basedir36\Tools
28-
set my_docsdirs=C:\WinPython\basedir36\docs
2927

30-
set my_install_options=--no-index --pre --trusted-host=None
28+
set my_source_dirs=C:\Winp\bd36\packages.win32.Qt5
29+
set my_toolsdirs=C:\Winp\bd36\Tools
3130

31+
set my_preclear_build_directory=Yes
3232
call %~dp0\generate_a_winpython_distro.bat
3333

3434
set my_arch=64
35-
set my_requirements=C:\Winpython\basedir36\Qt5_requirements64.txt
36-
set my_toolsdirs=C:\WinPython\basedir36\Tools64
35+
set my_requirements=C:\Winp\bd36\Qt5_requirements64.txt
36+
set my_source_dirs=C:\Winp\bd36\packages.win-amd64.Qt5
37+
set my_toolsdirs=C:\Winp\bd36\Tools64
3738

3839
set my_preclear_build_directory=No
39-
set my_source_dirs=C:\WinPython\basedir36\packages.win-amd64.Qt5
40+
41+
4042
call %~dp0\generate_a_winpython_distro.bat
4143

4244

‎make.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ def _create_batch_scripts_initial(self):
583583
584584
set WINPYVER=""" + self.winpyver + r"""
585585
set HOME=%WINPYDIRBASE%\settings
586-
set WINPYDIRBASE=
586+
rem set WINPYDIRBASE=
587587
588588
set JUPYTER_DATA_DIR=%HOME%
589589
set WINPYARCH=WIN32
@@ -598,8 +598,8 @@ def _create_batch_scripts_initial(self):
598598
rem ******************
599599
rem handle R if included
600600
rem ******************
601-
if not exist "%WINPYDIR%\..\tools\R\bin" goto r_bad
602-
set R_HOME=%WINPYDIR%\..\tools\R
601+
if not exist "%WINPYDIRBASE%\tools\R\bin" goto r_bad
602+
set R_HOME=%WINPYDIRBASE%\tools\R
603603
if "%WINPYARCH%"=="WIN32" set R_HOMEbin=%R_HOME%\bin\i386
604604
if not "%WINPYARCH%"=="WIN32" set R_HOMEbin=%R_HOME%\bin\x64
605605
:r_bad
@@ -608,26 +608,26 @@ def _create_batch_scripts_initial(self):
608608
rem ******************
609609
rem handle Julia if included
610610
rem ******************
611-
if not exist "%WINPYDIR%\..\tools\Julia\bin" goto julia_bad
612-
set JULIA_HOME=%WINPYDIR%\..\tools\Julia\bin\
611+
if not exist "%WINPYDIRBASE%\tools\Julia\bin" goto julia_bad
612+
set JULIA_HOME=%WINPYDIRBASE%\tools\Julia\bin\
613613
set JULIA_EXE=julia.exe
614614
set JULIA=%JULIA_HOME%%JULIA_EXE%
615-
set JULIA_PKGDIR=%WINPYDIR%\..\settings\.julia
615+
set JULIA_PKGDIR=%WINPYDIRBASE%\settings\.julia
616616
:julia_bad
617617
618618
rem ******************
619619
rem handle ffmpeg if included
620620
rem ******************
621-
if not exist "%WINPYDIR%\..\tools\ffmpeg.exe" goto ffmpeg_bad
622-
set IMAGEIO_FFMPEG_EXE=%WINPYDIR%\..\tools\ffmpeg.exe
621+
if not exist "%WINPYDIRBASE%\tools\ffmpeg.exe" goto ffmpeg_bad
622+
set IMAGEIO_FFMPEG_EXE=%WINPYDIRBASE%\tools\ffmpeg.exe
623623
624624
:ffmpeg_bad
625625
626626
rem ******************
627627
rem WinPython.ini part (removed from nsis)
628628
rem ******************
629-
if not exist "%WINPYDIR%\..\settings" mkdir "%WINPYDIR%\..\settings"
630-
set winpython_ini=%WINPYDIR%\..\settings\winpython.ini
629+
if not exist "%WINPYDIRBASE%\settings" mkdir "%WINPYDIRBASE%\settings"
630+
set winpython_ini=%WINPYDIRBASE%\settings\winpython.ini
631631
if not exist "%winpython_ini%" (
632632
echo [debug]>>"%winpython_ini%"
633633
echo state = disabled>>"%winpython_ini%"
@@ -701,7 +701,7 @@ def _create_batch_scripts_initial(self):
701701
### handle ffmpeg if included
702702
#####################
703703
if (Test-Path "$env:WINPYDIR\..\tools\ffmpeg.exe") {
704-
$env:IMAGEIO_FFMPEG_EXE = "%WINPYDIR%\..\tools\ffmpeg.exe"
704+
$env:IMAGEIO_FFMPEG_EXE = "%WINPYDIRBASE%\tools\ffmpeg.exe"
705705
}
706706
707707
#####################
@@ -774,8 +774,8 @@ def _create_batch_scripts_initial(self):
774774
if not exist "%HOME%\.spyder-py%WINPYVER:~0,1%\workingdir" echo %HOME%\Notebooks>"%HOME%\.spyder-py%WINPYVER:~0,1%\workingdir"
775775
776776
rem ******* make cython use mingwpy part *******
777-
if not exist "%WINPYDIR%\..\settings\pydistutils.cfg" goto no_cython
778-
if not exist "%HOME%\pydistutils.cfg" xcopy "%WINPYDIR%\..\settings\pydistutils.cfg" "%HOME%"
777+
if not exist "%WINPYDIRBASE%\settings\pydistutils.cfg" goto no_cython
778+
if not exist "%HOME%\pydistutils.cfg" xcopy "%WINPYDIRBASE%\settings\pydistutils.cfg" "%HOME%"
779779
:no_cython
780780
""")
781781

@@ -861,7 +861,7 @@ def _create_batch_scripts(self):
861861
rem mingw part
862862
rem ******************
863863
864-
set pydistutils_cfg=%WINPYDIR%\..\settings\pydistutils.cfg
864+
set pydistutils_cfg=%WINPYDIRBASE%\settings\pydistutils.cfg
865865
866866
set tmp_blank=
867867
echo [config]>"%pydistutils_cfg%"
@@ -882,7 +882,7 @@ def _create_batch_scripts(self):
882882

883883
self.create_batch_script('make_cython_use_vc.bat', r"""@echo off
884884
call "%~dp0env.bat"
885-
set pydistutils_cfg=%WINPYDIR%\..\settings\pydistutils.cfg
885+
set pydistutils_cfg=%WINPYDIRBASE%\settings\pydistutils.cfg
886886
echo [config]>%pydistutils_cfg%
887887
""")
888888

@@ -1303,7 +1303,7 @@ def make_all(build_number, release_level, pyver, architecture,
13031303
utils.print_box("Making WinPython %dbits" % architecture)
13041304

13051305
# Create Build director, where Winpython will be constructed
1306-
builddir = osp.join(basedir, 'build' + flavor)
1306+
builddir = osp.join(basedir, 'bu' + flavor)
13071307
if not osp.isdir(builddir):
13081308
os.mkdir(builddir)
13091309

@@ -1347,7 +1347,7 @@ def make_all(build_number, release_level, pyver, architecture,
13471347
install_options=install_options + find_list,
13481348
flavor=flavor, docsdirs=docsdirs)
13491349
# define a pre-defined winpydir, instead of having to guess
1350-
my_winpydir = ('winpython-' + ('%s' % architecture) +'bit-' + pyver +
1350+
my_winpydir = ('winp' + ('%s' % architecture) +'-' + pyver +
13511351
'.x.' + ('%s' %build_number) ) # + flavor + release_level)
13521352

13531353
dist.make(remove_existing=remove_existing, requirements=requirements,

0 commit comments

Comments
 (0)