Merge lp:~stevenk/launchpad/silence-yui-build into lp:launchpad

[Steve Kowalik]

Stop building launchpad.js and silence YUI copying warnings. Good riddance.

Destroy launchpad.js, and the feature flag used for enabling combo loading. This also means we stop building YUI 3.3.0, and I have taken this opportunity to shift all of combo-rootdir's responsibilities into the Makefile itself. This also neatly silences the YUI copying warnings during a build in a already built tree.

Correct the yui_version feature flag in the flag documentation as a drive-by.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'Makefile'
--- Makefile	2013-01-03 17:17:29 +0000
+++ Makefile	2013-04-08 04:51:20 +0000
@@ -22,26 +22,13 @@
 ICING=lib/canonical/launchpad/icing
 LP_BUILT_JS_ROOT=${ICING}/build
 
-ifeq ($(LPCONFIG), development)
-JS_BUILD := raw
-else
-JS_BUILD := min
-endif
-
-define JS_LP_PATHS
-lib -path 'lib/lp/*/javascript/*' \
-! -path '*/tests/*' ! -path '*/testing/*' \
-! -path 'lib/lp/services/*'
-endef
-
 JS_BUILD_DIR := build/js
-YUI_VERSIONS := 3.3.0 3.5.1
+YUI_VERSIONS := 3.5.1
 YUI_BUILDS := $(patsubst %,$(JS_BUILD_DIR)/yui-%, $(YUI_VERSIONS))
-YUI_DEFAULT := $(JS_BUILD_DIR)/yui-3.5.1
-JS_YUI := $(shell utilities/yui-deps.py $(JS_BUILD:raw=))
-JS_LP := $(shell find -L $(JS_LP_PATHS) -name '*.js' ! -name '.*.js')
-JS_ALL := $(JS_YUI) $(JS_LP)
-JS_OUT := $(LP_BUILT_JS_ROOT)/launchpad.js
+YUI2_BUILD:= $(JS_BUILD_DIR)/yui2
+YUI_DEFAULT := yui-3.5.1
+YUI_DEFAULT_SYMLINK := $(JS_BUILD_DIR)/yui
+LP_JS_BUILD := $(JS_BUILD_DIR)/lp
 
 MINS_TO_SHUTDOWN=15
 
@@ -159,9 +146,10 @@
 	@exit 1
 endif
 
-css_combine:
+css_combine: jsbuild_widget_css
 	${SHHH} bin/sprite-util create-image
 	${SHHH} bin/sprite-util create-css
+	ln -sfn ../../../../build/js/$(YUI_DEFAULT) $(ICING)/yui
 	${SHHH} bin/combine-css
 
 jsbuild_widget_css: bin/jsbuild
@@ -175,37 +163,34 @@
 $(JS_BUILD_DIR):
 	mkdir -p $@
 
-$(YUI_BUILDS): $(JS_BUILD_DIR)
-	for V in $(YUI_VERSIONS); do \
-		mkdir $(JS_BUILD_DIR)/yui-$$V $(JS_BUILD_DIR)/yui-$$V-tmp; \
-		unzip -q download-cache/dist/yui_$$V.zip -d $(JS_BUILD_DIR)/yui-$$V-tmp; \
-		mv $(JS_BUILD_DIR)/yui-$$V-tmp/yui/build/* $(JS_BUILD_DIR)/yui-$$V/; \
-		rm -rf $(JS_BUILD_DIR)/yui-$$V-tmp; \
+$(YUI_BUILDS): | $(JS_BUILD_DIR)
+	mkdir -p $@/tmp
+	unzip -q download-cache/dist/yui_$(subst build/js/yui-,,$@).zip -d $@/tmp 'yui/build/*'
+	mv $@/tmp/yui/build/* $@
+	$(RM) -r $@/tmp
+
+$(YUI_DEFAULT_SYMLINK): $(YUI_BUILDS)
+	ln -sfn $(YUI_DEFAULT) $@
+
+$(LP_JS_BUILD): | $(JS_BUILD_DIR)
+	mkdir $@
+	for jsdir in lib/lp/*/javascript; do \
+		app=$$(echo $$jsdir | sed -e 's,lib/lp/\(.*\)/javascript,\1,'); \
+		cp -a $$jsdir $@/$$app; \
 	done
