Fix version number for mac build
This commit is contained in:
@@ -4,7 +4,6 @@
|
||||
Running from Source
|
||||
*******************
|
||||
|
||||
.. _main website: https://novelwriter.io
|
||||
.. _GitHub: https://github.com/vkbo/novelWriter/releases
|
||||
.. _PyPi: https://pypi.org/project/novelWriter/
|
||||
.. _Sphinx Docs: https://www.sphinx-doc.org/
|
||||
@@ -25,11 +24,6 @@ by running:
|
||||
|
||||
python pkgutils.py help
|
||||
|
||||
.. warning::
|
||||
|
||||
Calling ``setup.py install`` has been deprecated for a while, and this approach is no longer
|
||||
actively supported in novelWriter either.
|
||||
|
||||
|
||||
.. _a_source_depend:
|
||||
|
||||
@@ -92,7 +86,7 @@ With the tool installed, run the following command from the root of the novelWri
|
||||
|
||||
This should generate two files in the ``dist/`` folder at your current location. One with file
|
||||
extension ``.tar.gz`` and one with extension ``.whl``. The latter is the package you want to
|
||||
install, here with example version number 2.0.7, but your may be different:
|
||||
install, here with example version number 2.0.7, but yours may be different:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
|
||||
+6
-2
@@ -1857,7 +1857,7 @@ if __name__ == "__main__":
|
||||
"",
|
||||
" help Print the help message.",
|
||||
" pip Install all package dependencies for novelWriter using pip.",
|
||||
" version Print the novelWriter version.",
|
||||
" version Print the novelWriter version. Add -c for short version.",
|
||||
" build-clean Will attempt to delete 'build' and 'dist' folders.",
|
||||
"",
|
||||
"Additional Builds:",
|
||||
@@ -1914,7 +1914,11 @@ if __name__ == "__main__":
|
||||
if "version" in sys.argv:
|
||||
sys.argv.remove("version")
|
||||
numVers, _, _ = extractVersion(beQuiet=True)
|
||||
print(numVers, end=None)
|
||||
if "-c" in sys.argv:
|
||||
sys.argv.remove("-c")
|
||||
print(compactVersion(numVers), end=None)
|
||||
else:
|
||||
print(numVers, end=None)
|
||||
sys.exit(0)
|
||||
|
||||
if "pip" in sys.argv:
|
||||
|
||||
@@ -24,7 +24,7 @@ echo "Build Dir: $BUILD_DIR"
|
||||
|
||||
pushd "$SRC_DIR" || exit 1
|
||||
|
||||
VERSION="$(python3 pkgutils.py version)"
|
||||
VERSION="$(python3 pkgutils.py version -c)"
|
||||
echo "novelWriter Version: $VERSION"
|
||||
|
||||
# --- Prepare Files ----------------------------------------------------------------------------- #
|
||||
|
||||
Reference in New Issue
Block a user