Merge pull request #4 from zrong/master

add some new function.

Author: zrong

setup.py

@@ -33,7 +33,7 @@
 
 setup(
     name="tbbl",
-    version="0.0.7",
+    version="0.1.3",
     url='http://zengrong.net/',
     author='zrong',
     author_email='[email protected]',

tbbl/__init__.py

@@ -1,43 +1,4 @@
-import os
-import sys
-import logging
-import importlib
-from zrong import slog, add_log_handler
-from tbbl import base, config
-
 __all__ = ['base', 'admin', 'init', 'update', 'config', 'templ', 'res', 'server']
 
-def TEAM1201Error(Exception):
+class TEAM1201Error(Exception):
     pass
-
-def _build(name, conf, args, parser):
-    pack = importlib.import_module("yhqb."+name)
-    pack.build(conf, args, parser)
-
-
-def main():
-    add_log_handler(slog, 
-            handler=logging.StreamHandler(sys.stdout),
-            debug=logging.DEBUG)
-    gconf = base.Conf()
-    workDir = os.path.abspath(os.path.join(''))
-    confFile = os.path.join(workDir, "yhqb_conf.py")
-    if not os.path.exists(confFile):
-        confFile = os.path.join(os.path.expanduser('~'), 'yhqb_conf.py')
-
-    slog.info('\nconffile:%s\n', confFile)
-    if os.path.exists(confFile):
-        oldconf = base.Conf()
-        oldconf.readFromFile(confFile)
-        gconf.updateConf(oldconf)
-    else:
-        gconf.init(workDir, confFile)
-    if not config.checkConf(gconf):
-        exit(1)
-    if not config.checkEnv(gconf):
-        exit(1)
-
-    gargs, subParser = config.checkArgs(gconf)
-    if gargs:
-        _build(gargs.sub_name, gconf, gargs, subParser)
-

tbbl/admin.py

@@ -8,8 +8,8 @@
 import os
 import subprocess
 from zrong import (slog)
-from zrong.base import (create_zip, DictBase)
-from zrong.ftp import (get_ftp, check_ftp_conf, upload_file, upload_dir)
+from zrong.base import (list_dir, create_zip, DictBase)
+from zrong.ftp import ( upload_file, upload_dir)
 
 class AdminBase(object):
 
@@ -26,22 +26,22 @@ def newConf():
         return None
 
     def upload218Tool(self, filePath, remotePath, removeFile):
-        ftpConf = DictBase(self.conf.ftp18_conf)
+        ftpConf = self.conf.getFtpConf(self.args.ftp)
         ftpConf.start_path = ftpConf.tool_dir
         return upload_file(filePath, remotePath, ftpConf, removeFile)
 
     def upload218Doc(self, dirName, uploadDir):
-        ftpConf = DictBase(self.conf.ftp18_conf)
+        ftpConf = self.conf.getFtpConf(self.args.ftp)
         ftpConf.start_path = ftpConf.doc_dir
         upload_dir(dirName, uploadDir, ftpConf)
 
     def upload218Lib(self, filePath, remotePath):
-        ftpConf = DictBase(self.conf.ftp18_conf)
+        ftpConf = self.conf.getFtpConf(self.args.ftp)
         ftpConf.start_path = ftpConf.lib_dir
         return upload_file(filePath, remotePath, ftpConf, True)
 
     def upload218Sim(self, filePath, remotePath, delFile=True):
-        ftpConf = DictBase(self.conf.ftp18_conf)
+        ftpConf = self.conf.getFtpConf(self.args.ftp)
         ftpConf.start_path = ftpConf.sim_dir
         return upload_file(filePath, remotePath, ftpConf, delFile)
 
@@ -162,6 +162,44 @@ def lua(self):
         pre = len(srcDIR)+1
         self.upload218Lib(create_zip(files, pre), self.conf.lib_conf.lua)
 
+    def toluaauto(self, bindType):
+        if not self.isAdmin():
+            return
+        inifile = None
+        cwd = self.conf.getDistPath('tolua', 'auto')
+        for f in list_dir(cwd):
+            if f.endswith('.ini') \
+            and f.startswith('cocos2dx_') \
+            and bindType in f.lower():
+                inifile = f
+        if inifile:
+            xarg = [self.conf.getExe('python2'), 'genbindings.py', inifile]
+            slog.warning('toluaauto args: %s', xarg)
+            slog.warning('toluaauto target path: %s', cwd)
+            py = subprocess.Popen(xarg, cwd=cwd)
+            py.wait()
+        else:
+            slog.error('Cannot find a file named %s!'%bindType)
+
+    def toluamanual(self, bindType):
+        if not self.isAdmin():
+            return
+        toluafile = None
+        cwd = self.conf.getDistPath('tolua', 'manual')
+        for f in list_dir(cwd):
+            if f.endswith('.tolua') \
+            and bindType in f.lower():
+                toluafile = f
+        if toluafile:
+            bindName = os.path.join(self.conf.getDistPath('tolua', 'manual'), toluafile)
+            php = self.conf.getBin('quick/lib/compile_luabinding.php')
+            xarg = [self.conf.getPHP(), php, '-pfx', 'cc', '-d', 
+                    self.conf.getDistPath('runtime-src', 'Classes',
+                        'lua-bindings', 'manual'), bindName]
+            subprocess.call(xarg)
+        else:
+            slog.error('Cannot find a file named %s!'%bindType)
+
     def build(self):
         # After update self or rebuild conf, dismiss all others action.
         if self.args.reconf:
@@ -184,6 +222,12 @@ def build(self):
         if self.args.src:
             self.src()
             noAnyArgs = False
+        if self.args.toluamanual:
+            self.toluamanual(self.args.toluamanual)
+            noAnyArgs = False
+        if self.args.toluaauto:
+            self.toluaauto(self.args.toluaauto)
+            noAnyArgs = False
 
         return noAnyArgs
 

tbbl/base.py

@@ -6,6 +6,7 @@
 from jinja2 import Template
 from zrong import slog
 from zrong.base import (DictBase,write_by_templ,read_file,write_file)
+from tbbl import TEAM1201Error
 
 class ConfBase(DictBase):
 
@@ -112,6 +113,17 @@ def getTemplSub(self, subName, keyName):
         subStr = read_file(subFile)
         return eval(subStr)[keyName]
 
+    def getFtpConf(self, ftpname):
+        curFtp = ftpname if ftpname else self.ftp_conf.cur_ftp
+        if not curFtp:
+            raise TEAM1201Error('Cannnot get a ftp config name! '
+                                'Please check --ftp arg or '
+                                'set cur_ftp in section ftp_conf of config file.')
+        ftpConf = self.ftp_conf[curFtp]
+        if not ftpConf:
+            raise TEAM1201Error('Cannnot get a ftp config object named %s!'%curFtp)
+        return DictBase(ftpConf)
+
 def absPath(*path):
     return os.path.abspath(os.path.join(*path))
 

tbbl/config.py

@@ -56,6 +56,11 @@ def addCommonArgs(self, parser, *types):
                 parser.add_argument('--vendor', type=str, 
                         default='team1201', choices=['team1201'],
                     help='指定运营商。默认使用 team1201 。')
+            elif typ == 'ftp':
+                parser.add_argument('--ftp', type=str, 
+                        choices=['18', '1201'],
+                    help='指定使用哪个 ftp 服务器。1201 是外网服务器。18 是内网服务器。'
+                        '若不提供此参数，则会使用配置文件中 ftp_conf.cur_ftp 的值。')
 
     def addGitArgs(self, parser, git_conf, init):
         gitreponames = sorted(git_conf.keys())
@@ -68,19 +73,20 @@ def addGitArgs(self, parser, git_conf, init):
     def addAdmin(self, conf):
         parserAdmin = self.subParsers.add_parser('admin', 
             help='管理员专用。一般为 zrong 使用。')
+        self.addCommonArgs(parserAdmin, 'ftp')
         parserAdmin.add_argument('--src', action='store_true', 
-            help='打包 src 文件夹并上传到18 。当然包含 --lua 参数中的所有内容。')
+            help='打包 src 文件夹并上传到 ftp 服务器 。当然包含 --lua 参数中的所有内容。')
         parserAdmin.add_argument('--res', action='store_true', 
-            help='打包 res 文件夹并上传到18。')
+            help='打包 res 文件夹并上传到 ftp 服务器。')
         parserAdmin.add_argument('--reconf', action='store_true', 
             help='重建 yhqb_conf.py.')
         parserAdmin.add_argument('--cocos', action='store_true', 
-            help='（zrong 专用）打包 cocos2d-x 源码，并上传到18。')
+            help='（zrong 专用）打包 cocos2d-x 源码，并上传到 ftp 服务器。')
         parserAdmin.add_argument('--lua', action='store_true', 
             help='（zrong 专用）打包 lua 框架（包含src目录下的'
-            'quick、cocos、zrong 三个文件夹）并上传到18。')
+            'quick、cocos、zrong 三个文件夹）并上传到 ftp 服务器。')
         parserAdmin.add_argument('--cpp', action='store_true', 
-            help='（zrong 专用）打包 frameworks/runtime-src 文件夹并上传到18。')
+            help='（zrong 专用）打包 frameworks/runtime-src 文件夹并上传到 ftp 服务器。')
         parserAdmin.add_argument('--toluaauto', type=str,
             choices = ['filter', 'dragonbones', 'webview'],
             help='（zrong 专用）创建 lua 自动绑定文件。')
