Bug 1047876 - Flatten modules/libjar/zipwriter/{public,src}/ directories. r=glandium

--HG--
rename : modules/libjar/zipwriter/src/StreamFunctions.cpp => modules/libjar/zipwriter/StreamFunctions.cpp
rename : modules/libjar/zipwriter/src/StreamFunctions.h => modules/libjar/zipwriter/StreamFunctions.h
rename : modules/libjar/zipwriter/src/ZipWriterModule.cpp => modules/libjar/zipwriter/ZipWriterModule.cpp
rename : modules/libjar/zipwriter/src/nsDeflateConverter.cpp => modules/libjar/zipwriter/nsDeflateConverter.cpp
rename : modules/libjar/zipwriter/src/nsDeflateConverter.h => modules/libjar/zipwriter/nsDeflateConverter.h
rename : modules/libjar/zipwriter/public/nsIZipWriter.idl => modules/libjar/zipwriter/nsIZipWriter.idl
rename : modules/libjar/zipwriter/src/nsZipDataStream.cpp => modules/libjar/zipwriter/nsZipDataStream.cpp
rename : modules/libjar/zipwriter/src/nsZipDataStream.h => modules/libjar/zipwriter/nsZipDataStream.h
rename : modules/libjar/zipwriter/src/nsZipHeader.cpp => modules/libjar/zipwriter/nsZipHeader.cpp
rename : modules/libjar/zipwriter/src/nsZipHeader.h => modules/libjar/zipwriter/nsZipHeader.h
rename : modules/libjar/zipwriter/src/nsZipWriter.cpp => modules/libjar/zipwriter/nsZipWriter.cpp
rename : modules/libjar/zipwriter/src/nsZipWriter.h => modules/libjar/zipwriter/nsZipWriter.h

modules/libjar/zipwriter/moz.build

@@ -4,6 +4,23 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['public', 'src']
 TEST_DIRS += ['test']
 
+XPIDL_SOURCES += [
+    'nsIZipWriter.idl',
+]
+
+XPIDL_MODULE = 'zipwriter'
+
+UNIFIED_SOURCES += [
+    'nsDeflateConverter.cpp',
+    'nsZipDataStream.cpp',
+    'nsZipHeader.cpp',
+    'nsZipWriter.cpp',
+    'StreamFunctions.cpp',
+    'ZipWriterModule.cpp',
+]
+
+MSVC_ENABLE_PGO = True
+
+FINAL_LIBRARY = 'xul'

modules/libjar/zipwriter/public/moz.build

@@ -1,12 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPIDL_SOURCES += [
-    'nsIZipWriter.idl',
-]
-
-XPIDL_MODULE = 'zipwriter'
-

modules/libjar/zipwriter/src/moz.build

@@ -1,18 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-UNIFIED_SOURCES += [
-    'nsDeflateConverter.cpp',
-    'nsZipDataStream.cpp',
-    'nsZipHeader.cpp',
-    'nsZipWriter.cpp',
-    'StreamFunctions.cpp',
-    'ZipWriterModule.cpp',
-]
-
-MSVC_ENABLE_PGO = True
-
-FINAL_LIBRARY = 'xul'