Skip to content

Commit a257d31

Browse files
stonebigstonebig
committed
Merge pull request winpython#223 from stonebig/master
remove that SciTe
2 parents 765b6ef + bb541db commit a257d31

File tree

5 files changed

+31
-89
lines changed

5 files changed

+31
-89
lines changed

‎generate_a_winpython_distro.bat‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
rem to launch from a winpython package directory, where 'make.py' is
1+
rem to launch from a winpython package directory, where 'make.py' is
22

3-
rem this is initialised per the calling .bat
4-
rem set my_original_path=%path%
5-
rem set my_buildenv=D:\WinPython-64bit-3.4.3.3_b0
6-
rem set my_root_dir_for_builds=D:\Winpython
3+
rem this is initialised per the calling .bat
4+
rem set my_original_path=%path%
5+
rem set my_buildenv=D:\WinPython-64bit-3.4.3.3_b0
6+
rem set my_root_dir_for_builds=D:\Winpython
77

8-
rem set my_python_target=34
9-
rem set my_pyver=3.4
10-
rem set my_release=4
8+
rem set my_python_target=34
9+
rem set my_pyver=3.4
10+
rem set my_release=84
1111

12-
rem set my_release_level=build2
13-
rem set my_flavor=Slim
12+
rem set my_release_level=build2
13+
rem set my_flavor=Slim
1414

15-
rem set my_arch=32
16-
rem set my_preclear_build_directory=Yes
15+
rem set my_arch=32
16+
rem set my_preclear_build_directory=Yes
1717

18-
rem set my_requirements=d:\my_req1.txt d:\my_req2.txt d:\my_req3.txt d:\my_req4.txt
19-
rem set my_find_links=%tmp_reqdir%\packages.srcreq
18+
rem set my_requirements=d:\my_req1.txt d:\my_req2.txt d:\my_req3.txt d:\my_req4.txt
19+
rem set my_find_links=D:\WinPython\packages.srcreq
2020

21-
rem set my_source_dirs=D:\WinPython\basedir34\packages.src D:\WinPython\basedir34\packages.win32.Slim
22-
rem set my_toolsdirs=D:\WinPython\basedir34\Tools.Slim
23-
rem set my_docsdirs=D:\WinPython\basedir34\docs.Slim
21+
rem set my_source_dirs=D:\WinPython\basedir34\packages.src D:\WinPython\basedir34\packages.win32.Slim
22+
rem set my_toolsdirs=D:\WinPython\basedir34\Tools.Slim
23+
rem set my_docsdirs=D:\WinPython\basedir34\docs.Slim
2424

2525

26-
rem set my_install_options=--no-index --pre
26+
rem set my_install_options=--no-index --pre
2727

2828
set my_day=%date:/=-%
2929
set my_time=%time:~0,5%
3030
set my_time=%my_time::=_%
3131

32-
rem was the bug
32+
rem was the bug
3333
set my_time=%my_time: =0%
3434

3535
set my_archive_dir=%~dp0WinPython_build_logs
@@ -62,7 +62,7 @@ if "%my_flavor%"=="" set build_det=
6262

6363
dir %build_det%
6464
echo rmdir /S /Q build%my_flavor%
65-
rem pause
65+
rem pause
6666
rmdir /S /Q build%my_flavor%
6767
rmdir /S /Q build%my_flavor%
6868
rmdir /S /Q build%my_flavor%
@@ -90,7 +90,7 @@ set path=%my_original_path%
9090
echo call %my_buildenv%\scripts\env.bat>>%my_archive_log%
9191
call %my_buildenv%\scripts\env.bat
9292

93-
rem build with this
93+
rem build with this
9494
cd /D %~dp0
9595
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%
9696
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%

‎generate_winpython_distros34.bat‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
rem this replace running manually from spyder the make.py
2-
rem to launch from a winpython module 'make' directory
1+
rem this replace running manually from spyder the make.py
2+
rem to launch from a winpython module 'make' directory
33

44
set my_original_path=%path%
55
set my_buildenv=D:\winpython-64bit-3.4.3.6Qt5
@@ -9,7 +9,7 @@ set my_python_target=34
99
set my_pyver=3.4
1010
set my_release=7
1111

12-
set my_release_level=build2
12+
set my_release_level=
1313
set my_flavor=
1414

1515
set my_arch=64
@@ -19,8 +19,7 @@ set my_preclear_build_directory=Yes
1919
set tmp_reqdir=%my_root_dir_for_builds%\basedir%my_python_target%
2020
set my_requirements=%tmp_reqdir%\requirements.txt %tmp_reqdir%\requirements2.txt %tmp_reqdir%\requirements3.txt
2121

22-
rem set my_find_links=%tmp_reqdir%\packages.srcreq
23-
set my_find_links=D:\WinPython\basedir34\packages.srcreq
22+
set my_find_links=D:\WinPython\packages.srcreq
2423

2524
set my_install_options=--no-index --pre --trusted-host=None
2625

‎generate_winpython_distros34_qt5.bat‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
rem this replace running manually from spyder the make.py
2-
rem to launch from a winpython module 'make' directory
1+
rem this replace running manually from spyder the make.py
2+
rem to launch from a winpython module 'make' directory
33

44
set my_original_path=%path%
55
set my_buildenv=D:\winpython-64bit-3.4.3.6Qt5
66

7-
set my_root_dir_for_builds=D:\WinpythonQt5
7+
set my_root_dir_for_builds=D:\Winpython
88
set my_python_target=34
99
set my_pyver=3.4
1010
set my_release=7
1111

12-
set my_release_level=build2
12+
set my_release_level=
1313
set my_flavor=Qt5
1414

1515

@@ -19,8 +19,7 @@ set my_preclear_build_directory=Yes
1919
set tmp_reqdir=%my_root_dir_for_builds%\basedir%my_python_target%
2020
set my_requirements=%tmp_reqdir%\Qt5_requirements.txt %tmp_reqdir%\Qt5_requirements2.txt %tmp_reqdir%\Qt5_requirements3.txt
2121

22-
set my_find_links=%tmp_reqdir%\packages.srcreq
23-
rem set my_find_links=D:\WinPython\basedir34\packages.srcreq
22+
set my_find_links=D:\WinPython\packages.srcreq
2423

2524
set my_source_dirs=D:\WinPython\basedir34\packages.src D:\WinPython\basedir34\packages.win-amd64.Qt5
2625
set my_toolsdirs=
@@ -33,7 +32,7 @@ set my_arch=32
3332
set my_preclear_build_directory=No
3433

3534

36-
set my_source_dirs=D:\WinPython\basedir34\packages.src D:\WinPython\basedir34\packages.win-32.Qt5
35+
set my_source_dirs=D:\WinPython\basedir34\packages.src D:\WinPython\basedir34\packages.win32.Qt5
3736
set my_toolsdirs=
3837

3938

‎tools/SciTE.exe‎

-722 KB
Binary file not shown.

‎tools/SciTEGlobal.properties‎

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

0 commit comments

Comments
 (0)