зеркало из https://github.com/mozilla/pjs.git
No bug
Not part of build Beginning work on OS/2 XPInstall wizard
This commit is contained in:
Родитель
97ddba8369
Коммит
fe8a47f12c
|
@ -1,58 +1,50 @@
|
|||
#
|
||||
# The contents of this file are subject to the Netscape Public
|
||||
# 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/NPL/
|
||||
#
|
||||
# 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 Mozilla Communicator client code,
|
||||
# released March 31, 1998.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Netscape Communications
|
||||
# Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1999 Netscape Communications Corporation. All
|
||||
#
|
||||
# The Original Code is mozilla.org code
|
||||
#
|
||||
# The Initial Developer of the Original Code is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 2001 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Contributor(s):
|
||||
# Sean Su <ssu@netscape.com>
|
||||
|
||||
DEPTH=../../../..
|
||||
DEPTH = ../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
MODULE = nsinstall
|
||||
PROGRAM = $(MODULE).exe
|
||||
RESFILE = $(MODULE).res
|
||||
|
||||
CSRCS = \
|
||||
adler32.c \
|
||||
infblock.c \
|
||||
infcodes.c \
|
||||
inffast.c \
|
||||
inflate.c \
|
||||
inftrees.c \
|
||||
infutil.c \
|
||||
uncompr.c \
|
||||
zutil.c \
|
||||
$(NULL)
|
||||
|
||||
CPPSRCS = nsinstall.cpp
|
||||
LCFLAGS= -UMOZILLA_CLIENT
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = nsinstall$(BIN_SUFFIX)
|
||||
RESFILE = nsinstall.res
|
||||
REQUIRES = $(ZLIB_REQUIRES)
|
||||
EXTRA_DSO_LIBS = mozz_s
|
||||
USE_NON_MT_LIBS = 1
|
||||
|
||||
CPPSRCS = \
|
||||
nsinstall.cpp \
|
||||
pplib.cpp \
|
||||
$(NULL)
|
||||
|
||||
|
||||
LIBS = $(EXTRA_DSO_LIBS)
|
||||
|
||||
NO_DIST_INSTALL = 1
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
docopy:
|
||||
cp $(topsrcdir)/modules/zlib/src/*.h .
|
||||
cp $(topsrcdir)/modules/zlib/src/*.c .
|
||||
|
||||
export:: docopy
|
||||
LDFLAGS += /PM:PM
|
||||
|
||||
libs:: $(PROGRAM)
|
||||
$(INSTALL) $(PROGRAM) $(DIST)/install
|
||||
|
@ -60,3 +52,5 @@ libs:: $(PROGRAM)
|
|||
install:: $(PROGRAM)
|
||||
$(SYSINSTALL) $(IFLAGS2) $(PROGRAM) $(DESTDIR)$(mozappdir)/install
|
||||
|
||||
clean clobber realclean clobber_all::
|
||||
$(RM) $(DIST)/install/$(PROGRAM)
|
||||
|
|
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
@ -21,7 +21,6 @@
|
|||
* Contributor(s):
|
||||
* Troy Chevalier <troy@netscape.com>
|
||||
* Sean Su <ssu@netscape.com>
|
||||
* IBM Corp.
|
||||
*/
|
||||
|
||||
#include "resource.h"
|
||||
|
@ -31,17 +30,16 @@
|
|||
// Dialog
|
||||
//
|
||||
|
||||
DLGTEMPLATE IDD_EXTRACTING DISCARDABLE
|
||||
DLGTEMPLATE IDD_EXTRACTING DISCARDABLE
|
||||
BEGIN
|
||||
DIALOG "Extracting...", IDD_EXTRACTING, 0, 202, 182, 50,
|
||||
WS_VISIBLE | FS_DLGBORDER | FS_SCREENALIGN,
|
||||
FCF_TITLEBAR | FCF_SYSMENU | FCF_NOMOVEWITHOWNER
|
||||
DIALOG "Extracting...", IDD_EXTRACTING, 0, 247, 200, 58,
|
||||
FS_DLGBORDER | FS_SCREENALIGN,
|
||||
FCF_TITLEBAR | FCF_SYSMENU
|
||||
PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
|
||||
BEGIN
|
||||
WINDOW "", FID_CLIENT, 0, 0, 0, 0, "NSExtracting", WS_VISIBLE
|
||||
BEGIN
|
||||
LTEXT "", IDC_STATUS, 9, 33, 149, 7, SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
|
||||
CONTROL "", IDC_GAUGE, 9, 16, 164, 9, "NSGauge", 0x0 | WS_VISIBLE
|
||||
END
|
||||
LTEXT "", IDC_STATUS, 6, 39, 188, 7, SS_TEXT | WS_VISIBLE
|
||||
SLIDER IDC_GAUGE, 6, 0, 200, 20, WS_VISIBLE | SLS_RIBBONSTRIP | SLS_READONLY
|
||||
CTLDATA 12, 0, 100, 0, 0, 0
|
||||
END
|
||||
END
|
||||
|
||||
|
@ -52,7 +50,7 @@ END
|
|||
|
||||
// Icon with lowest ID value placed first to ensure application icon
|
||||
// remains consistent on all systems.
|
||||
ICON 1 DISCARDABLE "nsinstall.ico"
|
||||
ICON 1 DISCARDABLE "nsinstall.ico"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
|
@ -68,3 +66,5 @@ BEGIN
|
|||
IDS_ERROR_OUT_OF_MEMORY "Out of memory!"
|
||||
END
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
* Contributor(s):
|
||||
* Troy Chevalier <troy@netscape.com>
|
||||
* Sean Su <ssu@netscape.com>
|
||||
* IBM Corp.
|
||||
*/
|
||||
|
||||
#define IDS_PROMPT 1
|
||||
|
@ -34,3 +33,4 @@
|
|||
#define IDC_STATUS 1001
|
||||
#define IDC_GAUGE 1002
|
||||
|
||||
#define ID_FILE_BASE 10000
|
||||
|
|
Загрузка…
Ссылка в новой задаче