@@ -105,6 +111,7 @@ def addUpdate(self, conf):
             help='在 git 仓库中执行 "git reset --hard" 并推送(pull)。')
         parserUpdate.add_argument('-a', '--all', action='store_true', 
             help='采用默认设置更新所有。')
+        self.addCommonArgs(parserUpdate, 'ftp')
         parserUpdate.add_argument('--cocos', action='store_true', 
             help='更新 cocos2d-x 框架。目标路径 client/frameworks/cocos2d-x 。')
         parserUpdate.add_argument('--lua', action='store_true', 
@@ -148,8 +155,13 @@ def addRes(self, conf):
             help='使用默认设置处理所有资源。')
         parserRes.add_argument('--plst', type=str, nargs='*',
             help='处理碎图图像文件。'
-            '将 plst 文件夹中的碎图转换成 SpriteSheet 格式。'
+            '将 plst 文件夹中的碎图转换成 sprite sheet 格式。'
             '目标文件夹为 client/res/plst 。若不提供具体的文件，则处理所有文件。')
+        parserRes.add_argument('--disable-rotation', action='store_true',
+            help='仅当处理 --plst 时有效。'
+            '在调用 Texture Packer 转换 sprite sheet 的时候禁用图片旋转。'
+            '由于滤镜系统的 bug，滤镜在处理旋转的 sprite sheet 时无法显示图片。'
+            '使用这种方式可以避免这个 bug。')
         parserRes.add_argument('--pdir', type=str, nargs='*',
             help='处理 pdir 中的独立图像资源。'
             '目标文件夹为 client/res/pdir 。'
@@ -172,14 +184,22 @@ def addRes(self, conf):
             '复制已存在的 sprite sheet，'
             '复制已存在的 ani_def_*.lua 动画定义文件。'
             '目标文件夹为 client/res/ani 。若不提供具体的文件，则处理所有文件。')
