diff options
| -rw-r--r-- | django/contrib/admin/bin/compress.py (renamed from django/contrib/admin/static/admin/js/compress.py) | 4 | ||||
| -rw-r--r-- | docs/internals/contributing/writing-code/submitting-patches.txt | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/django/contrib/admin/static/admin/js/compress.py b/django/contrib/admin/bin/compress.py index 8d2caa28ea..e15f2d3ef6 100644 --- a/django/contrib/admin/static/admin/js/compress.py +++ b/django/contrib/admin/bin/compress.py @@ -4,7 +4,7 @@ import optparse import subprocess import sys -here = os.path.dirname(__file__) +js_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'static', 'admin', 'js') def main(): usage = "usage: %prog [file1..fileN]" @@ -27,7 +27,7 @@ Compiler library and Java version 6 or later.""" if not args: if options.verbose: sys.stdout.write("No filenames given; defaulting to admin scripts\n") - args = [os.path.join(here, f) for f in [ + args = [os.path.join(js_path, f) for f in [ "actions.js", "collapse.js", "inlines.js", "prepopulate.js"]] for arg in args: diff --git a/docs/internals/contributing/writing-code/submitting-patches.txt b/docs/internals/contributing/writing-code/submitting-patches.txt index a90dc32605..ed8aad99b3 100644 --- a/docs/internals/contributing/writing-code/submitting-patches.txt +++ b/docs/internals/contributing/writing-code/submitting-patches.txt @@ -176,8 +176,10 @@ Compressing JavaScript ~~~~~~~~~~~~~~~~~~~~~~ To simplify the process of providing optimized javascript code, Django -includes a handy script which should be used to create a "minified" version. -This script is located at ``django/contrib/admin/static/admin/js/compress.py``. +includes a handy python script which should be used to create a "minified" +version. To run it:: + + python django/contrib/admin/bin/compress.py Behind the scenes, ``compress.py`` is a front-end for Google's `Closure Compiler`_ which is written in Java. However, the Closure Compiler |