| author | Gregory Szorc <gps@mozilla.com> |
| Mon, 25 Feb 2013 12:47:21 -0800 | |
| changeset 134448 | ba58ecbd2b5be4ed116d96bd9de6ba517c18f49f |
| parent 134447 | 5c4418e37b13b31d2e13e966dff6758bd7b71564 |
| child 134449 | 4a34004947d1a63657dc7ff80ece30492b43bf29 |
| push id | 336 |
| push user | akeybl@mozilla.com |
| push date | Mon, 17 Jun 2013 22:53:19 +0000 |
| treeherder | mozilla-release@574a39cdf657 [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| reviewers | jrmuizel |
| bugs | 784841 |
| milestone | 22.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
|
--- a/image/Makefile.in +++ b/image/Makefile.in @@ -7,17 +7,11 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = imglib2 -PARALLEL_DIRS = public src decoders encoders - -TEST_DIRS += test - -DIRS += build - include $(topsrcdir)/config/rules.mk
new file mode 100644 --- /dev/null +++ b/image/build/moz.build @@ -0,0 +1,5 @@ +# 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/. +
--- a/image/decoders/Makefile.in +++ b/image/decoders/Makefile.in @@ -30,33 +30,10 @@ CSRCS = iccjpeg.c \ # Decoders need RasterImage.h LOCAL_INCLUDES += -I$(topsrcdir)/image/src/ # PNG read/write stuff DEFINES += -DMOZ_PNG_WRITE \ -DMOZ_PNG_READ \ $(NULL) - -# The Icon Channel stuff really shouldn't live in decoders/icon, but we'll -# fix that another time. -ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) -DIRS = icon/gtk icon -endif -ifneq (,$(filter qt,$(MOZ_WIDGET_TOOLKIT))) -DIRS = icon/qt icon -endif -ifeq ($(OS_ARCH),WINNT) -DIRS = icon/win icon -endif -ifeq ($(OS_ARCH),OS2) -DIRS = icon/os2 icon -endif -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -DIRS = icon/mac icon -endif -ifeq (android,$(MOZ_WIDGET_TOOLKIT)) -DIRS = icon/android icon -endif - - include $(topsrcdir)/config/rules.mk
new file mode 100644 --- /dev/null +++ b/image/decoders/icon/android/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/image/decoders/icon/gtk/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/image/decoders/icon/mac/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/image/decoders/icon/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/image/decoders/icon/os2/moz.build @@ -0,0 +1,5 @@ +# 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/. +
--- a/image/decoders/icon/qt/Makefile.in +++ b/image/decoders/icon/qt/Makefile.in @@ -16,15 +16,13 @@ LIBXUL_LIBRARY = 1 CPPSRCS = nsIconChannel.cpp LOCAL_INCLUDES += $(MOZ_QT_CFLAGS) # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 -DIRS = public - EXTRA_COMPONENTS = gtkqticonsconverter.manifest EXTRA_PP_COMPONENTS = gtkqticonsconverter.js include $(topsrcdir)/config/rules.mk
new file mode 100644 --- /dev/null +++ b/image/decoders/icon/qt/moz.build @@ -0,0 +1,6 @@ +# 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']
new file mode 100644 --- /dev/null +++ b/image/decoders/icon/qt/public/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/image/decoders/icon/win/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/image/decoders/moz.build @@ -0,0 +1,23 @@ +# 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/. + +toolkit = CONFIG['MOZ_WIDGET_TOOLKIT'] + +# The Icon Channel stuff really shouldn't live in decoders/icon, but we'll +# fix that another time. +if toolkit == 'gtk2': + DIRS += ['icon/gtk', 'icon'] +elif toolkit == 'qt': + DIRS += ['icon/qt', 'icon'] + +if CONFIG['OS_ARCH'] == 'WINNT': + DIRS += ['icon/win', 'icon'] +elif CONFIG['OS_ARCH'] == 'OS2': + DIRS += ['icon/os2', 'icon'] + +if toolkit == 'cocoa': + DIRS += ['icon/mac', 'icon'] +elif toolkit == 'android': + DIRS += ['icon/android', 'icon']
--- a/image/encoders/Makefile.in +++ b/image/encoders/Makefile.in @@ -3,17 +3,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk - -DIRS += ico \ - png \ - jpeg \ - bmp \ - $(NULL) - include $(topsrcdir)/config/rules.mk -
new file mode 100644 --- /dev/null +++ b/image/encoders/bmp/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/image/encoders/ico/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/image/encoders/jpeg/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/image/encoders/moz.build @@ -0,0 +1,11 @@ +# 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 += [ + 'ico', + 'png', + 'jpeg', + 'bmp', +]
new file mode 100644 --- /dev/null +++ b/image/encoders/png/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/image/moz.build @@ -0,0 +1,8 @@ +# 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/. + +PARALLEL_DIRS += ['public', 'src', 'decoders', 'encoders'] +DIRS += ['build'] +TEST_DIRS += ['test']
new file mode 100644 --- /dev/null +++ b/image/public/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/image/src/moz.build @@ -0,0 +1,5 @@ +# 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/. +
--- a/image/test/Makefile.in +++ b/image/test/Makefile.in @@ -1,9 +1,8 @@ -# # 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/. DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -11,13 +10,9 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk # Module name for xpcshell tests. MODULE = test_libpr0n XPCSHELL_TESTS = unit -DIRS += mochitest \ - browser \ - $(NULL) - include $(topsrcdir)/config/rules.mk
new file mode 100644 --- /dev/null +++ b/image/test/browser/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/image/test/mochitest/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/image/test/moz.build @@ -0,0 +1,6 @@ +# 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/. + +TEST_DIRS += ['mochitest', 'browser']