[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 850e8c42efa8efc7b87639459fa1ed5c97b3f7e4
X2Go dev team
git-admin at x2go.org
Sat Sep 14 15:54:34 CEST 2013
The branch, twofactorauth has been updated
via 850e8c42efa8efc7b87639459fa1ed5c97b3f7e4 (commit)
from b06df313b1a98fb79d3ac89d995f872214caa1c1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
setup.cfg => setup.cfg_disabled | 8 ++++----
setup.py | 25 ++++++++++++++++---------
2 files changed, 20 insertions(+), 13 deletions(-)
copy setup.cfg => setup.cfg_disabled (58%)
The diff of changes is:
diff --git a/setup.cfg b/setup.cfg_disabled
similarity index 58%
copy from setup.cfg
copy to setup.cfg_disabled
index d58552f..725e6d9 100644
--- a/setup.cfg
+++ b/setup.cfg_disabled
@@ -1,6 +1,6 @@
-[build]
-i18n = True
+#[build]
+#i18n = True
-[build_i18n]
-domain = pyhoca-gui
+#[build_i18n]
+#domain = pyhoca-gui
#desktop_files = [('share/applications', ['desktop/pyhoca-gui.desktop.in', ]), ]
diff --git a/setup.py b/setup.py
index 99a921d..c22a05e 100755
--- a/setup.py
+++ b/setup.py
@@ -22,13 +22,14 @@ import gevent.monkey
gevent.monkey.patch_all()
import platform
+from setuptools import setup, find_packages
+from distutils.core import setup
if platform.system() == 'Windows':
- import py2exe
+ import py2exe
+if platform.system() == 'Linux':
+ from DistUtilsExtra.command import *
from glob import glob
-from setuptools import setup, find_packages
-from distutils.core import setup
-from DistUtilsExtra.command import *
import os
# import the PyHoca-GUI
@@ -39,8 +40,9 @@ import pyhoca.wxgui
# with: ,,python setup.py py2exe -p greenlet''
#
-
+cmd_class = {}
data_files = []
+
if platform.system() == 'Windows':
try:
# building from trunk
@@ -71,6 +73,14 @@ if platform.system() == 'Windows':
img_files +
nxproxy_files
)
+if platform.system() == 'Linux':
+ cmd_class.update(
+ {
+ "build" : build_extra.build_extra,
+ "build_i18n" : build_i18n.build_i18n,
+ "clean": clean_i18n.clean_i18n,
+ }
+ )
setup(
@@ -83,10 +93,7 @@ setup(
packages = [ 'pyhoca.wxgui', ],
package_dir = {'': '.'},
install_requires = [ 'setuptools', ],
- cmdclass = { "build" : build_extra.build_extra,
- "build_i18n" : build_i18n.build_i18n,
- "clean": clean_i18n.clean_i18n,
- },
+ cmdclass = cmd_class,
windows = [
{
"script": "pyhoca-gui",
hooks/post-receive
--
pyhoca-gui.git (Python X2Go Client (wxPython GUI))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).
More information about the x2go-commits
mailing list