Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Setup fixes post 1.5 release (#902)

Browse Source 
* The main version must now always include the patch number
* Fix bug in pip build script
* Fix bug in debian sha256 function call
This commit is contained in:
Veronica Berglyd Olsen
2021-09-19 13:43:20 +02:00
committed by GitHub
parent 18cadf8db5
commit 1386be23f4
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/__init__.py
+1 -1
View File
@@ -61,7 +61,7 @@ __license__ = "GPLv3"
__author__ = "Veronica Berglyd Olsen" __author__ = "Veronica Berglyd Olsen"
__maintainer__ = "Veronica Berglyd Olsen" __maintainer__ = "Veronica Berglyd Olsen"
__email__ = "code@vkbo.net" __email__ = "code@vkbo.net"
__version__ = "1.5" __version__ = "1.5.0"
__hexversion__ = "0x010500f0" __hexversion__ = "0x010500f0"
__date__ = "2021-09-19" __date__ = "2021-09-19"
__status__ = "Stable" __status__ = "Stable"
setup.py
+2 -1
View File
@@ -636,7 +636,8 @@ def makeDebianPackage(signKey=None, sourceBuild=False, distName="unstable", buil
toUpload(f"{bldDir}/{bldPkg}.tar.xz") toUpload(f"{bldDir}/{bldPkg}.tar.xz")
else: else:
subprocess.call(["dpkg-buildpackage"] + signArgs, cwd=outDir) subprocess.call(["dpkg-buildpackage"] + signArgs, cwd=outDir)
toUpload(f"{bldDir}/{bldPkg}.tar.xz", f"{bldPkg}.debian.tar.xz") shutil.copyfile(f"{bldDir}/{bldPkg}.tar.xz", f"{bldDir}/{bldPkg}.debian.tar.xz")
toUpload(f"{bldDir}/{bldPkg}.debian.tar.xz")
toUpload(f"{bldDir}/{bldPkg}_all.deb") toUpload(f"{bldDir}/{bldPkg}_all.deb")
toUpload(makeCheckSum(f"{bldPkg}.debian.tar.xz", cwd=bldDir)) toUpload(makeCheckSum(f"{bldPkg}.debian.tar.xz", cwd=bldDir))
setup/make_pip.sh
+1
View File
@@ -10,6 +10,7 @@ echo ""
echo " Building Packages" echo " Building Packages"
echo "================================================================================" echo "================================================================================"
echo "" echo ""
python3 setup.py qtlrelease manual sample
python3 setup.py sdist bdist_wheel python3 setup.py sdist bdist_wheel
mkdir -pv dist_upload mkdir -pv dist_upload
cp -v dist/novelWriter-*.whl dist_upload/ cp -v dist/novelWriter-*.whl dist_upload/