Merge pull request #3 from zrong/master

add pngquant to tbbl

Author: zrong

setup.py

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

tbbl/admin.py

@@ -55,7 +55,7 @@ def rebuildConf(self):
         slog.info('Regenerate "%s" done.'%confFile)
 
     def src(self):
-        srcDIR = conf.getClientPath('src')
+        srcDIR = self.conf.getClientPath('src')
 
         slog.info('Packaging lua framework to a tempfile')
         files = []
@@ -66,8 +66,7 @@ def src(self):
                     continue
                 files.append(path)
         pre = len(srcDIR)-3
-        self.upload218Sim(create_zip(files, pre), 'hhlplayer/src.zip')
-
+        self.upload218Sim(create_zip(files, pre), self.conf.lib_conf.src)
 
     def res(self):
         resDir = self.conf.getClientPath('res')
@@ -82,7 +81,7 @@ def res(self):
 
         # len('res') == 3, it will includ 'res' prefix in zip file
         pre = len(resDir)-3
-        self.upload218Sim(create_zip(files, pre), 'hhlplayer/res.zip')
+        self.upload218Sim(create_zip(files, pre), self.conf.lib_conf.res)
 
     def cocos(self):
         if not self.isAdmin():
@@ -140,7 +139,6 @@ def cpp(self):
         pre = len(runtimeDir)-len(dirname)
         self.upload218Lib(create_zip(files, pre), self.conf.lib_conf.cpp)
 
-
     def lua(self):
         if not self.isAdmin():
             return

tbbl/base.py

@@ -88,7 +88,7 @@ def getPHP(self):
         return self.getBin('quick/win32/php.exe') if self.is_windows else 'php'
 
     def getBin(self, path):
-        return resource_filename('yhqb', 'bin/'+path)
+        return resource_filename('tbbl', 'bin/'+path)
 
     def getJinjaTempl(self, name):
         return self.getTemplFile(name, 'templ.jinja.%s')

tbbl/bin/pngquant/mac/COPYRIGHT

