Merge pull request #598 from stonebig/master

adapt to nodejs8 (reduce build path)

diff.py

@@ -152,7 +152,7 @@ def diff_package_dicts(dict1_in, dict2_in):
 
 def find_closer_version(version1, basedir=None, flavor='', architecture=64):
     """Find version which is the closest to `version`"""
-    builddir = osp.join(basedir, 'build%s' % flavor)
+    builddir = osp.join(basedir, 'bu%s' % flavor)
     func = lambda name: re.match(r'WinPython%s-%sbit-([0-9\.]*)\.(txt|md)' %
                                 (flavor, architecture), name)
     versions = [func(name).groups()[0]
@@ -192,23 +192,25 @@ def compare_package_indexes(version2, version1=None, basedir=None, flavor='',
     return text
 
 
-def _copy_all_changelogs(version, basedir, flavor='', architecture=64):
+def _copy_all_changelogs(version, basedir, flavor='',
+                         architecture=64):
     basever = '.'.join(version.split('.')[:2])
     for name in os.listdir(CHANGELOGS_DIR):
         if re.match(r'WinPython%s-%sbit-%s([0-9\.]*)\.(txt|md)' %
                     (flavor, architecture, basever), name):
             shutil.copyfile(osp.join(CHANGELOGS_DIR, name),
-                            osp.join(basedir, 'build%s' % flavor, name))
+                            osp.join(basedir, 'bu%s' % flavor, name))
 
 
 def write_changelog(version2, version1=None, basedir=None, flavor='',
                     release_level='', architecture=64):
     """Write changelog between version1 and version2 of WinPython"""
-    _copy_all_changelogs(version2, basedir, flavor=flavor, architecture=architecture)
+    _copy_all_changelogs(version2, basedir, flavor=flavor,
+                         architecture=architecture)
     print ('comparing_package_indexes', version2, basedir, flavor, architecture)
     text = compare_package_indexes(version2, version1, basedir=basedir,
                                    flavor=flavor, architecture=architecture)
-    fname = osp.join(basedir, 'build%s' % flavor,
+    fname = osp.join(basedir, 'bu%s' % flavor,
                      'WinPython%s-%sbit-%s_History.md' % (flavor, architecture,
                                                           version2))
     with open(fname, 'w', encoding='utf-8-sig') as fdesc:  # python 3 need

generate_a_winpython_distro.bat

@@ -3,7 +3,7 @@ rem  to launch from a winpython package directory, where 'make.py' is
 rem  this is initialised per the calling .bat
 rem  set my_original_path=%path%
 rem  set my_buildenv=C:\winpython-64bit-3.4.3.7Qt5
-rem  set my_root_dir_for_builds=D:\Winpython
+rem  set my_root_dir_for_builds=D:\Winp
 
 rem  set my_python_target=34
 rem  set my_pyver=3.4
@@ -14,37 +14,40 @@ rem v2 2016-03-19 change
 rem we don't use building rootdir (D:\winPython) anymore
 rem we use only building basedir (D:\WinPython\basedir34Qt5)  
 
-set my_basedir=%my_root_dir_for_builds%\basedir%my_python_target%
+set my_basedir=%my_root_dir_for_builds%\bd%my_python_target%
 rem set my_basedir=%my_root_dir_for_builds%\build%my_python_target%\%my_arch%
 
 rem ***********************************************************
 rem Override other scripts (simpler maintenance)
 
 set my_buildenv=C:\winpython-64bit-3.4.3.7Qt5
 
-set my_release_level=
+rem handle alpha
+if "%my_release_level%"=="" set my_release_level=b5
 
 if %my_python_target%==27 set my_release=2
 
 if %my_python_target%==34 set my_release=8
 
-if %my_python_target%==35 set my_release=0
+if %my_python_target%==35 set my_release=2
 
 if %my_python_target%==36 set my_release=0
 
+if %my_python_target%==37 set my_release=0
+
 rem ***********************************************************
 
 rem  set my_flavor=Slim
 
 rem  set my_arch=32
 rem  set my_preclear_build_directory=Yes
 
-rem  set my_requirements=d:\my_req1.txt d:\my_req2.txt d:\my_req3.txt  d:\my_req4.txt
+rem  set my_requi=C:\Winpents=d:\my_req1.txt d:\my_req2.txt d:\my_req3.txt  d:\my_req4.txt
 rem  set my_find_links=D:\WinPython\packages.srcreq
 
-rem  set my_source_dirs=D:\WinPython\basedir34\packages.src D:\WinPython\basedir34\packages.win32.Slim
-rem  set my_toolsdirs=D:\WinPython\basedir34\Tools.Slim
-rem  set my_docsdirs=D:\WinPython\basedir34\docs.Slim
+rem  set my_source_dirs=D:\WinPython\bd34\packages.src D:\WinPython\bd34\packages.win32.Slim
+rem  set my_toolsdirs=D:\WinPython\bd34\Tools.Slim
+rem  set my_docsdirs=D:\WinPython\bd34\docs.Slim
 
 
 rem  set my_install_options=--no-index --pre
@@ -79,19 +82,19 @@ echo 1.0 Do Pre-clear  >>%my_archive_log%
 echo ------------------>>%my_archive_log%
 
 
-cd /D  %my_root_dir_for_builds%\basedir%my_python_target%
+cd /D  %my_root_dir_for_builds%\bd%my_python_target%
 
 set build_det=\%my_flavor%
 if "%my_flavor%"=="" set build_det=
 
 dir %build_det%
-echo rmdir /S /Q build%my_flavor%
+echo rmdir /S /Q bu%my_flavor%
 rem  pause
-rmdir /S /Q build%my_flavor%
-rmdir /S /Q build%my_flavor%
-rmdir /S /Q build%my_flavor%
-rmdir /S /Q build%my_flavor%
-rmdir /S /Q build%my_flavor%
+rmdir /S /Q bu%my_flavor%
+rmdir /S /Q bu%my_flavor%
+rmdir /S /Q bu%my_flavor%
+rmdir /S /Q bu%my_flavor%
+rmdir /S /Q bu%my_flavor%
 rmdir /S /Q dist
 
 echo %date% %time%

generate_winpython_distros35_qt5.bat

@@ -4,7 +4,7 @@ rem  to launch from a winpython module 'make' directory
 set my_original_path=%path%
 set my_buildenv=C:\winpython-64bit-3.4.3.7Qt5
 
-set my_root_dir_for_builds=C:\Winpython
+set my_root_dir_for_builds=C:\Winp
 set my_python_target=35
 set my_pyver=3.5
 
@@ -13,28 +13,30 @@ set my_flavor=Qt5
 set my_release=3
 set my_release_level=
 
+set my_install_options=--no-index --pre --trusted-host=None
+set my_find_links=C:\Winp\packages.srcreq
+set my_docsdirs=C:\Winp\bd35\docs
+
 set my_arch=32
-set my_preclear_build_directory=Yes
 
-set tmp_reqdir=%my_root_dir_for_builds%\basedir%my_python_target%
+set tmp_reqdir=%my_root_dir_for_builds%\bd%my_python_target%
+
 set my_requirements=%tmp_reqdir%\Qt5_requirements.txt
 
-set my_find_links=C:\WinPython\packages.srcreq
 
-set my_source_dirs=C:\WinPython\basedir35\packages.win32.Qt5
-set my_toolsdirs=C:\WinPython\basedir35\tools
-set my_docsdirs=C:\WinPython\basedir35\docs
+set my_source_dirs=C:\Winp\bd35\packages.win32.Qt5
+set my_toolsdirs=C:\Winp\bd35\tools
 
-set my_install_options=--no-index --pre --trusted-host=None
 
+set my_preclear_build_directory=Yes
 call %~dp0\generate_a_winpython_distro.bat
 
-set my_requirements=%tmp_reqdir%\Qt5_requirements64.txt
 set my_arch=64
-set my_toolsdirs=C:\WinPython\basedir35\tools64
-set my_preclear_build_directory=No
+set my_requirements=%tmp_reqdir%\Qt5_requirements64.txt
+set my_source_dirs=C:\Winp\bd35\packages.win-amd64.Qt5
+set my_toolsdirs=C:\Winp\bd35\tools64
 
-set my_source_dirs=C:\WinPython\basedir35\packages.win-amd64.Qt5
+set my_preclear_build_directory=No
 
 
 call %~dp0\generate_a_winpython_distro.bat

generate_winpython_distros36_qt5.bat

@@ -4,7 +4,7 @@ rem  to launch from a winpython module 'make' directory
 set my_original_path=%path%
 set my_buildenv=C:\winpython-64bit-3.4.3.7Qt5
 
-set my_root_dir_for_builds=C:\Winpython
+set my_root_dir_for_builds=C:\Winp
 set my_python_target=36
 set my_pyver=3.6
 
@@ -14,29 +14,31 @@ set my_release=0
 
 set my_release_level=
 
-set my_arch=32
-set my_preclear_build_directory=Yes
+set my_install_options=--no-index --pre --trusted-host=None
+set my_find_links=C:\Winp\packages.srcreq
+set my_docsdirs=C:\Winp\bd36\docs
 
-set tmp_reqdir=%my_root_dir_for_builds%\basedir%my_python_target%
+set my_arch=32
 
-set my_requirements=C:\Winpython\basedir36\Qt5_requirements.txt
+set tmp_reqdir=%my_root_dir_for_builds%\bd%my_python_target%
 
-set my_find_links=C:\WinPython\packages.srcreq
+set my_requirements=C:\Winp\bd36\Qt5_requirements.txt
 
-set my_source_dirs=C:\WinPython\basedir36\packages.win32.Qt5
-set my_toolsdirs=C:\WinPython\basedir36\Tools
-set my_docsdirs=C:\WinPython\basedir36\docs
 
-set my_install_options=--no-index --pre --trusted-host=None
+set my_source_dirs=C:\Winp\bd36\packages.win32.Qt5
+set my_toolsdirs=C:\Winp\bd36\Tools
 
+set my_preclear_build_directory=Yes
 call %~dp0\generate_a_winpython_distro.bat
 
 set my_arch=64
-set my_requirements=C:\Winpython\basedir36\Qt5_requirements64.txt
-set my_toolsdirs=C:\WinPython\basedir36\Tools64
+set my_requirements=C:\Winp\bd36\Qt5_requirements64.txt
+set my_source_dirs=C:\Winp\bd36\packages.win-amd64.Qt5
+set my_toolsdirs=C:\Winp\bd36\Tools64
 
 set my_preclear_build_directory=No
-set my_source_dirs=C:\WinPython\basedir36\packages.win-amd64.Qt5
+
+
 call %~dp0\generate_a_winpython_distro.bat
 
 

make.py

@@ -583,7 +583,7 @@ def _create_batch_scripts_initial(self):
 
 set WINPYVER=""" + self.winpyver + r"""
 set HOME=%WINPYDIRBASE%\settings
-set WINPYDIRBASE=
+rem set WINPYDIRBASE=
 
 set JUPYTER_DATA_DIR=%HOME%
 set WINPYARCH=WIN32
@@ -598,8 +598,8 @@ def _create_batch_scripts_initial(self):
 rem ******************
 rem handle R if included
 rem ******************
-if not exist "%WINPYDIR%\..\tools\R\bin" goto r_bad
-set R_HOME=%WINPYDIR%\..\tools\R
+if not exist "%WINPYDIRBASE%\tools\R\bin" goto r_bad
+set R_HOME=%WINPYDIRBASE%\tools\R
 if     "%WINPYARCH%"=="WIN32" set R_HOMEbin=%R_HOME%\bin\i386
 if not "%WINPYARCH%"=="WIN32" set R_HOMEbin=%R_HOME%\bin\x64
 :r_bad
@@ -608,26 +608,26 @@ def _create_batch_scripts_initial(self):
 rem ******************
 rem handle Julia if included
 rem ******************
-if not exist "%WINPYDIR%\..\tools\Julia\bin" goto julia_bad
-set JULIA_HOME=%WINPYDIR%\..\tools\Julia\bin\
+if not exist "%WINPYDIRBASE%\tools\Julia\bin" goto julia_bad
+set JULIA_HOME=%WINPYDIRBASE%\tools\Julia\bin\
 set JULIA_EXE=julia.exe
 set JULIA=%JULIA_HOME%%JULIA_EXE%
-set JULIA_PKGDIR=%WINPYDIR%\..\settings\.julia
+set JULIA_PKGDIR=%WINPYDIRBASE%\settings\.julia
 :julia_bad
 
 rem ******************
 rem handle ffmpeg if included
 rem ******************
-if not exist "%WINPYDIR%\..\tools\ffmpeg.exe" goto ffmpeg_bad
-set IMAGEIO_FFMPEG_EXE=%WINPYDIR%\..\tools\ffmpeg.exe
+if not exist "%WINPYDIRBASE%\tools\ffmpeg.exe" goto ffmpeg_bad
+set IMAGEIO_FFMPEG_EXE=%WINPYDIRBASE%\tools\ffmpeg.exe
 
 :ffmpeg_bad
 
 rem ******************
 rem WinPython.ini part (removed from nsis)
 rem ******************
-if not exist "%WINPYDIR%\..\settings" mkdir "%WINPYDIR%\..\settings" 
-set winpython_ini=%WINPYDIR%\..\settings\winpython.ini
+if not exist "%WINPYDIRBASE%\settings" mkdir "%WINPYDIRBASE%\settings" 
+set winpython_ini=%WINPYDIRBASE%\settings\winpython.ini
 if not exist "%winpython_ini%" (
     echo [debug]>>"%winpython_ini%"
     echo state = disabled>>"%winpython_ini%"
@@ -701,7 +701,7 @@ def _create_batch_scripts_initial(self):
 ### handle ffmpeg if included
 #####################
 if (Test-Path "$env:WINPYDIR\..\tools\ffmpeg.exe") {
-    $env:IMAGEIO_FFMPEG_EXE = "%WINPYDIR%\..\tools\ffmpeg.exe"
+    $env:IMAGEIO_FFMPEG_EXE = "%WINPYDIRBASE%\tools\ffmpeg.exe"
 }
 
 #####################
@@ -774,8 +774,8 @@ def _create_batch_scripts_initial(self):
 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 "%WINPYDIR%\..\settings\pydistutils.cfg" goto no_cython
-if not exist "%HOME%\pydistutils.cfg" xcopy   "%WINPYDIR%\..\settings\pydistutils.cfg" "%HOME%" 
+if not exist "%WINPYDIRBASE%\settings\pydistutils.cfg" goto no_cython
+if not exist "%HOME%\pydistutils.cfg" xcopy   "%WINPYDIRBASE%\settings\pydistutils.cfg" "%HOME%" 
 :no_cython 
 """)
 
@@ -861,7 +861,7 @@ def _create_batch_scripts(self):
 rem mingw part
 rem ******************
 
-set pydistutils_cfg=%WINPYDIR%\..\settings\pydistutils.cfg
+set pydistutils_cfg=%WINPYDIRBASE%\settings\pydistutils.cfg
 
 set tmp_blank=
 echo [config]>"%pydistutils_cfg%"
@@ -882,7 +882,7 @@ def _create_batch_scripts(self):
 
         self.create_batch_script('make_cython_use_vc.bat', r"""@echo off
 call "%~dp0env.bat"
-set pydistutils_cfg=%WINPYDIR%\..\settings\pydistutils.cfg
+set pydistutils_cfg=%WINPYDIRBASE%\settings\pydistutils.cfg
 echo [config]>%pydistutils_cfg%
         """)
 
@@ -1303,7 +1303,7 @@ def make_all(build_number, release_level, pyver, architecture,
     utils.print_box("Making WinPython %dbits" % architecture)
 
     # Create Build director, where Winpython will be constructed
-    builddir = osp.join(basedir, 'build' + flavor)
+    builddir = osp.join(basedir, 'bu' + flavor)
     if not osp.isdir(builddir):
         os.mkdir(builddir)
 
@@ -1347,7 +1347,7 @@ def make_all(build_number, release_level, pyver, architecture,
                                  install_options=install_options + find_list,
                                  flavor=flavor, docsdirs=docsdirs)
     # define a pre-defined winpydir, instead of having to guess
-    my_winpydir = ('winpython-' + ('%s' % architecture) +'bit-' + pyver +
+    my_winpydir = ('winp' + ('%s' % architecture) +'-' + pyver +
      '.x.' + ('%s' %build_number) )  # + flavor + release_level)   
 
     dist.make(remove_existing=remove_existing, requirements=requirements,