[build] Remove more version things

IceflowRE · Nov 7, 2017 · 8ab600e · 8ab600e
1 parent 65698d2
commit 8ab600e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/installer/hybrid/packages/mp3monitoring/meta/installscript.js b/installer/hybrid/packages/mp3monitoring/meta/installscript.js
@@ -1,5 +1,5 @@
 var tmpDir = "@RootDir@/tmp/mp3monitoring/";
-var wheelName = "MP3_Monitoring-1.0.3-py36-none-any.whl";
+var wheelName = "MP3_Monitoring.whl";
 
 function Component() {
 

diff --git a/scripts/create_installer.sh b/scripts/create_installer.sh
@@ -13,7 +13,7 @@ cur_folder="./installer/hybrid/packages/mp3monitoring/data/"
 rm -rf ${cur_folder}
 mkdir -p ${cur_folder}
 cp ./README.md ${cur_folder}/README.md
-cp ./dist/MP3_Monitoring-"$app_version"-"$py_version"-none-any.whl ${cur_folder}/MP3_Monitoring-"$app_version"-"$py_version"-none-any.whl
+cp ./dist/MP3_Monitoring-"$app_version"-"$py_version"-none-any.whl ${cur_folder}/MP3_Monitoring.whl
 
 cur_folder="./installer/hybrid/packages/mp3monitoring.gui/data/"
 rm -rf ${cur_folder}

diff --git a/scripts/new_release.sh b/scripts/new_release.sh
@@ -8,10 +8,11 @@ rls_date=`date +%Y-%m-%d`
 echo -e "$app_version""\c" > ./version
 
 # change versions in installer
-sed -i 's/<Version>[a-zA-Z0-9]\+\.[a-zA-Z0-9]\+\.[a-zA-Z0-9]\+<\/Version>/<Version>'"$app_version"'<\/Version>/' ./installer/hybrid/config/config.xml
-sed -i 's/<Version>[a-zA-Z0-9]\+\.[a-zA-Z0-9]\+\.[a-zA-Z0-9]\+<\/Version>/<Version>'"$app_version"'<\/Version>/' ./installer/hybrid/packages/mp3monitoring/meta/package.xml
-sed -i 's/<Version>[a-zA-Z0-9]\+\.[a-zA-Z0-9]\+\.[a-zA-Z0-9]\+<\/Version>/<Version>'"$app_version"'<\/Version>/' ./installer/hybrid/packages/mp3monitoring.gui/meta/package.xml
-sed -i 's/<Version>[a-zA-Z0-9]\+\.[a-zA-Z0-9]\+\.[a-zA-Z0-9]\+<\/Version>/<Version>'"$app_version"'<\/Version>/' ./installer/hybrid/packages/mp3monitoring.updater/meta/package.xml
+version_regex="[a-zA-Z0-9]\+\.[a-zA-Z0-9]\+\.[a-zA-Z0-9]\+"
+sed -i 's/<Version>'"$version_regex"'<\/Version>/<Version>'"$app_version"'<\/Version>/' ./installer/hybrid/config/config.xml
+sed -i 's/<Version>'"$version_regex"'<\/Version>/<Version>'"$app_version"'<\/Version>/' ./installer/hybrid/packages/mp3monitoring/meta/package.xml
+sed -i 's/<Version>'"$version_regex"'<\/Version>/<Version>'"$app_version"'<\/Version>/' ./installer/hybrid/packages/mp3monitoring.gui/meta/package.xml
+sed -i 's/<Version>'"$version_regex"'<\/Version>/<Version>'"$app_version"'<\/Version>/' ./installer/hybrid/packages/mp3monitoring.updater/meta/package.xml
 
 # change release date
 sed -i 's/<ReleaseDate>[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}<\/ReleaseDate>/<ReleaseDate>'"$rls_date"'<\/ReleaseDate>/' ./installer/hybrid/packages/mp3monitoring/meta/package.xml

diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
     codecs.register(func)
 
 _OPTIONAL = {
-    'with_gui': ['PyQt5 >= 5.9'],
+    'with_gui': ['PyQt5 >= 5.9.1'],
     'with_updater': ['urllib3'],
 }
 with_everything = [package for optional_list in _OPTIONAL.values() for package in optional_list]