Bug 1235672 - Remove xulrunner/installer/windows. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 30 Dec 2015 10:09:08 +0900
changeset 278046 7dcbc70c513d905ae279a738cfd1946ecde08ff2
parent 278045 e50d851f973dd8f930ff16951443eac75aa08eb1
child 278047 073716bf9e26306f696b26f137f9cf40314023a0
push id29841
push userryanvm@gmail.com
push dateSat, 02 Jan 2016 00:29:52 +0000
treeherdermozilla-central@f7fbc524f9f3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1235672, 344236
milestone46.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 1235672 - Remove xulrunner/installer/windows. r=mshal The only thing that happens there is copying two bitmaps files in DIST/branding. Those files haven't been used since the removal of the xpinstall-based installer code in bug 344236... 9 years ago.
xulrunner/installer/windows/Header.bmp
xulrunner/installer/windows/Makefile.in
xulrunner/installer/windows/Watermrk.bmp
xulrunner/installer/windows/moz.build
xulrunner/moz.build
deleted file mode 100644
index 75559d1b4bdfee54b2636bc75ffae8473c974672..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/xulrunner/installer/windows/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/.
-
-CONFIG_DIR=$(abspath $(srcdir))
-OBJ_DIR=$(abspath $(DEPTH))
-SRC_DIR=$(abspath $(topsrcdir))
-
-include $(topsrcdir)/config/rules.mk
-
-export::
-	$(NSINSTALL) -D $(DIST)/branding
-	cp $(srcdir)/Header.bmp    $(DIST)/branding/Header.bmp
-	cp $(srcdir)/Watermrk.bmp  $(DIST)/branding/Watermrk.bmp
deleted file mode 100644
index 3cf524f16d3c9534349d1a332a5d526d81028b5d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/xulrunner/installer/windows/moz.build
+++ /dev/null
@@ -1,6 +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/.
-
--- a/xulrunner/moz.build
+++ b/xulrunner/moz.build
@@ -7,16 +7,13 @@
 CONFIGURE_SUBST_FILES += ['installer/Makefile']
 
 DIRS += [
     'app',
     'stub',
     'examples',
 ]
 
-if CONFIG['MAKENSISU']:
-    DIRS += ['installer/windows']
-
 if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['tools/redit']
 
 with Files('**'):
     BUG_COMPONENT = ('Toolkit', 'XULRunner')