Skip to content

Commit

Permalink
making the gae_css.dir property more generic so it can be use to pres…
Browse files Browse the repository at this point in the history
…erve prefixes for any build type.
  • Loading branch information
darktable committed Aug 5, 2011
1 parent cde1dc4 commit 67d427c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
8 changes: 4 additions & 4 deletions build/build.xml
Expand Up @@ -506,9 +506,9 @@

<checksum file="${dir.intermediate}/${dir.js}/scripts-concat.min.js" algorithm="sha" property="scripts.sha" />
<if>
<isset property="gae.js_dir" />
<isset property="js.prefix" />
<then>
<property name="scripts.js" value="${gae.js_dir}/${scripts.sha}.js" />
<property name="scripts.js" value="${js.prefix}/${scripts.sha}.js" />
</then>
<else>
<property name="scripts.js" value="${dir.js}/${scripts.sha}.js" />
Expand Down Expand Up @@ -821,9 +821,9 @@

<checksum file="${dir.intermediate}/${dir.css}/style-concat.min.css" algorithm="sha" property="css.sha" />
<if>
<isset property="gae.css_dir" />
<isset property="css.prefix" />
<then>
<property name="style.css" value="${gae.css_dir}/${css.sha}.css" />
<property name="style.css" value="${css.prefix}/${css.sha}.css" />
</then>
<else>
<property name="style.css" value="${dir.css}/${css.sha}.css" />
Expand Down
12 changes: 8 additions & 4 deletions build/config/project.properties
Expand Up @@ -70,12 +70,16 @@ env =
# dir.css
# dir.images

# Google App Engine Directory Structure
# Optional: Maintain custom prefix on concatenated files.
#
# Prevent "static/" being included in concated file paths.
# PHP:
# css.prefix = <?php echo base_url(); ?>css
# js.prefix = <?php echo base_url(); ?>js
#
# gae.css_dir = /css
# gae.js_dir = /js
# App Engine:
# css.prefix = /css
# js.prefix = /js


# Override default JSHint Options (see http://jshint.com/ for description of options)
#tool.jshint.opts =
Expand Down

0 comments on commit 67d427c

Please sign in to comment.