Bug 1047876 - Flatten modules/libjar/zipwriter/{public,src}/ directories. r=glandium
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Mon, 04 Aug 2014 06:55:01 -0700
changeset 219573 5466eb0ecd3b34a2af6877b0c508e96f58e5b20d
parent 219572 e4ce6be46c38f4b1f832621ec78aef3ce9b68180
child 219574 a7b7ed2857ef09b6a86b12e5a353fd82303294fa
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1047876
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1047876 - Flatten modules/libjar/zipwriter/{public,src}/ directories. r=glandium
modules/libjar/zipwriter/StreamFunctions.cpp
modules/libjar/zipwriter/StreamFunctions.h
modules/libjar/zipwriter/ZipWriterModule.cpp
modules/libjar/zipwriter/moz.build
modules/libjar/zipwriter/nsDeflateConverter.cpp
modules/libjar/zipwriter/nsDeflateConverter.h
modules/libjar/zipwriter/nsIZipWriter.idl
modules/libjar/zipwriter/nsZipDataStream.cpp
modules/libjar/zipwriter/nsZipDataStream.h
modules/libjar/zipwriter/nsZipHeader.cpp
modules/libjar/zipwriter/nsZipHeader.h
modules/libjar/zipwriter/nsZipWriter.cpp
modules/libjar/zipwriter/nsZipWriter.h
modules/libjar/zipwriter/public/moz.build
modules/libjar/zipwriter/public/nsIZipWriter.idl
modules/libjar/zipwriter/src/StreamFunctions.cpp
modules/libjar/zipwriter/src/StreamFunctions.h
modules/libjar/zipwriter/src/ZipWriterModule.cpp
modules/libjar/zipwriter/src/moz.build
modules/libjar/zipwriter/src/nsDeflateConverter.cpp
modules/libjar/zipwriter/src/nsDeflateConverter.h
modules/libjar/zipwriter/src/nsZipDataStream.cpp
modules/libjar/zipwriter/src/nsZipDataStream.h
modules/libjar/zipwriter/src/nsZipHeader.cpp
modules/libjar/zipwriter/src/nsZipHeader.h
modules/libjar/zipwriter/src/nsZipWriter.cpp
modules/libjar/zipwriter/src/nsZipWriter.h
rename from modules/libjar/zipwriter/src/StreamFunctions.cpp
rename to modules/libjar/zipwriter/StreamFunctions.cpp
rename from modules/libjar/zipwriter/src/StreamFunctions.h
rename to modules/libjar/zipwriter/StreamFunctions.h
rename from modules/libjar/zipwriter/src/ZipWriterModule.cpp
rename to modules/libjar/zipwriter/ZipWriterModule.cpp
--- a/modules/libjar/zipwriter/moz.build
+++ b/modules/libjar/zipwriter/moz.build
@@ -1,9 +1,26 @@
 # -*- 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/.
 
-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'
rename from modules/libjar/zipwriter/src/nsDeflateConverter.cpp
rename to modules/libjar/zipwriter/nsDeflateConverter.cpp
rename from modules/libjar/zipwriter/src/nsDeflateConverter.h
rename to modules/libjar/zipwriter/nsDeflateConverter.h
rename from modules/libjar/zipwriter/public/nsIZipWriter.idl
rename to modules/libjar/zipwriter/nsIZipWriter.idl
rename from modules/libjar/zipwriter/src/nsZipDataStream.cpp
rename to modules/libjar/zipwriter/nsZipDataStream.cpp
rename from modules/libjar/zipwriter/src/nsZipDataStream.h
rename to modules/libjar/zipwriter/nsZipDataStream.h
rename from modules/libjar/zipwriter/src/nsZipHeader.cpp
rename to modules/libjar/zipwriter/nsZipHeader.cpp
rename from modules/libjar/zipwriter/src/nsZipHeader.h
rename to modules/libjar/zipwriter/nsZipHeader.h
rename from modules/libjar/zipwriter/src/nsZipWriter.cpp
rename to modules/libjar/zipwriter/nsZipWriter.cpp
rename from modules/libjar/zipwriter/src/nsZipWriter.h
rename to modules/libjar/zipwriter/nsZipWriter.h
deleted file mode 100644
--- a/modules/libjar/zipwriter/public/moz.build
+++ /dev/null
@@ -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'
-
deleted file mode 100644
--- a/modules/libjar/zipwriter/src/moz.build
+++ /dev/null
@@ -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'