diff --git a/generate_a_winpython_distro.bat b/generate_a_winpython_distro.bat index fe96131f..59ef6a34 100644 --- a/generate_a_winpython_distro.bat +++ b/generate_a_winpython_distro.bat @@ -1,35 +1,35 @@ -rem to launch from a winpython package directory, where 'make.py' is +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=D:\WinPython-64bit-3.4.3.3_b0 -rem set my_root_dir_for_builds=D:\Winpython +rem this is initialised per the calling .bat +rem set my_original_path=%path% +rem set my_buildenv=D:\WinPython-64bit-3.4.3.3_b0 +rem set my_root_dir_for_builds=D:\Winpython -rem set my_python_target=34 -rem set my_pyver=3.4 -rem set my_release=4 +rem set my_python_target=34 +rem set my_pyver=3.4 +rem set my_release=84 -rem set my_release_level=build2 -rem set my_flavor=Slim +rem set my_release_level=build2 +rem set my_flavor=Slim -rem set my_arch=32 -rem set my_preclear_build_directory=Yes +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_find_links=%tmp_reqdir%\packages.srcreq +rem set my_requirements=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\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_install_options=--no-index --pre +rem set my_install_options=--no-index --pre set my_day=%date:/=-% set my_time=%time:~0,5% set my_time=%my_time::=_% -rem was the bug +rem was the bug set my_time=%my_time: =0% set my_archive_dir=%~dp0WinPython_build_logs @@ -62,7 +62,7 @@ if "%my_flavor%"=="" set build_det= dir %build_det% echo rmdir /S /Q build%my_flavor% -rem pause +rem pause rmdir /S /Q build%my_flavor% rmdir /S /Q build%my_flavor% rmdir /S /Q build%my_flavor% @@ -90,7 +90,7 @@ set path=%my_original_path% echo call %my_buildenv%\scripts\env.bat>>%my_archive_log% call %my_buildenv%\scripts\env.bat -rem build with this +rem build with this cd /D %~dp0 echo python.exe -c "from make import *;make_all(%my_release%, '%my_release_level%', pyver='%my_pyver%', rootdir=r'%my_root_dir_for_builds%', verbose=True, archis=(%my_arch%, ), flavor='%my_flavor%', requirements=r'%my_requirements%', install_options=r'%my_install_options%', find_links=r'%my_find_links%', source_dirs=r'%my_source_dirs%', toolsdirs=r'%my_toolsdirs%', docsdirs=r'%my_docsdirs%')">>%my_archive_log% python.exe -c "from make import *;make_all(%my_release%, '%my_release_level%', pyver='%my_pyver%', rootdir=r'%my_root_dir_for_builds%', verbose=True, archis=(%my_arch%, ), flavor='%my_flavor%', requirements=r'%my_requirements%', install_options=r'%my_install_options%', find_links=r'%my_find_links%', source_dirs=r'%my_source_dirs%', toolsdirs=r'%my_toolsdirs%', docsdirs=r'%my_docsdirs%')">>%my_archive_log% diff --git a/generate_winpython_distros34.bat b/generate_winpython_distros34.bat index 6634004c..9fb718b6 100644 --- a/generate_winpython_distros34.bat +++ b/generate_winpython_distros34.bat @@ -1,5 +1,5 @@ -rem this replace running manually from spyder the make.py -rem to launch from a winpython module 'make' directory +rem this replace running manually from spyder the make.py +rem to launch from a winpython module 'make' directory set my_original_path=%path% set my_buildenv=D:\winpython-64bit-3.4.3.6Qt5 @@ -9,7 +9,7 @@ set my_python_target=34 set my_pyver=3.4 set my_release=7 -set my_release_level=build2 +set my_release_level= set my_flavor= set my_arch=64 @@ -19,8 +19,7 @@ set my_preclear_build_directory=Yes set tmp_reqdir=%my_root_dir_for_builds%\basedir%my_python_target% set my_requirements=%tmp_reqdir%\requirements.txt %tmp_reqdir%\requirements2.txt %tmp_reqdir%\requirements3.txt -rem set my_find_links=%tmp_reqdir%\packages.srcreq -set my_find_links=D:\WinPython\basedir34\packages.srcreq +set my_find_links=D:\WinPython\packages.srcreq set my_install_options=--no-index --pre --trusted-host=None diff --git a/generate_winpython_distros34_qt5.bat b/generate_winpython_distros34_qt5.bat index 7a995f09..8b3c9c9c 100644 --- a/generate_winpython_distros34_qt5.bat +++ b/generate_winpython_distros34_qt5.bat @@ -1,15 +1,15 @@ -rem this replace running manually from spyder the make.py -rem to launch from a winpython module 'make' directory +rem this replace running manually from spyder the make.py +rem to launch from a winpython module 'make' directory set my_original_path=%path% set my_buildenv=D:\winpython-64bit-3.4.3.6Qt5 -set my_root_dir_for_builds=D:\WinpythonQt5 +set my_root_dir_for_builds=D:\Winpython set my_python_target=34 set my_pyver=3.4 set my_release=7 -set my_release_level=build2 +set my_release_level= set my_flavor=Qt5 @@ -19,8 +19,7 @@ set my_preclear_build_directory=Yes set tmp_reqdir=%my_root_dir_for_builds%\basedir%my_python_target% set my_requirements=%tmp_reqdir%\Qt5_requirements.txt %tmp_reqdir%\Qt5_requirements2.txt %tmp_reqdir%\Qt5_requirements3.txt -set my_find_links=%tmp_reqdir%\packages.srcreq -rem set my_find_links=D:\WinPython\basedir34\packages.srcreq +set my_find_links=D:\WinPython\packages.srcreq set my_source_dirs=D:\WinPython\basedir34\packages.src D:\WinPython\basedir34\packages.win-amd64.Qt5 set my_toolsdirs= @@ -33,7 +32,7 @@ set my_arch=32 set my_preclear_build_directory=No -set my_source_dirs=D:\WinPython\basedir34\packages.src D:\WinPython\basedir34\packages.win-32.Qt5 +set my_source_dirs=D:\WinPython\basedir34\packages.src D:\WinPython\basedir34\packages.win32.Qt5 set my_toolsdirs= diff --git a/tools/SciTE.exe b/tools/SciTE.exe deleted file mode 100644 index f82d9338..00000000 Binary files a/tools/SciTE.exe and /dev/null differ diff --git a/tools/SciTEGlobal.properties b/tools/SciTEGlobal.properties deleted file mode 100644 index c85f60e3..00000000 --- a/tools/SciTEGlobal.properties +++ /dev/null @@ -1,56 +0,0 @@ -#~ Always use monospace fonts -font.base=$(font.monospace) -font.small=$(font.monospace) -font.comment=$(font.monospace) -font.text=$(font.monospace) -font.text.comment=$(font.monospace) -font.embedded.base=$(font.monospace) -font.embedded.comment=$(font.monospace) -font.vbs=$(font.monospace) - -# Sizes and visibility in edit pane -line.margin.visible=1 -line.margin.width=3+ - -# Element styles -caret.period=500 -view.whitespace=0 -view.indentation.whitespace=1 -view.indentation.guides=1 -view.indentation.examine=3 -highlight.indentation.guides=1 -edge.column=80 -edge.mode=1 -edge.colour=#C0DCC0 -braces.check=1 -braces.sloppy=1 - -# Indentation -tabsize=4 -indent.size=4 -use.tabs=0 -indent.automatic=1 -indent.opening=0 -indent.closing=0 - -# Folding -fold=1 -fold.compact=1 -fold.flags=16 -fold.symbols=1 -fold.comment=1 -fold.preprocessor=1 - -# Find and Replace -find.files=*.py *.pyw|*.c *.cpp *.cxx *.h|*.nsi *.nsh|*.htm *.html *.php - -# Status Bar -statusbar.number=4 -statusbar.text.1=\ -li=$(LineNumber) co=$(ColumnNumber) $(OverType) ($(EOLMode)) $(FileAttr) -statusbar.text.2=\ -$(BufferLength) chars in $(NbOfLines) lines. Sel: $(SelLength) chars. -statusbar.text.3=\ -Now is: Date=$(CurrentDate) Time=$(CurrentTime) -statusbar.text.4=\ -$(FileNameExt) : $(FileDate) - $(FileTime) | $(FileAttr)