Bug 541774: IDL-parser cache and .pyc files are left behind by make clean. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Sat, 10 Apr 2010 16:02:45 -0400
changeset 40656 7a792c959553fc526adeb1b0f293bf7318091faf
parent 40655 b8b69fa241daed669969fd3bc6ef3b3d44c5898a
child 40657 2b560e9560639bef5028dafa0e8d71c27b5745f8
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs541774
milestone1.9.3a5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 541774: IDL-parser cache and .pyc files are left behind by make clean. r=ted
js/src/xpconnect/src/Makefile.in
js/src/xpconnect/src/qsgen.py
--- a/js/src/xpconnect/src/Makefile.in
+++ b/js/src/xpconnect/src/Makefile.in
@@ -194,20 +194,25 @@ dom_quickstubs.cpp: $(srcdir)/dom_quicks
                     $(topsrcdir)/xpcom/idl-parser/header.py \
                     $(topsrcdir)/xpcom/idl-parser/xpidl.py \
                     $(DEPTH)/js/src/js-confdefs.h
 	$(PYTHON) $(topsrcdir)/config/pythonpath.py \
 	  -I$(topsrcdir)/other-licenses/ply \
 	  -I$(topsrcdir)/xpcom/idl-parser \
 	  $(srcdir)/qsgen.py \
 	  --idlpath=$(DEPTH)/dist/idl \
-	  --cachedir=$(DEPTH)/xpcom/idl-parser \
+	  --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
 	  --header-output dom_quickstubs.h \
 	  --stub-output dom_quickstubs.cpp \
 	  --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \
 	  $(ENABLE_TRACEABLE_FLAGS) \
 	  $(srcdir)/dom_quickstubs.qsconf
 
 GARBAGE += \
 		dom_quickstubs.h \
 		dom_quickstubs.cpp \
+		xpidl_debug \
 		$(MDDEPDIR)/dom_qsgen.pp \
+		$(wildcard $(topsrcdir)/other-licenses/ply/ply/*.pyc) \
+		$(wildcard $(topsrcdir)/xpcom/idl-parser/*.pyc) \
 		$(NULL)
+
+GARBAGE_DIRS += $(DEPTH)/xpcom/idl-parser/cache
--- a/js/src/xpconnect/src/qsgen.py
+++ b/js/src/xpconnect/src/qsgen.py
@@ -1662,17 +1662,17 @@ def main():
             options.stub_output = filename + '.cpp'
     if options.header_output is None:
         options.header_output = re.sub(r'(\.c|\.cpp)?$', '.h',
                                        options.stub_output)
 
     if options.cachedir != '':
         sys.path.append(options.cachedir)
         if not os.path.isdir(options.cachedir):
-            os.mkdir(options.cachedir)
+            os.makedirs(options.cachedir)
 
     try:
         includePath = options.idlpath.split(':')
         conf, interfaces = readConfigFile(filename,
                                           includePath=includePath,
                                           cachedir=options.cachedir,
                                           traceable=options.enable_traceables)
         writeHeaderFile(options.header_output, conf.name)