sync

N6REJ · N6REJ · commit 5b22cb3503a1 · 2022-07-16T19:52:35.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,7 @@
 /.idea/php.xml
 /.idea/vcs.xml
 
-# Neard
+# Bearsampp
 /.dev
 
 # Visual Studio
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,20 +2,20 @@
 
 ## r4 (2018/10/04)
 
-* New releases : 3.6.6.2, 3.7.0.2 (Issue neard/neard#391)
+* New releases : 3.6.6.2, 3.7.0.2 (Issue bearsampp/bearsampp#391)
 
 ## r3 (2017/03/02)
 
-* New releases : 2.7.13.0, 3.4.4.6, 3.5.3.0, 3.6.0.1 (Issue neard/neard#223)
-* Python packaging problem (Issue neard/neard#222)
-* Normalize path error (Issue neard/neard#221)
+* New releases : 2.7.13.0, 3.4.4.6, 3.5.3.0, 3.6.0.1 (Issue bearsampp/bearsampp#223)
+* Python packaging problem (Issue bearsampp/bearsampp#222)
+* Normalize path error (Issue bearsampp/bearsampp#221)
 
 ## r2 (2017/01/27)
 
-* New releases : 2.7.12.4, 3.4.4.5, 3.5.2.3, 3.6.0.0 (Issue neard/neard#213)
+* New releases : 2.7.12.4, 3.4.4.5, 3.5.2.3, 3.6.0.0 (Issue bearsampp/bearsampp#213)
 
 ## r1 (2016/11/09)
 
 * Add releases : 2.7.12.3, 3.4.4.4, 3.5.2.2
 * Include PyQt4 4.11.4
-* Move PIP cache to tmp Neard folder
+* Move PIP cache to tmp Bearsampp folder
diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
-[![GitHub release](https://img.shields.io/github/release/neard/module-python.svg?style=flat-square)](https://github.com/neard/module-python/releases/latest)
-![Total downloads](https://img.shields.io/github/downloads/neard/module-python/total.svg?style=flat-square)
+[![GitHub release](https://img.shields.io/github/release/bearsampp/module-python.svg?style=flat-square)](https://github.com/bearsampp/module-python/releases/latest)
+![Total downloads](https://img.shields.io/github/downloads/bearsampp/module-python/total.svg?style=flat-square)
 
-This is a module of [Neard project](https://github.com/neard/neard) involving Python.
+This is a module of [Bearsampp project](https://github.com/bearsampp/bearsampp) involving Python.
 
 ## Documentation and downloads
 
-https://neard.io/modules/python
+https://bearsampp.com/module/python
 
 ## Issues
 
-Issues must be reported on [Neard repository](https://github.com/neard/neard/issues).
+Issues must be reported on [Bearsampp repository](https://github.com/bearsampp/bearsampp/issues).
diff --git a/bin/python2.7.12.3/pyqt4/pyqt4.properties b/bin/python2.7.12.3/pyqt4/pyqt4.properties
@@ -1 +1 @@
-pyqt4 = https://github.com/neard/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp27-none-win32.whl
+pyqt4 = https://github.com/bearsampp/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp27-none-win32.whl
diff --git a/bin/python2.7.12.4/pyqt4/pyqt4.properties b/bin/python2.7.12.4/pyqt4/pyqt4.properties
@@ -1 +1 @@
-pyqt4 = https://github.com/neard/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp27-none-win32.whl
+pyqt4 = https://github.com/bearsampp/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp27-none-win32.whl
diff --git a/bin/python2.7.13.0/pyqt4/pyqt4.properties b/bin/python2.7.13.0/pyqt4/pyqt4.properties
@@ -1 +1 @@
-pyqt4 = https://github.com/neard/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp27-none-win32.whl
+pyqt4 = https://github.com/bearsampp/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp27-none-win32.whl
diff --git a/bin/python3.4.4.4/pyqt4/pyqt4.properties b/bin/python3.4.4.4/pyqt4/pyqt4.properties
@@ -1 +1 @@
-pyqt4 = https://github.com/neard/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp34-none-win32.whl
+pyqt4 = https://github.com/bearsampp/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp34-none-win32.whl
diff --git a/bin/python3.4.4.5/pyqt4/pyqt4.properties b/bin/python3.4.4.5/pyqt4/pyqt4.properties
@@ -1 +1 @@
-pyqt4 = https://github.com/neard/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp34-none-win32.whl
+pyqt4 = https://github.com/bearsampp/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp34-none-win32.whl
diff --git a/bin/python3.4.4.6/pyqt4/pyqt4.properties b/bin/python3.4.4.6/pyqt4/pyqt4.properties
@@ -1 +1 @@
-pyqt4 = https://github.com/neard/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp34-none-win32.whl
+pyqt4 = https://github.com/bearsampp/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp34-none-win32.whl
diff --git a/bin/python3.5.2.2/pyqt4/pyqt4.properties b/bin/python3.5.2.2/pyqt4/pyqt4.properties
@@ -1 +1 @@
-pyqt4 = https://github.com/neard/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp35-none-win32.whl
+pyqt4 = https://github.com/bearsampp/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp35-none-win32.whl
diff --git a/bin/python3.5.2.3/pyqt4/pyqt4.properties b/bin/python3.5.2.3/pyqt4/pyqt4.properties
@@ -1 +1 @@
-pyqt4 = https://github.com/neard/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp35-none-win32.whl
+pyqt4 = https://github.com/bearsampp/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp35-none-win32.whl
diff --git a/bin/python3.5.3.0/pyqt4/pyqt4.properties b/bin/python3.5.3.0/pyqt4/pyqt4.properties
@@ -1 +1 @@
-pyqt4 = https://github.com/neard/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp35-none-win32.whl
+pyqt4 = https://github.com/bearsampp/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp35-none-win32.whl
diff --git a/bin/python3.6.0.0/pyqt4/pyqt4.properties b/bin/python3.6.0.0/pyqt4/pyqt4.properties
@@ -1 +1 @@
-pyqt4 = https://github.com/neard/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp36-cp36m-win32.whl
+pyqt4 = https://github.com/bearsampp/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp36-cp36m-win32.whl
diff --git a/bin/python3.6.0.1/pyqt4/pyqt4.properties b/bin/python3.6.0.1/pyqt4/pyqt4.properties
@@ -1 +1 @@
-pyqt4 = https://github.com/neard/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp36-cp36m-win32.whl
+pyqt4 = https://github.com/bearsampp/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp36-cp36m-win32.whl
diff --git a/bin/python3.6.6.2/pyqt4/pyqt4.properties b/bin/python3.6.6.2/pyqt4/pyqt4.properties
@@ -1 +1 @@
-pyqt4 = https://github.com/neard/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp36-cp36m-win32.whl
+pyqt4 = https://github.com/bearsampp/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp36-cp36m-win32.whl
diff --git a/bin/python3.7.0.2/pyqt4/pyqt4.properties b/bin/python3.7.0.2/pyqt4/pyqt4.properties
@@ -1 +1 @@
-pyqt4 = https://github.com/neard/modules-untouched/releases/download/python-r3/PyQt4-4.11.4-cp37-cp37m-win32.whl
+pyqt4 = https://github.com/bearsampp/modules-untouched/releases/download/python-r3/PyQt4-4.11.4-cp37-cp37m-win32.whl
diff --git a/build.properties b/build.properties
@@ -3,4 +3,4 @@ bundle.release = r4
 bundle.type = tools
 bundle.format = 7z
 
-#build.path = C:/neard-build
+#build.path = C:/Bearsampp-build
diff --git a/build.xml b/build.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="module-python" basedir=".">
-  
-  <dirname property="project.basedir" file="${ant.file.module-python}"/>
-  <property name="root.dir" location="${project.basedir}/.."/>
-  <property name="build.properties" value="${project.basedir}/build.properties"/>
-  <property file="${build.properties}"/>
-  
-  <!-- Neard dev -->
-  <property name="dev.path" location="${root.dir}/dev"/>
-  <fail unless="dev.path" message="Project 'dev' not found in ${dev.path}"/>
-  <echo message="Neard dev found in ${dev.path}" level="debug"/> 
-  
-  <!-- Import build-commons.xml -->
-  <import file="${dev.path}/build/build-commons.xml"/>
-  <!-- Import build-bundle.xml -->
-  <import file="${dev.path}/build/build-bundle.xml"/>
-  
-  <target name="release.build">
-    <basename property="bundle.folder" file="${bundle.path}"/>
-    <replaceproperty src="bundle.folder" dest="bundle.version" replace="${bundle.name}" with=""/>
-    
-    <getmoduleuntouched name="${bundle.name}" version="${bundle.version}" propSrcDest="bundle.srcdest" propSrcFilename="bundle.srcfilename"/>
-    <assertfile file="${bundle.srcdest}/scripts/python.bat"/>
-    
-    <!-- Temp copy -->
-    <copy todir="${bundle.srcdest}" overwrite="true">
-      <fileset dir="${bundle.path}" defaultexcludes="yes"/>
-    </copy>
-    
-    <!-- Upgrade PIP -->
-    <echo message="Upgrade PIP"/>
-    <exec executable="${bundle.srcdest}/bin/python.bat" dir="${bundle.srcdest}/bin" failonerror="true">
-      <arg value="-m"/>
-      <arg value="pip"/>
-      <arg value="install"/>
-      <arg value="--upgrade"/>
-      <arg value="pip"/>
-    </exec>
-    
-    <!-- Download PyQt4 -->
-    <echo message="Download PyQt4"/>
-    <property name="pyqt4.path" location="${bundle.srcdest}/pyqt4"/>
-    <property file="${pyqt4.path}/pyqt4.properties"/>
-    <mkdir dir="${pyqt4.path}"/>
-    <get dest="${pyqt4.path}" src="${pyqt4}" skipexisting="true"/>
-    
-    <!-- Install PyQt4 -->
-    <echo message="Install PyQt4"/>
-    <exec executable="${pyqt4.path}/install.bat" dir="${pyqt4.path}" failonerror="true"/>
-    <delete dir="${pyqt4.path}"/>
-    
-    <delete dir="${bundle.tmp.prep.path}/${bundle.folder}"/>
-    <mkdir dir="${bundle.tmp.prep.path}/${bundle.folder}"/>
-    <copy todir="${bundle.tmp.prep.path}/${bundle.folder}" overwrite="true">
-      <fileset dir="${bundle.srcdest}"/>
-    </copy>
-    <copy todir="${bundle.tmp.prep.path}/${bundle.folder}" overwrite="true">
-      <fileset dir="${bundle.path}" defaultexcludes="yes" excludes="
-        pyqt4/**"
-      />
-    </copy>
-  </target>
-  
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="module-python" basedir=".">
+
+  <dirname property="project.basedir" file="${ant.file.module-python}"/>
+  <property name="root.dir" location="${project.basedir}/.."/>
+  <property name="build.properties" value="${project.basedir}/build.properties"/>
+  <property file="${build.properties}"/>
+
+  <!-- Bearsampp dev -->
+  <property name="dev.path" location="${root.dir}/dev"/>
+  <fail unless="dev.path" message="Project 'dev' not found in ${dev.path}"/>
+  <echo message="Bearsampp dev found in ${dev.path}" level="debug"/>
+
+  <!-- Import build-commons.xml -->
+  <import file="${dev.path}/build/build-commons.xml"/>
+  <!-- Import build-bundle.xml -->
+  <import file="${dev.path}/build/build-bundle.xml"/>
+
+  <target name="release.build">
+    <basename property="bundle.folder" file="${bundle.path}"/>
+    <replaceproperty src="bundle.folder" dest="bundle.version" replace="${bundle.name}" with=""/>
+
+    <getmoduleuntouched name="${bundle.name}" version="${bundle.version}" propSrcDest="bundle.srcdest" propSrcFilename="bundle.srcfilename"/>
+    <assertfile file="${bundle.srcdest}/scripts/python.bat"/>
+
+    <!-- Temp copy -->
+    <copy todir="${bundle.srcdest}" overwrite="true">
+      <fileset dir="${bundle.path}" defaultexcludes="yes"/>
+    </copy>
+
+    <!-- Upgrade PIP -->
+    <echo message="Upgrade PIP"/>
+    <exec executable="${bundle.srcdest}/bin/python.bat" dir="${bundle.srcdest}/bin" failonerror="true">
+      <arg value="-m"/>
+      <arg value="pip"/>
+      <arg value="install"/>
+      <arg value="--upgrade"/>
+      <arg value="pip"/>
+    </exec>
+
+    <!-- Download PyQt4 -->
+    <echo message="Download PyQt4"/>
+    <property name="pyqt4.path" location="${bundle.srcdest}/pyqt4"/>
+    <property file="${pyqt4.path}/pyqt4.properties"/>
+    <mkdir dir="${pyqt4.path}"/>
+    <get dest="${pyqt4.path}" src="${pyqt4}" skipexisting="true"/>
+
+    <!-- Install PyQt4 -->
+    <echo message="Install PyQt4"/>
+    <exec executable="${pyqt4.path}/install.bat" dir="${pyqt4.path}" failonerror="true"/>
+    <delete dir="${pyqt4.path}"/>
+
+    <delete dir="${bundle.tmp.prep.path}/${bundle.folder}"/>
+    <mkdir dir="${bundle.tmp.prep.path}/${bundle.folder}"/>
+    <copy todir="${bundle.tmp.prep.path}/${bundle.folder}" overwrite="true">
+      <fileset dir="${bundle.srcdest}"/>
+    </copy>
+    <copy todir="${bundle.tmp.prep.path}/${bundle.folder}" overwrite="true">
+      <fileset dir="${bundle.path}" defaultexcludes="yes" excludes="
+        pyqt4/**"
+      />
+    </copy>
+  </target>
+
+</project>
diff --git a/releases.properties b/releases.properties
@@ -1,13 +1,13 @@
-2.7.12.3 = https://github.com/neard/module-python/releases/download/r1/neard-python-2.7.12.3-r1.7z
-2.7.12.4 = https://github.com/neard/module-python/releases/download/r3/neard-python-2.7.12.4-r3.7z
-2.7.13.0 = https://github.com/neard/module-python/releases/download/r3/neard-python-2.7.13.0-r3.7z
-3.4.4.4 = https://github.com/neard/module-python/releases/download/r1/neard-python-3.4.4.4-r1.7z
-3.4.4.5 = https://github.com/neard/module-python/releases/download/r3/neard-python-3.4.4.5-r3.7z
-3.4.4.6 = https://github.com/neard/module-python/releases/download/r3/neard-python-3.4.4.6-r3.7z
-3.5.2.2 = https://github.com/neard/module-python/releases/download/r1/neard-python-3.5.2.2-r1.7z
-3.5.2.3 = https://github.com/neard/module-python/releases/download/r3/neard-python-3.5.2.3-r3.7z
-3.5.3.0 = https://github.com/neard/module-python/releases/download/r3/neard-python-3.5.3.0-r3.7z
-3.6.0.0 = https://github.com/neard/module-python/releases/download/r3/neard-python-3.6.0.0-r3.7z
-3.6.0.1 = https://github.com/neard/module-python/releases/download/r3/neard-python-3.6.0.1-r3.7z
-3.6.6.2 = https://github.com/neard/module-python/releases/download/r4/neard-python-3.6.6.2-r4.7z
-3.7.0.2 = https://github.com/neard/module-python/releases/download/r4/neard-python-3.7.0.2-r4.7z
+2.7.12.3 = https://github.com/bearsampp/module-python/releases/download/r1/neard-python-2.7.12.3-r1.7z
+2.7.12.4 = https://github.com/bearsampp/module-python/releases/download/r3/neard-python-2.7.12.4-r3.7z
+2.7.13.0 = https://github.com/bearsampp/module-python/releases/download/r3/neard-python-2.7.13.0-r3.7z
+3.4.4.4 = https://github.com/bearsampp/module-python/releases/download/r1/neard-python-3.4.4.4-r1.7z
+3.4.4.5 = https://github.com/bearsampp/module-python/releases/download/r3/neard-python-3.4.4.5-r3.7z
+3.4.4.6 = https://github.com/bearsampp/module-python/releases/download/r3/neard-python-3.4.4.6-r3.7z
+3.5.2.2 = https://github.com/bearsampp/module-python/releases/download/r1/neard-python-3.5.2.2-r1.7z
+3.5.2.3 = https://github.com/bearsampp/module-python/releases/download/r3/neard-python-3.5.2.3-r3.7z
+3.5.3.0 = https://github.com/bearsampp/module-python/releases/download/r3/neard-python-3.5.3.0-r3.7z
+3.6.0.0 = https://github.com/bearsampp/module-python/releases/download/r3/neard-python-3.6.0.0-r3.7z
+3.6.0.1 = https://github.com/bearsampp/module-python/releases/download/r3/neard-python-3.6.0.1-r3.7z
+3.6.6.2 = https://github.com/bearsampp/module-python/releases/download/r4/neard-python-3.6.6.2-r4.7z
+3.7.0.2 = https://github.com/bearsampp/module-python/releases/download/r4/neard-python-3.7.0.2-r4.7z

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-pyqt4 = https://github.com/neard/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp27-none-win32.whl`
	`1`	`+pyqt4 = https://github.com/bearsampp/modules-untouched/releases/download/python-r1/PyQt4-4.11.4-cp27-none-win32.whl`