+        parserRes.add_argument('--gen-def', action='store_true',
+            help='仅当 --ani 提供了具体值时有效。'
+            '自动生成指定的 ani 动画文件的 ani_def_*.lua 。')
+        parserRes.add_argument('--tp-options', type=str, default='',
+            help='仅当处理 --plst 和 --ani 时有效。'
+            '在调用 TexturePacker 转换 sprite sheet 的时候传递指定的参数。'
+            '详细参数说明请参考 TexturePacker 的命令行帮助。'
+            '传递的参数必须使用 \\ 来转义，第一个参数之前必须加一个转义符和空格，'
+            '否则会被命令行认为是一个正常的参数而非当前参数的值。'
+            '例如，要传递 --verbose --format cocos2d 这2个参数，则这样使用：'
+            '--tp-options \\ --verbose\\ --format\\ cocos2d')
         parserRes.add_argument('--oth', type=str, nargs='*',
             help='处理其它资源。目标文件夹为 client/res/oth 。'
             '若不提供具体的文件，则处理所有文件。')
         parserRes.add_argument('--test', action='store_true',
             help='处理测试用的资源资源。目标文件夹为 client/res/test 。')
-        parserRes.add_argument('--gen-def', action='store_true',
-            help='仅当 --ani 提供了具体值时有效。'
-            '自动生成指定的 ani 动画文件的 ani_def_*.lua 。')
         parserRes.add_argument('--gettext', type=str,
             choices=['mo','po'],
             help='转换语言文件。'

tbbl/conv/__init__.py

@@ -1 +1 @@
-__all__ = ['md2lua']
+__all__ = ['md2lua', 'tp']

tbbl/conv/md2lua.py

@@ -8,15 +8,15 @@
 #        Email: [email protected]
 #     HomePage: http://weibo.com/5d13
 #      Version: 0.1.1
-#   LastChange: 2014-11-25 zrong
+#   LastChange: 2015-05-06 zrong
 #      History:
 #=============================================================================
 '''
 
 import sys
 import os
-from zrong.base import (write_file, read_file, 
-        slog, list_dir)
+from zrong import (slog)
+from zrong.base import (write_file, read_file, list_dir)
 
 lineno = 0
 verNum = 0
@@ -92,7 +92,7 @@ def proc(fullname):
                     flag = 1
                     slog.info('code: %s, title: %s', p.code, p.title)
                 except:
-                    slog.info("%s has err!!!%s" ,lineno,line)
+                    slog.error("%s has err!!!%s" ,lineno,line)
                     return
             continue
         elif flag == 1:

tbbl/conv/tp.py

@@ -0,0 +1,50 @@
+########################################
+# tp.py
+#
+# Convert images to sprite sheet by TexturePacker
+# Author: zrong
+# Creation: 2015-05-06
+########################################
+
+import os
+import shutil
+import subprocess
+from zrong import slog
+
+def _get_args_list(options):
+    return options.strip().split(' ')
+
+def convert_to_cocos2d(tpexe, source, output, dirname, disable_rotation=False, options=None):
+    plist_file = os.path.join(output, dirname+".plist")
+    png_file = os.path.join(output, dirname+".png")
+    imagefolder = os.path.join(source, dirname)
+    xargs = ["--sheet", png_file, "--data", plist_file]
+    if options:
+        xargs = xargs + _get_args_list(options)
+    if disable_rotation:
+        xargs.append('--disable-rotation')
+    succ = convert_by_options(tpexe, xargs, imagefolder)
+    if succ:
+        slog.info("\n.... converting %s", dirname)
+
+def convert_by_options(tpexe, options, imagefolder):
+    """
+    options must be a list or a string
+    """
+    xargs = [tpexe]
+    argslist = None
+    if isinstance(options, list):
+        argslist = options
+    elif isinstance(options, str):
+        argslist = _get_args_list(options)
+    if not argslist:
+        slog.error("Please give some options.")
+        return False
+    for value in argslist:
+        xargs.append(value)
+    xargs.append(imagefolder)
+    tpout = subprocess.check_output(xargs, universal_newlines=True)
+    slog.info("Call TexturePacker, command line is: \n")
+    slog.warning("%s\n", " ".join(xargs))
+    slog.info("%s\n", tpout)
+    return True

tbbl/res.py

@@ -15,6 +15,7 @@
 import zrong.lua as lua
 from zrong.gettext import Gettext
 from tbbl.base import (write_by_jinja, print_sep)
+from tbbl.conv import tp
 
 class AniDef(object):
     def __init__(self, conf, aniDir, aniArg, gendef):
@@ -246,17 +247,10 @@ def _commonProcess(self, dirList, souName, outName=None):
         print_sep('Process %s in directory [%s] has done.'
                 %(dirList, souName), False, 40)
 
-    def _convertSS(self, sourceDir, outputDir, dirName):
-        plist_file = os.path.join(outputDir, dirName+".plist")
-        png_file = os.path.join(outputDir, dirName+".png")
-        slog.info("\n.... converting %s", dirName)
-        tpOut = subprocess.check_output([ 
-            self.conf.getExe("tp"),
-            "--sheet", png_file,
-            "--data", plist_file,
-            os.path.join(sourceDir, dirName)
-            ], universal_newlines=True)
-        slog.info("%s\n", tpOut)
+    def _convertSS(self, sourceDir, outputDir, dirName, disrot=False):
+        # print("_convertSS", self.args.tp_options)
+        tp.convert_to_cocos2d(self.conf.getExe("tp"), sourceDir, outputDir, 
+                dirName, disrot, self.args.tp_options)
 
     def plst(self, plist):
         print_sep('Start to process %s in directory plst.'
@@ -277,7 +271,7 @@ def plst(self, plist):
             sourceDir = tmpDir
         print_sep('Start to convert spritesheet.')
         for dir_name in plist:
-            self._convertSS(sourceDir, outputDir, dir_name)
+            self._convertSS(sourceDir, outputDir, dir_name, self.args.disable_rotation)
         print_sep('Spritsheet converting has done.', False)
         if tmpDir:
             slog.info('Remove temporary directory [%s].'%tmpDir)