Skip to content

Commit 0fbcc4a

Browse files
N6REJN6REJ
committed
Completely working x32 release. Resetting this as main!
1 parent a428948 commit 0fbcc4a

File tree

4 files changed

+71
-83
lines changed

4 files changed

+71
-83
lines changed

‎bin/python3.7.0.2/pyqt4/install.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@echo off
2-
set WINPYSCRIPTSDIR=%~dp0..\scripts
3-
call "%WINPYSCRIPTSDIR%\env.bat"
4-
"%WINPYDIR%\Scripts\pip.exe" install PyQt4-4.11.4-cp37-cp37m-win32.whl
1+
@echo off
2+
set WINPYSCRIPTSDIR=%~dp0..\scripts
3+
call "%WINPYSCRIPTSDIR%\env.bat"
4+
"%WINPYDIR%\Scripts\pip.exe" install PyQt4-4.11.4-cp37-cp37m-win32.whl

‎bin/python3.7.0.2/pyqt4/pyqt4.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pyqt4 = https://github.com/neard/modules-untouched/releases/download/python-r3/PyQt4-4.11.4-cp37-cp37m-win32.whl
1+
pyqt4 = https://github.com/Bearsampp/modules-untouched/releases/download/python-2022.07.16/PyQt4-4.11.4-cp37-cp37m-win32.whl

