Merge lp:~stevenk/launchpad/dump-top-level-yui into lp:launchpad

[Steve Kowalik]

Stop creating the obsolete top-level 'yui' directory.

Dump the now unused for a while top-level 'yui' directory.

[William Grant (wgrant)]

review: Approve (code)

[William Grant (wgrant)]

review: Approve (code)

=== modified file '.bzrignore'
--- .bzrignore	2012-06-19 13:42:06 +0000
+++ .bzrignore	2013-04-18 03:01:27 +0000
@@ -39,7 +39,6 @@
 *.egg
 dist
 ./eggs
-./yui
 ./download-cache
 ./_pythonpath.py
 ./production-configs

=== modified file 'Makefile'
--- Makefile	2013-04-11 04:05:38 +0000
+++ Makefile	2013-04-18 03:01:27 +0000
@@ -194,7 +194,6 @@
 	# Usually this is linked via link-external-sourcecode, but in
 	# deployment we create this ourselves.
 	mkdir eggs
-	mkdir yui
 
 buildonce_eggs: $(PY)
 	find eggs -name '*.pyc' -exec rm {} \;
@@ -344,7 +343,8 @@
 	$(PY) database/schema/fti.py -d launchpad_dev --force
 
 clean_js:
-	$(RM) -r $(ICING)/yui
+	$(RM) -r $(JS_BUILD_DIR)
+	$(RM) -r yui # Remove obsolete top-level directory for now.
 
 clean_buildout:
 	$(RM) -r build

=== modified file 'utilities/link-external-sourcecode'
--- utilities/link-external-sourcecode	2012-06-29 08:40:05 +0000
+++ utilities/link-external-sourcecode	2013-04-18 03:01:27 +0000
@@ -138,7 +138,7 @@
     for source, destination in missing_files:
         link(source, destination)
 
-    for folder_name in ('download-cache', 'eggs', 'yui'):
+    for folder_name in ('download-cache', 'eggs'):
         source = abspath(join(options.parent, folder_name))
         destination = abspath(join(options.target, folder_name))
         if not exists(destination):
@@ -148,5 +148,3 @@
                     (source, destination))
             else:
                 link(source, destination)
-
-# End