← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to Makefile

Allow *.*.js in launchpad.js, and clean up Makefile a little bit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
25
25
JS_BUILD := min
26
26
endif
27
27
 
28
 
JS_SOURCE_PATHS = -path './lib/lp/*/javascript/*' ! -path '*/tests/*' \
29
 
    ! -path '*/testing/*' ! -path './lib/lp/services/*'
 
28
define JS_LP_PATHS
 
29
lib -path 'lib/lp/*/javascript/*' \
 
30
! -path '*/tests/*' ! -path '*/testing/*' \
 
31
! -path 'lib/lp/services/*'
 
32
endef
 
33
 
30
34
JS_YUI := $(shell utilities/yui-deps.py $(JS_BUILD:raw=))
31
35
JS_OTHER := $(wildcard lib/canonical/launchpad/javascript/*/*.js)
32
 
JS_LP := $(shell find $(JS_SOURCE_PATHS) -name '*.js' ! -name '.*.js' )
 
36
JS_LP := $(shell find $(JS_LP_PATHS) -name '*.js')
33
37
JS_ALL := $(JS_YUI) $(JS_OTHER) $(JS_LP)
34
38
JS_OUT := $(LP_BUILT_JS_ROOT)/launchpad.js
35
39
 
180
184
 
181
185
jsbuild_widget_css: bin/jsbuild
182
186
        ${SHHH} bin/jsbuild \
183
 
            --srcdir lib/lp/app/javascript \
 
187
            --srcdir lib/lp/app/javascript \
184
188
            --builddir $(LP_BUILT_JS_ROOT)
185
189
 
186
190
$(JS_LP): jsbuild_widget_css
441
445
copy-apache-config:
442
446
        # We insert the absolute path to the branch-rewrite script
443
447
        # into the Apache config as we copy the file into position.
444
 
        sed -e 's,%BRANCH_REWRITE%,$(shell pwd)/scripts/branch-rewrite.py,' configs/development/local-launchpad-apache > /etc/apache2/sites-available/local-launchpad
 
448
        sed -e 's,%BRANCH_REWRITE%,$(shell pwd)/scripts/branch-rewrite.py,' \
 
449
                configs/development/local-launchpad-apache > \
 
450
                /etc/apache2/sites-available/local-launchpad
445
451
        cp configs/development/local-vostok-apache \
446
452
                /etc/apache2/sites-available/local-vostok
447
453
        touch /var/tmp/bazaar.launchpad.dev/rewrite.log