‎build.xml‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project name="module-python" basedir=".">
3-
4-
<dirname property="project.basedir" file="${ant.file.module-python}"/>
5-
<property name="root.dir" location="${project.basedir}/.."/>
6-
<property name="build.properties" value="${project.basedir}/build.properties"/>
7-
<property file="${build.properties}"/>
8-
9-
<!-- Neard dev -->
10-
<property name="dev.path" location="${root.dir}/dev"/>
11-
<fail unless="dev.path" message="Project 'dev' not found in ${dev.path}"/>
12-
<echo message="Neard dev found in ${dev.path}" level="debug"/>
13-
14-
<!-- Import build-commons.xml -->
15-
<import file="${dev.path}/build/build-commons.xml"/>
16-
<!-- Import build-bundle.xml -->
17-
<import file="${dev.path}/build/build-bundle.xml"/>
18-
19-
<target name="release.build">
20-
<basename property="bundle.folder" file="${bundle.path}"/>
21-
<replaceproperty src="bundle.folder" dest="bundle.version" replace="${bundle.name}" with=""/>
22-
23-
<getmoduleuntouched name="${bundle.name}" version="${bundle.version}" propSrcDest="bundle.srcdest" propSrcFilename="bundle.srcfilename"/>
24-
<assertfile file="${bundle.srcdest}/scripts/python.bat"/>
25-
26-
<!-- Temp copy -->
27-
<copy todir="${bundle.srcdest}" overwrite="true">
28-
<fileset dir="${bundle.path}" defaultexcludes="yes"/>
29-
</copy>
30-
31-
<!-- Upgrade PIP -->
32-
<echo message="Upgrade PIP"/>
33-
<exec executable="${bundle.srcdest}/bin/python.bat" dir="${bundle.srcdest}/bin" failonerror="true">
34-
<arg value="-m"/>
35-
<arg value="pip"/>
36-
<arg value="install"/>
37-
<arg value="--upgrade"/>
38-
<arg value="pip"/>
39-
</exec>
40-
41-
<!-- Download PyQt4 -->
42-
<echo message="Download PyQt4"/>
43-
<property name="pyqt4.path" location="${bundle.srcdest}/pyqt4"/>
44-
<property file="${pyqt4.path}/pyqt4.properties"/>
45-
<mkdir dir="${pyqt4.path}"/>
46-
<get dest="${pyqt4.path}" src="${pyqt4}" skipexisting="true"/>
47-
48-
<!-- Install PyQt4 -->
49-
<echo message="Install PyQt4"/>
50-
<exec executable="${pyqt4.path}/install.bat" dir="${pyqt4.path}" failonerror="true"/>
51-
<delete dir="${pyqt4.path}"/>
52-
53-
<delete dir="${bundle.tmp.prep.path}/${bundle.folder}"/>
54-
<mkdir dir="${bundle.tmp.prep.path}/${bundle.folder}"/>
55-
<copy todir="${bundle.tmp.prep.path}/${bundle.folder}" overwrite="true">
56-
<fileset dir="${bundle.srcdest}"/>
57-
</copy>
58-
<copy todir="${bundle.tmp.prep.path}/${bundle.folder}" overwrite="true">
59-
<fileset dir="${bundle.path}" defaultexcludes="yes" excludes="
60-
pyqt4/**"
61-
/>
62-
</copy>
63-
</target>
64-
65-
</project>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project name="module-python" basedir=".">
3+
4+
<dirname property="project.basedir" file="${ant.file.module-python}"/>
5+
<property name="root.dir" location="${project.basedir}/.."/>
6+
<property name="build.properties" value="${project.basedir}/build.properties"/>
7+
<property file="${build.properties}"/>
8+
9+
<!-- Bearsampp dev -->
10+
<property name="dev.path" location="${root.dir}/dev"/>
11+
<fail unless="dev.path" message="Project 'dev' not found in ${dev.path}"/>
12+
<echo message="Bearsampp dev found in ${dev.path}" level="debug"/>
13+
14+
<!-- Import build-commons.xml -->
15+
<import file="${dev.path}/build/build-commons.xml"/>
16+
<!-- Import build-bundle.xml -->
17+
<import file="${dev.path}/build/build-bundle.xml"/>
18+
19+
<target name="release.build">
20+
<basename property="bundle.folder" file="${bundle.path}"/>
21+
<replaceproperty src="bundle.folder" dest="bundle.version" replace="${bundle.name}" with=""/>
22+
23+
<getmoduleuntouched name="${bundle.name}" version="${bundle.version}" propSrcDest="bundle.srcdest" propSrcFilename="bundle.srcfilename"/>
24+
<assertfile file="${bundle.srcdest}/scripts/python.bat"/>
25+
26+
<!-- Temp copy -->
27+
<copy todir="${bundle.srcdest}" overwrite="true">
28+
<fileset dir="${bundle.path}" defaultexcludes="yes"/>
29+
</copy>
30+
31+
<!-- Upgrade PIP -->
32+
<echo message="Upgrade PIP"/>
33+
<exec executable="${bundle.srcdest}/bin/python.bat" dir="${bundle.srcdest}/bin" failonerror="true">
34+
<arg value="-m"/>
35+
<arg value="pip"/>
36+
<arg value="install"/>
37+
<arg value="--upgrade"/>
38+
<arg value="pip"/>
39+
</exec>
40+
41+
<!-- Download PyQt4 -->
42+
<echo message="Download PyQt4"/>
43+
<property name="pyqt4.path" location="${bundle.srcdest}/pyqt4"/>
44+
<property file="${pyqt4.path}/pyqt4.properties"/>
45+
<mkdir dir="${pyqt4.path}"/>
46+
<get dest="${pyqt4.path}" src="${pyqt4}" skipexisting="true"/>
47+
48+
<!-- Install PyQt4 -->
49+
<echo message="Install PyQt4"/>
50+
<exec executable="${pyqt4.path}/install.bat" dir="${pyqt4.path}" failonerror="true"/>
51+
<delete dir="${pyqt4.path}"/>
52+
53+
<delete dir="${bundle.tmp.prep.path}/${bundle.folder}"/>
54+
<mkdir dir="${bundle.tmp.prep.path}/${bundle.folder}"/>
55+
<copy todir="${bundle.tmp.prep.path}/${bundle.folder}" overwrite="true">
56+
<fileset dir="${bundle.srcdest}"/>
57+
</copy>
58+
<copy todir="${bundle.tmp.prep.path}/${bundle.folder}" overwrite="true">
59+
<fileset dir="${bundle.path}" defaultexcludes="yes" excludes="
60+
pyqt4/**"
61+
/>
62+
</copy>
63+
</target>
64+
65+
</project>

‎releases.properties‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1 @@
1-
2.7.12.3 = https://github.com/neard/module-python/releases/download/r1/neard-python-2.7.12.3-r1.7z
2-
2.7.12.4 = https://github.com/neard/module-python/releases/download/r3/neard-python-2.7.12.4-r3.7z
3-
2.7.13.0 = https://github.com/neard/module-python/releases/download/r3/neard-python-2.7.13.0-r3.7z
4-
3.4.4.4 = https://github.com/neard/module-python/releases/download/r1/neard-python-3.4.4.4-r1.7z
5-
3.4.4.5 = https://github.com/neard/module-python/releases/download/r3/neard-python-3.4.4.5-r3.7z
6-
3.4.4.6 = https://github.com/neard/module-python/releases/download/r3/neard-python-3.4.4.6-r3.7z
7-
3.5.2.2 = https://github.com/neard/module-python/releases/download/r1/neard-python-3.5.2.2-r1.7z
8-
3.5.2.3 = https://github.com/neard/module-python/releases/download/r3/neard-python-3.5.2.3-r3.7z
9-
3.5.3.0 = https://github.com/neard/module-python/releases/download/r3/neard-python-3.5.3.0-r3.7z
10-
3.6.0.0 = https://github.com/neard/module-python/releases/download/r3/neard-python-3.6.0.0-r3.7z
11-
3.6.0.1 = https://github.com/neard/module-python/releases/download/r3/neard-python-3.6.0.1-r3.7z
12-
3.6.6.2 = https://github.com/neard/module-python/releases/download/r4/neard-python-3.6.6.2-r4.7z
13-
3.7.0.2 = https://github.com/neard/module-python/releases/download/r4/neard-python-3.7.0.2-r4.7z
1+
3.7.0.2 = https://github.com/Bearsampp/module-python/releases/download/2022.07.16/bearsampp-python-3.7.0.2-2022.07.16.7z

0 commit comments

Comments
 (0)