-
-$(JS_LP): jsbuild_widget_css
-
-build/js/yui2/%: lib/canonical/launchpad/icing/yui_2.7.0b/build/%
-	mkdir -p `dirname $@`
-	cp -a $< $@
-
-# YUI_DEFAULT is one of the targets in YUI_BUILDS which expands all of our YUI
-# versions for us.
-$(JS_ALL): $(YUI_DEFAULT)
-$(JS_OUT): $(JS_ALL)
-ifeq ($(JS_BUILD), min)
-	cat $^ | bin/lpjsmin > $@
-else
-	awk 'FNR == 1 {print "/* " FILENAME " */"} {print}' $^ > $@
-endif
+	find $@ -name 'tests' -type d | xargs rm -rf
+	bin/lpjsmin -p $@
+
+$(YUI2_BUILD): lib/canonical/launchpad/icing/yui_2.7.0b/build
+	mkdir -p $@
+	cp -a $</* $@
 
 combobuild:
 	utilities/js-deps -n LP_MODULES -s build/js/lp -x '-min.js' -o \
 	build/js/lp/meta.js >/dev/null
 	utilities/check-js-deps
 
-jsbuild: $(PY) $(JS_OUT)
-	bin/combo-rootdir build/js $(YUI_DEFAULT)
+jsbuild: $(LP_JS_BUILD) $(YUI_DEFAULT_SYMLINK) $(YUI2_BUILD)
 
 eggs:
 	# Usually this is linked via link-external-sourcecode, but in
@@ -261,7 +246,6 @@
 	${SHHH} $(MAKE) -C sourcecode build PYTHON=${PYTHON} \
 	    LPCONFIG=${LPCONFIG}
 	${SHHH} LPCONFIG=${LPCONFIG} ${PY} -t buildmailman.py
-	ln -sf ../../../../build/js/yui-3.3.0 $(ICING)/yui
 
 test_build: build
 	bin/test $(TESTFLAGS) $(TESTOPTS)
@@ -275,10 +259,6 @@
 ftest_inplace: inplace
 	bin/test -f $(TESTFLAGS) $(TESTOPTS)
 
-merge-proposal-jobs:
-	# Handle merge proposal email jobs.
-	$(PY) cronscripts/merge-proposal-jobs.py -v
-
 run: build inplace stop
 	bin/run -r librarian,google-webservice,memcached,rabbitmq,txlongpoll \
 	-i $(LPCONFIG)
@@ -319,15 +299,6 @@
 stop_librarian:
 	bin/killservice librarian
 
-pull_branches: support_files
-	$(PY) cronscripts/supermirror-pull.py
-
-scan_branches:
-	# Scan branches from the filesystem into the database.
-	$(PY) cronscripts/scan_branches.py
-
-sync_branches: pull_branches scan_branches merge-proposal-jobs
-
 $(BZR_VERSION_INFO):
 	scripts/update-bzr-version-info.sh
 
@@ -375,7 +346,6 @@
 	$(PY) database/schema/fti.py -d launchpad_dev --force
 
 clean_js:
-	$(RM) $(JS_OUT)
 	$(RM) -r $(ICING)/yui
 
 clean_buildout:
@@ -393,9 +363,7 @@
 	$(RM) logs/thread*.request
 
 clean_mailman:
-	$(RM) -r \
-			  /var/tmp/mailman \
-			  /var/tmp/mailman-xmlrpc.test
+	$(RM) -r /var/tmp/mailman /var/tmp/mailman-xmlrpc.test
 ifdef LP_MAKE_KEEP_MAILMAN
 	@echo "Keeping previously built mailman."
 else
@@ -430,8 +398,7 @@
 	$(RM) -r build
 	$(RM) $(BZR_VERSION_INFO)
 	$(RM) +config-overrides.zcml
-	$(RM) -r \
-			  /var/tmp/builddmaster \
+	$(RM) -r /var/tmp/builddmaster \
 			  /var/tmp/bzrsync \
 			  /var/tmp/codehosting.test \
 			  /var/tmp/codeimport \
@@ -517,7 +484,7 @@
 		--docformat restructuredtext --verbose-about epytext-summary \
 		$(PYDOCTOR_OPTIONS)
 
-.PHONY: apidoc build_eggs buildonce_eggs buildout_bin check check	\
+.PHONY: apidoc build_eggs buildonce_eggs buildout_bin check \
 	check_config check_mailman clean clean_buildout clean_js	\
 	clean_logs compile css_combine debug default doc ftest_build	\
 	ftest_inplace hosted_branches jsbuild jsbuild_widget_css	\

=== removed file 'buildout-templates/bin/combo-rootdir.in'
--- buildout-templates/bin/combo-rootdir.in	2012-08-13 18:27:18 +0000
+++ buildout-templates/bin/combo-rootdir.in	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# Copyright 2012 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-set -e
-
-if [ -z "$1" ]; then
-    echo "$0: Need root combo loader directory as an argument."
-    exit 1
-fi
-
-if [ -z "$2" ]; then
-    echo "$0: Need yui build version to use as default as second argument"
-    exit 1
-fi
-
-BUILD_DIR=$1
-YUI_VERSION=$2
-
-# Populate YUI.
-if [ ! -h $BUILD_DIR/yui ]; then
-    ln -sf `basename $YUI_VERSION` $BUILD_DIR/yui
-fi
-
-# And YUI 2, for now.
-if [ ! -d $BUILD_DIR/yui2 ]; then
-    cp -a lib/canonical/launchpad/icing/yui_2.7.0b/build $BUILD_DIR/yui2
-fi
-
-# Copy in our modules.
-rm -rf $BUILD_DIR/lp
-mkdir $BUILD_DIR/lp
-for jsdir in lib/lp/*/javascript ; do
-    app=$(echo $jsdir | sed -e 's,lib/lp/\(.*\)/javascript,\1,')
-    cp -a $jsdir $BUILD_DIR/lp/$app
-done
-# ... and delete tests.
-find $BUILD_DIR/lp -name 'tests' -type d | xargs rm -rf
-
-# Minify our JS.
-bin/lpjsmin -p $BUILD_DIR/lp

