Bug 649078 - Remove WinCE installer code from mobile/installer/wince/* and related build configs; r=dougt
authorEd Morley <bmo@edmorley.co.uk>
Thu, 14 Apr 2011 13:54:59 -0400
changeset 68166 31eeb90b53da12bd95a392115124d0d80988fa5c
parent 68165 3c42531f4ec88dc53eb3bd189de3e43ae12c4a62
child 68167 877c143cf39af37f3b23063c80c691336116fba8
push id19528
push usereakhgari@mozilla.com
push dateFri, 15 Apr 2011 13:35:33 +0000
treeherdermozilla-central@754e793c647e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdougt
bugs649078
milestone6.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 649078 - Remove WinCE installer code from mobile/installer/wince/* and related build configs; r=dougt
mobile/Makefile.in
mobile/app/Makefile.in
mobile/build.mk
mobile/installer/Makefile.in
mobile/installer/package-manifest.in
mobile/installer/wince/Makefile.in
mobile/installer/wince/Setup.cpp
mobile/installer/wince/Setup.def
mobile/locales/Makefile.in
--- a/mobile/Makefile.in
+++ b/mobile/Makefile.in
@@ -44,19 +44,15 @@ VPATH      = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 DIRS       = chrome locales components modules themes app
 
 ifndef LIBXUL_SDK
 PARALLEL_DIRS += $(DEPTH)/xulrunner/tools/redit
 endif
 
-ifdef WINCE
-DIRS += installer/wince
-endif
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/testing/testsuite-targets.mk
 
 package-mobile-tests:
 	$(MAKE) stage-mochitest DIST_BIN=$(DEPTH)/$(DIST)/bin/xulrunner
 	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
 	@(cd $(PKG_STAGE) && tar $(TAR_CREATE_FLAGS) - *) | bzip2 -f > $(DIST)/$(PKG_PATH)$(TEST_PACKAGE)
--- a/mobile/app/Makefile.in
+++ b/mobile/app/Makefile.in
@@ -85,22 +85,18 @@ endif
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,version)
 endif
 endif # BUILD_STATIC_LIBS
 
 ifdef _MSC_VER
 # Always enter a Windows program through wmain, whether or not we're
 # a console application.
-ifdef WINCE
-WIN32_EXE_LDFLAGS += -ENTRY:mainWCRTStartup
-else
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
-endif
 endif #LIBXUL_SDK
 
 include $(topsrcdir)/config/rules.mk
 
 GRE_MILESTONE = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
 GRE_BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
 APP_BUILDID = $(shell $(PYTHON) $(topsrcdir)/toolkit/xre/make-platformini.py --print-buildid)
 APP_ICON = mobile
@@ -129,23 +125,16 @@ endif
 _dollar=$$
 SOURCE_REPO := $(shell cd $(srcdir)/.. && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
 # extra sanity check for old versions of hg
 # that don't support showconfig
 ifeq (http,$(patsubst http%,http,$(SOURCE_REPO)))
 DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)"
 endif
 
-ifdef WINCE
-DEFINES += -DWINCE=1
-endif
-
-ifeq ($(OS_ARCH),WINCE)
-REDIT_PATH = $(LIBXUL_DIST)/host/bin
-endif
 ifeq ($(OS_ARCH),WINNT)
 REDIT_PATH = $(LIBXUL_DIST)/bin
 endif
 
 APP_BINARY = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 APP_BINARY_FASTSTART = $(MOZ_APP_NAME)faststart$(BIN_SUFFIX)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
@@ -191,29 +180,26 @@ endif
 else # MOZ_WIDGET_TOOLKIT != cocoa
 
 libs::
 ifdef LIBXUL_SDK
 	cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX) $(DIST)/bin/$(APP_BINARY)
 endif
 ifdef MOZ_FASTSTART
 ifdef _MSC_VER
-ifdef WINCE
-	cp $(LIBXUL_DIST)/bin/faststartstub$(BIN_SUFFIX) $(DIST)/bin/$(APP_BINARY_FASTSTART)
-endif
 endif
 endif
 ifndef SKIP_COPY_XULRUNNER
 ifdef LIBXUL_SDK
 	$(NSINSTALL) -D $(DIST)/bin/xulrunner
 	(cd $(LIBXUL_SDK)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DIST)/bin/xulrunner && tar -xf -)
 endif
 endif # SKIP_COPY_XULRUNNER
 
 	$(NSINSTALL) -D $(DIST)/bin/chrome/icons/default
 
-ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 	cp $(srcdir)/$(APP_ICON).ico $(DIST)/bin/chrome/icons/default/$(APP_ICON).ico
 	cp $(srcdir)/$(APP_SPLASH).bmp $(DIST)/bin/$(APP_SPLASH).bmp
 	$(REDIT_PATH)/redit$(HOST_BIN_SUFFIX) $(DIST)/bin/$(APP_BINARY) $(srcdir)/$(APP_ICON).ico
 endif
 
 endif
--- a/mobile/build.mk
+++ b/mobile/build.mk
@@ -64,21 +64,17 @@ tier_app_dirs += \
   $(NULL)
 
 
 installer: 
 	@$(MAKE) -C mobile/installer installer
 
 package:
 	rm -rf dist/fennec*
-ifeq ($(OS_ARCH),WINCE)
-	@$(MAKE) -C mobile/installer installer
-else
 	@$(MAKE) -C mobile/installer
-endif
 
 install::
 	@echo "Mobile can't be installed directly."
 	@exit 1
 
 deb: package
 	@$(MAKE) -C mobile/installer deb
 
--- a/mobile/installer/Makefile.in
+++ b/mobile/installer/Makefile.in
@@ -230,40 +230,8 @@ deb: $(PP_DEB_FILES) $(DIST)/branding/$(
 	echo $(DEB_PKG_NAME) > $(DIST)/deb_name.txt
 
 installer: deb
 	@echo Installer DEB created!
 
 # relative to $(DIST)
 UPLOAD_EXTRA_FILES += ../mobile/$(DEB_PKG_NAME) deb_name.txt
 endif
-
-ifeq ($(OS_ARCH),WINCE)
-
-VSINSTALLDIR ?= $(error VSINSTALLDIR not set, must be set to the Visual Studio install directory)
-
-UNPACKAGE = $(LIBXUL_DIST)/xulrunner*$(PKG_SUFFIX)
-
-cab: stage-package package-xulrunner
-	cd $(DIST) && $(PYTHON) $(ABS_TOPSRCDIR)/build/package/wince/make_wince_cab.py $(CABARGS) "$(VSINSTALLDIR)/SmartDevices/SDK/SDKTools/cabwiz.exe" "$(MOZ_PKG_DIR)" "$(MOZ_APP_DISPLAYNAME)" "$(PKG_PATH)$(PKG_BASENAME).cab" &&  echo "Installer $(PKG_PATH)$(PKG_BASENAME).cab created!"
-
-installer: 7zip-installer zip
-
-zip:
-	cd $(DIST) && $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR)
-
-7zip-installer: stage-package package-xulrunner
-	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
-	cd $(DIST) && $(PYTHON) $(ABS_TOPSRCDIR)/build/package/wince/make_wince_cab.py -setupdll -s "$(VSINSTALLDIR)/SmartDevices/SDK/SDKTools/cabwiz.exe" "$(MOZ_PKG_DIR)" "$(MOZ_APP_DISPLAYNAME)" "$(MOZ_PKG_DIR)/setup.cab"
-	$(NSINSTALL) $(DIST)/$(MOZ_PKG_DIR)/setup.ini $(DIST)
-ifdef LIBXUL_SDK
-	mv $(DIST)/$(MOZ_GRE_PKG_DIR)/uninstall.exe $(DIST)/$(MOZ_PKG_DIR)/ 
-endif
-	cd $(DIST) &&                                                       \
-	  7z a $(PKG_PATH)$(PKG_BASENAME).7z $(MOZ_PKG_DIR) setup.ini       \
-	    -x!$(MOZ_GRE_PKG_DIR)/xulrunner-stub-installer.sfx              \
-	    -x!$(MOZ_PKG_DIR)/setup.ini &&                                  \
-	  cat $(MOZ_GRE_PKG_DIR)/xulrunner-stub-installer.sfx               \
-	    $(PKG_PATH)$(PKG_BASENAME).7z>$(PKG_PATH)$(PKG_BASENAME).exe && \
-	  rm $(PKG_PATH)$(PKG_BASENAME).7z &&                               \
-	  rm setup.ini
-
-endif
--- a/mobile/installer/package-manifest.in
+++ b/mobile/installer/package-manifest.in
@@ -28,20 +28,18 @@
 @BINPATH@/defaults/profile/mimeTypes.rdf
 @BINPATH@/defaults/profile/chrome/*
 #ifdef MOZ_UPDATER
 @BINPATH@/update.locale
 @BINPATH@/updater.ini
 #endif
 @BINPATH@/dictionaries/*
 #ifdef XP_WIN32
-#ifndef WINCE
 @BINPATH@/uninstall/helper.exe
 #endif
-#endif
 
 [xpcom]
 @BINPATH@/dependentlibs.list
 #ifndef MOZ_STATIC_JS
 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
 #endif
 @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
@@ -53,19 +51,17 @@
 #else
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
 #endif
 #ifdef XP_MACOSX
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
-#ifdef WINCE
-@BINPATH@/mozce_shunt.dll
-#elifdef XP_WIN32
+#ifdef XP_WIN32
 #ifndef MOZ_MEMORY
 #if _MSC_VER == 1400
 @BINPATH@/Microsoft.VC80.CRT.manifest
 @BINPATH@/msvcm80.dll
 @BINPATH@/msvcp80.dll
 @BINPATH@/msvcr80.dll
 #elif _MSC_VER == 1500
 @BINPATH@/Microsoft.VC90.CRT.manifest
@@ -200,19 +196,17 @@
 @BINPATH@/components/layout_forms.xpt
 #ifdef NS_PRINTING
 @BINPATH@/components/layout_printing.xpt
 #endif
 @BINPATH@/components/layout_xul_tree.xpt
 @BINPATH@/components/layout_xul.xpt
 @BINPATH@/components/locale.xpt
 @BINPATH@/components/lwbrk.xpt
-#ifndef WINCE
 @BINPATH@/components/migration.xpt
-#endif
 @BINPATH@/components/mimetype.xpt
 @BINPATH@/components/mozfind.xpt
 @BINPATH@/components/necko_about.xpt
 @BINPATH@/components/necko_cache.xpt
 @BINPATH@/components/necko_cookie.xpt
 @BINPATH@/components/necko_dns.xpt
 @BINPATH@/components/necko_file.xpt
 @BINPATH@/components/necko_ftp.xpt
@@ -578,35 +572,16 @@ bin/libfreebl_32int64_3.so
 #endif
 
 ; [Extensions]
 ;
 #ifdef MOZ_ENABLE_GNOMEVFS
 bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
 #endif
 
-; [ActiveX]
-#ifdef WINCE
-#ifndef MOZ_NO_ACTIVEX_SUPPORT
-@BINPATH@/components/nsAxSecurityPolicy.js
-@BINPATH@/@PREF_DIR@/activex.js
-@BINPATH@/plugins/npmozax.dll
-@BINPATH@/plugins/nsIMozAxPlugin.xpt
-#endif
-#endif
-
-; [FastStart]
-#ifdef WINCE
-#ifdef MOZ_FASTSTART
-@BINPATH@/firefoxfaststart.exe
-@BINPATH@/components/FastStartup.manifest
-@BINPATH@/components/FastStartup.js
-#endif
-#endif
-
 ; [OS/2]
 #ifdef XP_OS2
 @BINPATH@/MozSounds.cmd
 #endif
 
 [mobile]
 @BINPATH@/chrome/icons/
 @BINPATH@/chrome/chrome@JAREXT@
deleted file mode 100644
--- a/mobile/installer/wince/Makefile.in
+++ /dev/null
@@ -1,59 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Fennec Installer for WinCE.
-#
-# The Initial Developer of the Original Code is The Mozilla Foundation.
-#
-# Portions created by the Initial Developer are Copyright (C) 2009
-# the Mozilla Foundation <http://www.mozilla.org/>. All Rights Reserved.
-#
-# Contributor(s): 
-#   Alex Pakhotin <alexp@mozilla.com> (original author)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE           = setup
-LIBRARY_NAME     = setup
-FORCE_SHARED_LIB = 1
-
-export NO_SHUNT  = 1
-
-DEFFILE = $(srcdir)/Setup.def
-
-DEFINES += -DMOZ_APP_DISPLAYNAME=L\\\"$(MOZ_APP_DISPLAYNAME)\\\"
-
-CPPSRCS = \
-	Setup.cpp \
-	$(NULL)
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mobile/installer/wince/Setup.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- Mode: C++; c-basic-offset: 2; tab-width: 8; indent-tabs-mode: nil; -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Fennec Installer for WinCE.
- *
- * The Initial Developer of the Original Code is The Mozilla Foundation.
- *
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Alex Pakhotin <alexp@mozilla.com> (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/**
- *
- * Mozilla Fennec Setup DLL
- *
- */
-
-#include <windows.h>
-#include <ce_setup.h>
-
-const WCHAR c_sAppRegKey[] = L"Software\\Mozilla\\" MOZ_APP_DISPLAYNAME;
-
-// Forward declarations
-BOOL GetInstallPath(WCHAR *sPath);
-BOOL RunUninstall();
-
-//////////////////////////////////////////////////////////////////////////
-// Entry point
-//
-BOOL APIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
-{
-  return TRUE;
-}
-
-codeINSTALL_INIT Install_Init(HWND hwndParent, BOOL fFirstCall, BOOL fPreviouslyInstalled, LPCTSTR pszInstallDir)
-{
-  return codeINSTALL_INIT_CONTINUE;
-}
-
-codeINSTALL_EXIT Install_Exit(HWND hwndParent, LPCTSTR pszInstallDir,
-                              WORD cFailedDirs, WORD cFailedFiles, WORD cFailedRegKeys,
-                              WORD cFailedRegVals, WORD cFailedShortcuts)
-{
-  return codeINSTALL_EXIT_DONE;
-}
-
-codeUNINSTALL_INIT Uninstall_Init(HWND hwndParent, LPCTSTR pszInstallDir)
-{
-  RunUninstall();
-
-  // Continue regardless of the RunUninstall result
-  // This uninstallation may run from the Uninstall.exe,
-  // in this case RunUninstall will not succeed, which is correct
-  return codeUNINSTALL_INIT_CONTINUE;
-}
-
-codeUNINSTALL_EXIT Uninstall_Exit(HWND hwndParent)
-{
-  return codeUNINSTALL_EXIT_DONE;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Utility functions
-//
-BOOL GetInstallPath(WCHAR *sPath)
-{
-  HKEY hKey;
-
-  LONG result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, c_sAppRegKey, 0, KEY_ALL_ACCESS, &hKey);
-  if (result == ERROR_SUCCESS)
-  {
-    DWORD dwType = NULL;
-    DWORD dwCount = MAX_PATH * sizeof(WCHAR);
-    result = RegQueryValueEx(hKey, L"Path", NULL, &dwType, (LPBYTE)sPath, &dwCount);
-
-    RegCloseKey(hKey);
-  }
-
-  return (result == ERROR_SUCCESS);
-}
-
-BOOL RunUninstall()
-{
-  BOOL bResult = FALSE;
-  WCHAR sUninstallPath[MAX_PATH];
-  if (GetInstallPath(sUninstallPath))
-  {
-    if (wcslen(sUninstallPath) > 0 && sUninstallPath[wcslen(sUninstallPath)-1] != '\\')
-      wcscat(sUninstallPath, L"\\");
-
-    wcscat(sUninstallPath, L"uninstall.exe");
-
-    PROCESS_INFORMATION pi;
-    bResult = CreateProcess(sUninstallPath, L"[setup]",
-                            NULL, NULL, FALSE, 0, NULL, NULL, NULL, &pi);
-    if (bResult)
-    {
-      // Wait for it to finish
-      WaitForSingleObject(pi.hProcess, INFINITE);
-    }
-  }
-  return bResult;
-}
deleted file mode 100644
--- a/mobile/installer/wince/Setup.def
+++ /dev/null
@@ -1,6 +0,0 @@
-LIBRARY	"Setup"
-EXPORTS
-	Install_Init @1
-	Install_Exit @2
-	Uninstall_Init @3
-	Uninstall_Exit @4
--- a/mobile/locales/Makefile.in
+++ b/mobile/locales/Makefile.in
@@ -159,30 +159,16 @@ libs:: $(UPDATER_INI)
 	  $(FINAL_TARGET)/updater.ini
 endif
 
 ifdef MOZ_CRASHREPORTER
 libs:: crashreporter-override.ini
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
 endif
 
-ifdef WINCE_WINDOWS_MOBILE
-ifdef LOCALE_MERGEDIR
-SETUP_INI := $(firstword $(wildcard $(LOCALE_MERGEDIR)/installer/setup.ini) \
-       $(wildcard $(LOCALE_SRCDIR)/installer/setup.ini) \
-       $(srcdir)/en-US/installer/setup.ini )
-else
-SETUP_INI := $(addprefix $(LOCALE_SRCDIR)/,installer/setup.ini)
-endif
-libs:: $(SETUP_INI)
-	cat $< | \
-	  sed -e "s/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/" > \
-	  $(FINAL_TARGET)/setup.ini
-endif
-
 # When we unpack fennec on MacOS X the platform.ini and application.ini are in slightly
 # different locations that on all other platforms
 ifeq (Darwin, $(OS_ARCH))
 ifdef LIBXUL_SDK
 GECKO_PLATFORM_INI_PATH="$(STAGEDIST)/../Frameworks/XUL.framework/Versions/$(MOZILLA_VERSION)/platform.ini"
 else
 GECKO_PLATFORM_INI_PATH="$(STAGEDIST)/platform.ini"
 endif