浏览代码

Unify Python scripts.

Bentley James Oakes 7 年之前
父节点
当前提交
0e4de81e87
共有 3 个文件被更改,包括 15 次插入6 次删除
  1. 8 2
      packaging/package.sh
  2. 7 0
      packaging/windows_scripts/Python.bat
  3. 0 4
      packaging/windows_scripts/Python3.bat

+ 8 - 2
packaging/package.sh

@@ -38,7 +38,7 @@ chrome_url="https://newcontinuum.dl.sourceforge.net/project/portableapps/Google%
 
 
 manual_url="https://media.readthedocs.org/pdf/atompm/latest/atompm.pdf"
 manual_url="https://media.readthedocs.org/pdf/atompm/latest/atompm.pdf"
 
 
-version="v0.8.1-rc"
+version="v0.8.1-rc2"
 #$(curl --silent "https://api.github.com/repos/AToMPM/atompm/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")')
 #$(curl --silent "https://api.github.com/repos/AToMPM/atompm/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")')
 
 
 echo "Packaging version: $version"
 echo "Packaging version: $version"
@@ -227,4 +227,10 @@ add_batch_scripts
 add_manual
 add_manual
 
 
 rm atompm-portable.zip
 rm atompm-portable.zip
-zip -r atompm-portable.zip atompm-portable/
+
+if [ "$package_python3" = false ] ; then
+    zip -r atompm-portable-python2.zip atompm-portable/
+else
+    zip -r atompm-portable-python3.zip atompm-portable/
+fi
+

+ 7 - 0
packaging/windows_scripts/Python.bat

@@ -1,4 +1,11 @@
 @ECHO OFF
 @ECHO OFF
 TITLE AToMPM
 TITLE AToMPM
 CD ".\atompm"
 CD ".\atompm"
+
+IF EXIST "..\platform\WinPython" (
+"..\platform\WinPython\python-3.6.5\python.exe" mt\main.py
+) ELSE (
 "..\platform\PortablePython27\Python-Portable.exe" mt\main.py
 "..\platform\PortablePython27\Python-Portable.exe" mt\main.py
+)
+
+

+ 0 - 4
packaging/windows_scripts/Python3.bat

@@ -1,4 +0,0 @@
-@ECHO OFF
-TITLE AToMPM
-CD ".\atompm"
-"..\platform\WinPython\python-3.6.5\python.exe" mt\main.py