=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt	2013-01-01 12:56:03 +0000
+++ lib/lp/app/templates/base-layout-macros.pt	2013-04-08 04:51:20 +0000
@@ -67,27 +67,9 @@
     LP.devmode = true;
   </script>
 
-  <tal:js-legacy condition="not: request/features/js.combo_loader.enabled">
-    <script type="text/javascript"
-          tal:attributes="src string:${icingroot}/build/launchpad.js"></script>
-    <script type="text/javascript" tal:content="string:
-       YUI.GlobalConfig = {
-           debug: ${yui_console_debug},
-           fetchCSS: false,
-           timeout: 50,
-           ignore: [
-               'yui2-yahoo', 'yui2-event', 'yui2-dom',
-               'yui2-calendar','yui2-dom-event'
-           ]
-        }
-       ">
-    </script>
-  </tal:js-legacy>
-
   <script type="text/javascript"
       tal:content="string:var cookie_scope = '${request/lp:cookie_scope}';"></script>
 
-  <tal:js-loader condition="request/features/js.combo_loader.enabled">
    <script type="text/javascript" tal:attributes="src string:${combo_url}/?${yui_version}/yui/yui-min.js&amp;lp/meta.js&amp;${yui_version}/loader/loader-min.js"></script>
    <script type="text/javascript" tal:content="string:
         var raw = null;
@@ -138,9 +120,8 @@
                 }
             }
         }">
-   </script>
+  </script>
 
-  </tal:js-loader>
   <script type="text/javascript">
       // we need this to create a single YUI instance all events and code
       // talks across. All instances of YUI().use should be based off of

=== modified file 'lib/lp/services/features/flags.py'
--- lib/lp/services/features/flags.py	2013-02-14 02:02:58 +0000
+++ lib/lp/services/features/flags.py	2013-04-08 04:51:20 +0000
@@ -112,13 +112,7 @@
      'No jobs run via celery',
      'Celery-enabled job classes',
      'https://dev.launchpad.net/CeleryJobRunner'),