@@ -0,0 +1,56 @@
+The quantization and dithering code in pngquant is lifted from Jef Poskanzer's
+'ppmquant', part of his wonderful PBMPLUS tool suite.
+
+Greg Roelofs hacked it into a (in his words) "slightly cheesy" 'pamquant' back
+in 1997 (see http://pobox.com/~newt/greg_rgba.html) and finally he ripped out
+the cheesy file-I/O parts and replaced them with nice PNG code in December
+2000. The PNG reading and writing code is a merged and slightly simplified
+version of readpng, readpng2, and writepng from his book "PNG: The Definitive
+Guide."
+In 2014 Greg has relicensed the code under the simplified BSD license.
+
+Note that both licenses are basically BSD-like; that is, use the code however
+you like, as long as you acknowledge its origins.
+
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+pngquant.c:
+
+   © 1989, 1991 by Jef Poskanzer.
+
+   Permission to use, copy, modify, and distribute this software and its
+   documentation for any purpose and without fee is hereby granted, provided
+   that the above copyright notice appear in all copies and that both that
+   copyright notice and this permission notice appear in supporting
+   documentation.  This software is provided "as is" without express or
+   implied warranty.
+
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+pngquant.c and rwpng.c/h:
+
+   © 1997-2002 by Greg Roelofs; based on an idea by Stefan Schneider.
+   © 2009-2014 by Kornel Lesiński.
+
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without modification,
+   are permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+   DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+   CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

tbbl/bin/pngquant/mac/README.md

@@ -0,0 +1,97 @@
+#pngquant 2
+
+This is the official `pngquant` and `libimagequant`.
+
+[pngquant](http://pngquant.org) converts 24/32-bit RGBA PNGs to 8-bit palette with *alpha channel preserved*.
+Such images are compatible with all modern browsers, and a special compatibility setting exists which helps transparency degrade well in Internet Explorer 6.
+
+Quantized files are often 40-70% smaller than their 24/32-bit version.
+
+This utility works on Linux, Mac OS X and Windows.
+
+##Usage
+
+- batch conversion of multiple files: `pngquant *.png`
+- Unix-style stdin/stdout chaining: `… | pngquant - | …`
+
+To further reduce file size, try [optipng](http://optipng.sourceforge.net) or [ImageOptim](http://imageoptim.pornel.net).
+
+##Improvements since 1.0
+
+Generated files are both smaller and look much better.
+
+* Significantly better quality of quantisation
+
+  - more accurate remapping of semitransparent colors
+  - special dithering algorithm that does not add noise in well-quantized areas of the image
+  - uses variance instead of popularity for box selection (improvement suggested in the original median cut paper)
+  - feedback loop that repeats median cut for poorly quantized colors
+  - additional colormap improvement using Voronoi iteration
+  - supports much larger number of colors in input images without degradation of quality
+  - gamma correction (output is always generated with gamma 2.2 for web compatibility)
+
+* More flexible commandline usage
+
+  - number of colors defaults to 256
+  - long options and standard switches like `--` and `-` are allowed
+
+* Refactored and modernised code
+
+  - C99 with no workarounds for old systems
+  - floating-point math used throughout
+  - Intel SSE optimisations
+  - multicore support via OpenMP
+  - quantization moved to standalone libimagequant
+
+##Options
+
+See `pngquant -h` for full list.
+
+###`--quality min-max`
+
+`min` and `max` are numbers in range 0 (worst) to 100 (perfect), similar to JPEG. pngquant will use the least amount of colors required to meet or exceed the `max` quality. If conversion results in quality below the `min` quality the image won't be saved (if outputting to stdin, 24-bit original will be output) and pngquant will exit with status code 99.
+
+    pngquant --quality=65-80 image.png
+
+###`--ext new.png`
+
+Set custom extension (suffix) for output filename. By default `-or8.png` or `-fs8.png` is used. If you use `--ext=.png --force` options pngquant will overwrite input files in place (use with caution).
+
+###`-o out.png` or `--output out.png`
+
+Writes converted file to the given path. When this option is used only single input file is allowed.
+
+###`--skip-if-larger`
+
+Don't write converted files if the conversion isn't worth it.
+
+###`--speed N`
+
+Speed/quality trade-off from 1 (brute-force) to 11 (fastest). The default is 3. Speed 10 has 5% lower quality, but is 8 times faster than the default. Speed 11 disables dithering and lowers compression level.
+
+###`--nofs`
+
+Disables Floyd-Steinberg dithering.
+
+###`--floyd=0.5`
+
+Controls level of dithering (0 = none, 1 = full).
+
+###`--posterize bits`
+
+Reduce precision of the palette by number of bits. Use when the image will be displayed on low-depth screens (e.g. 16-bit displays or compressed textures in ARGB444 format).
+
+###`--version`
+
+Print version information to stdout.
+
+###`-`
+
+Read image from stdin and send result to stdout.
+
+###`--`
+
+Stops processing of arguments. This allows use of file names that start with `-`. If you're using pngquant in a script, it's advisable to put this before file names:
+
+    pngquant $OPTIONS -- "$FILE"
+

tbbl/bin/pngquant/mac/pngquant

@@ -0,0 +1,11 @@
+@echo off
+
+set path=%~d0%~p0
+
+:start
+
+"%path%pngquant.exe" --force --verbose --quality=45-85 %1
+"%path%pngquant.exe" --force --verbose --ordered --speed=1 --quality=50-90 %1
+
+shift
+if NOT x%1==x goto start

tbbl/bin/pngquant/mac/pngquant-openmp

@@ -0,0 +1,11 @@
+@echo off
+
+set path=%~d0%~p0
+
+:start
+
+"%path%pngquant.exe" --iebug --force --verbose 256 %1
+"%path%pngquant.exe" --iebug --force --verbose --speed=1 --ordered 256 %1
+
+shift
+if NOT x%1==x goto start