mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 649078 - Remove WinCE installer code from mobile/installer/wince/* and related build configs; r=dougt
This commit is contained in:
Ed Morley
parent
8368253253
commit
0888982139
@ -49,10 +49,6 @@ 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
|
||||
|
||||
|
||||
@ -90,12 +90,8 @@ 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
|
||||
@ -134,13 +130,6 @@ 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
|
||||
@ -196,9 +185,6 @@ ifdef LIBXUL_SDK
|
||||
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
|
||||
@ -210,7 +196,7 @@ 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
|
||||
|
||||
@ -69,11 +69,7 @@ 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."
|
||||
|
||||
@ -235,35 +235,3 @@ installer: deb
|
||||
# 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
|
||||
|
||||
@ -33,10 +33,8 @@
|
||||
#endif
|
||||
@BINPATH@/dictionaries/*
|
||||
#ifdef XP_WIN32
|
||||
#ifndef WINCE
|
||||
@BINPATH@/uninstall/helper.exe
|
||||
#endif
|
||||
#endif
|
||||
|
||||
[xpcom]
|
||||
@BINPATH@/dependentlibs.list
|
||||
@ -58,9 +56,7 @@
|
||||
#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
|
||||
@ -205,9 +201,7 @@
|
||||
@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
|
||||
@ -583,25 +577,6 @@ bin/libfreebl_32int64_3.so
|
||||
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
|
||||
|
||||
@ -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
|
||||
@ -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;
|
||||
}
|
||||
@ -1,6 +0,0 @@
|
||||
LIBRARY "Setup"
|
||||
EXPORTS
|
||||
Install_Init @1
|
||||
Install_Exit @2
|
||||
Uninstall_Init @3
|
||||
Uninstall_Exit @4
|
||||
@ -164,20 +164,6 @@ 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))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user