-    ('js.combo_loader.enabled',
-     'boolean',
-     'Determines if we use a js combo loader or not.',
-     '',
-     '',
-     ''),
-    ('js.yui-version',
+    ('js.yui_version',
      'space delimited',
      'Allows us to change the YUI version we run against, e.g. yui-3.4.',
      'As speficied in versions.cfg',

=== removed file 'utilities/yui-deps.py'
--- utilities/yui-deps.py	2012-09-28 06:15:58 +0000
+++ utilities/yui-deps.py	1970-01-01 00:00:00 +0000
@@ -1,132 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright 2010-2012 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Print the YUI modules we are using."""
-
-from sys import argv
-
-
-yui_roots = {
-    3: 'build/js/yui-3.3.0',
-    2: 'build/js/yui2',
-}
-yui_deps = {
-    3: [
-        'yui/yui',
-        'oop/oop',
-        'dom/dom',
-        'dom/dom-style-ie',
-        'event-custom/event-custom',
-        'event/event',
-        'pluginhost/pluginhost',
-        'node/node',
-        'event/event-base-ie',
-        'node/align-plugin',
-        'attribute/attribute',
-        'base/base',
-        'anim/anim',
-        'async-queue/async-queue',
-        'json/json',
-        'plugin/plugin',
-        'cache/cache',
-        'classnamemanager/classnamemanager',
-        'collection/collection',
-        'dump/dump',
-        'intl/intl',
-        'substitute/substitute',
-        'widget/widget',
-        'widget/widget-base-ie',
-        'console/lang/console.js',
-        'console/console',
-        'console/console-filters',
-        'cookie/cookie',
-        'dataschema/dataschema',
-        'datatype/lang/datatype.js',
-        'datatype/datatype',
-        'querystring/querystring-stringify-simple',
-        'queue-promote/queue-promote',
-        'io/io',
-        'datasource/datasource',
-        'dd/dd',
-        'dd/dd-gestures',
-        'dd/dd-drop-plugin',
-        'event/event-touch',
-        'event-gestures/event-gestures',
-        'dd/dd-plugin',
-        'dom/selector-css3',
-        'editor/editor',
-        'event-simulate/event-simulate',
-        'event-valuechange/event-valuechange',
-        'escape/escape',
-        'text/text-data-wordbreak',
-        'text/text-wordbreak',
-        'text/text-data-accentfold',
-        'text/text-accentfold',
-        'highlight/highlight',
-        'history/history',
-        'history/history-hash-ie',
-        'history-deprecated/history-deprecated',
-        'imageloader/imageloader',
-        'jsonp/jsonp',
-        'jsonp/jsonp-url',
-        'loader/loader',
-        'node/node-event-simulate',
-        'transition/transition',
-        'node-flick/node-flick',
-        'node-focusmanager/node-focusmanager',
-        'node-menunav/node-menunav',
-        'widget/widget-position',
-        'widget/widget-position-align',
-        'widget/widget-position-constrain',
-        'widget/widget-stack',
-        'widget/widget-stdmod',
-        'overlay/overlay',
-        'profiler/profiler',
-        'querystring/querystring',
-        'querystring/querystring-parse-simple',
-        'scrollview/scrollview-base',
-        'scrollview/scrollview-base-ie',
-        'scrollview/scrollview-scrollbars',
-        'scrollview/scrollview',
-        'scrollview/scrollview-paginator',
-        'node/shim-plugin',
-        'slider/slider',
-        'sortable/sortable',
-        'sortable/sortable-scroll',
-        'stylesheet/stylesheet',
-        'swfdetect/swfdetect',
-        'swf/swf',
-        'tabview/tabview-base',
-        'widget/widget-child',
-        'widget/widget-parent',
-        'tabview/tabview',
-        'tabview/tabview-plugin',
-        'test/test',
-        'uploader/uploader',
-        'widget-anim/widget-anim',
-        'widget/widget-locale',
-        'yql/yql',
-    ],
-    2: [
-        'yahoo/yahoo.js',
-        'dom/dom.js',
-        'event/event.js',
-        'yahoo-dom-event/yahoo-dom-event.js',
-        'calendar/calendar.js',
-    ]
-}
-
-
-if __name__ == '__main__':
-    ext = "-%s.js" % argv[1] if len(argv) >= 2 else ".js"
-    for version, yui_deps in yui_deps.iteritems():
-        yui_root = yui_roots[version]
-        for yui_dep in yui_deps:
-            # If the yui_dep already has a .js suffix, don't add ext to it.
-            if yui_dep.endswith(".js"):
-                yui_dep_path = "%s/%s" % (yui_root, yui_dep)
-            else:
-                yui_dep_path = "%s/%s%s" % (yui_root, yui_dep, ext)
-            print yui_dep_path