Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-27 20:25:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for Bug 64650

Browse Source 
Give PSM suport for HP_UX
This commit is contained in:
javi%netscape.com 2001-01-25 21:08:59 +00:00
parent 30f850c289
commit b46fadeacd
5 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/psm/lib/nlslayer/nlslayer.cpp
View File

@ -60,9 +60,9 @@ static nsIUnicodeEncoder *encoderASCII = nsnull;
#define DOC_BUNDLE "resource:/psmdata/ui/psm_doc.properties"
extern "C" {
static nsIStringBundle* nlsCreateBundle(char* bundleURL);
static char* nlsGetUTF8StringFromBundle(nsIStringBundle *bundle, const char *name);
static nsIStringBundle * bundles[4] = {NULL, NULL, NULL, NULL};
nsIStringBundle* nlsCreateBundle(char* bundleURL);
char* nlsGetUTF8StringFromBundle(nsIStringBundle *bundle, const char *name);
nsIStringBundle * bundles[4] = {NULL, NULL, NULL, NULL};
}

24
security/psm/server/Makefile
View File

@ -36,7 +36,9 @@ else
INSTALL_JS = unix-install.js
endif
ifneq ($(OS_ARCH), WINNT)
# The following don't need a CPLUSPLUSRUNTIME defined: WINNT, HP-UX
# so filter them out.
ifeq (,$(filter WINNT HP-UX,$(OS_ARCH)))
ifeq ($(OS_ARCH), Linux)
# On linux, we link with libstdc++ (we're always using egcs on linux, right?)
CPLUSPLUSRUNTIME = -L /usr/lib -lstdc++ -lm
@ -65,13 +67,6 @@ OS_LIBS = -lpthread -ldl -lc
endif
endif
# Adding HP-UX Specific Fixes
ifeq ($(OS_ARCH), HP-UX)
ifdef USE_PTHREADS
OS_LIBS += -lpthread
endif
endif
#######################################################################
# (5) Execute "global" rules. (OPTIONAL) #
#######################################################################
@ -170,8 +165,11 @@ PROTOCOL_LIBS = -L$(MOZ_DIST)/lib -lprotocol
# Adding HP-UX Specific Fixes
ifeq ($(OS_ARCH), HP-UX)
NSPR_LINK_LIBS = -L$(DIST)/lib -shared -lnspr4 -lplc4 -lplds4
NSPR_LINK_LIBS = -L$(DIST)/lib -lnspr4 -lplc4 -lplds4
XPCOM_LINK_LIBS = -lxpcom
MKSHLIB = $(CCC) $(DSO_LDOPTS)
MKPROG = $(CCC)
endif
EXTRA_LIBS += \
@ -216,7 +214,7 @@ endif
install::
$(NSINSTALL) -m 644 $(UI_DIST)/psm*.properties $(DIST)/bin/psmdata/ui
$(NSINSTALL) -m 644 ../doc/*.gif ../doc/*.html ../doc/*.htm $(DIST)/bin/psmdata/doc
$(NSINSTALL) -m 644 $(DIST)/lib/$(DLL_PREFIX)nssckbi.$(DLL_SUFFIX) $(DIST)/bin
$(NSINSTALL) -m 755 $(DIST)/lib/$(DLL_PREFIX)nssckbi.$(DLL_SUFFIX) $(DIST)/bin
ifneq ($(OS_ARCH), WINNT)
$(NSINSTALL) -m 775 start-psm $(DIST)/bin
endif
@ -244,8 +242,8 @@ patch: $(PROGRAM)
build_xpi: $(PROGRAM)
$(NSINSTALL) -m 644 ../ui/$(PLATFORM)/psm*.properties xpi/psm/psmdata/ui
$(NSINSTALL) -m 644 ../doc/*.gif ../doc/*.html ../doc/*.htm xpi/psm/psmdata/doc
$(NSINSTALL) -m 644 $(XPCOM_LIBS) xpi/psm
$(NSINSTALL) -m 644 $(NSPR_LIBS) xpi/psm
$(NSINSTALL) -m 755 $(XPCOM_LIBS) xpi/psm
$(NSINSTALL) -m 755 $(NSPR_LIBS) xpi/psm
ifneq ($(OS_ARCH), WINNT)
$(NSINSTALL) -m 775 start-psm xpi/psm
endif
@ -256,7 +254,7 @@ ifeq ($(OS_ARCH), Linux)
cd $(PLATFORM); start-regxpcom
$(NSINSTALL) -m 644 $(PLATFORM)/component.reg xpi/psm
endif
$(NSINSTALL) -m 666 $(PLATFORM)/components/*.* xpi/psm/components
$(NSINSTALL) -m 777 $(PLATFORM)/components/*.* xpi/psm/components
cp $(INSTALL_JS) xpi/install.js
cd xpi; zip -T -r ../$(PLATFORM)/psm.xpi psm install.js
rm -rf xpi

6
security/psm/server/manifest.mn
View File

@ -53,13 +53,17 @@ CSRCS = \
profile.c \
prefs.c \
certsearch.c \
main.c \
psmmain.c \
autorenewal.c \
derprint.c \
msgthread.c \
sdrres.c \
$(NULL)
CPPSRCS = \
main.cpp \
$(NULL)
RESNAME = psm.rc
RES = $(PLATFORM)/psm.res

4
security/psm/server/start-psm
View File

@ -33,7 +33,11 @@
#
LD_LIBRARY_PATH=.:${LD_LIBRARY_PATH}
SHLIB_PATH=.:${SHLIB_PATH}
LIBPATH=.:${LIBPATH}
MOZILLA_FIVE_HOME=`pwd`
export LD_LIBRARY_PATH
export SHLIB_PATH
export LIBPATH
export MOZILLA_FIVE_HOME
exec ./psm

4
security/psm/server/start-regxpcom
View File

@ -33,7 +33,11 @@
#
LD_LIBRARY_PATH=.:${LD_LIBRARY_PATH}
SHLIB_PATH=.:${SHLIB_PATH}
LIBPATH=.:${LIBPATH}
MOZILLA_FIVE_HOME=`pwd`
export LD_LIBRARY_PATH
export SHLIB_PATH
export LIBPATH
export MOZILLA_FIVE_HOME
exec ./regxpcom