refactoring of ya2.build.build

[pmachines.git] / setup.py

diff --git a/setup.py b/setup.py
index 426a1ea5c5146b6a7037f97ef8a9732104d6165c..11c8fbed6a9aa8eef351f22a980ff71f7445d6f4 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ from setuptools import setup, Command
 from setuptools.command.develop import develop
 from multiprocessing import cpu_count
 from direct.dist.commands import bdist_apps
-from ya2.build.build import branch, files, ver, files, bld_dpath
+from ya2.build.build import _branch, files, _ver, files
 #from ya2.build.docs import bld_docs
 from ya2.build.models import ModelsBuilder
 from ya2.build.images import bld_images
@@ -126,10 +126,10 @@ class BDistAppsCmd(bdist_apps):
         system(cmd)
         bdist_apps.run(self)
         if not self.nolinux:
-            hbranch = {'master': 'alpha', 'rc': 'rc', 'stable': ''}[branch]
+            hbranch = {'master': 'alpha', 'rc': 'rc', 'stable': ''}[_branch()]
             AppImageBuilder(self).build(longname, hbranch,
                                         'https://www.ya2.it/downloads/')
-            fbranch = {'master': 'alpha', 'rc': 'rc', 'stable': 'stable'}[branch]
+            fbranch = {'master': 'alpha', 'rc': 'rc', 'stable': 'stable'}[_branch()]
             # bld = FlatpakBuilder(
             #     self,
             #     'it.ya2.Pmachines',