Commit ff7a8893 authored by pavlov%netscape.com's avatar pavlov%netscape.com
Browse files

adding crypto stuff to the tip

parent 91e4635b
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ DIRS += \
		widget/timer \
		include \
		modules/libutil \
		security \
		netwerk \
		uriloader \
		intl \
+12 −0
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ netwerk/protocol/ftp/src/Makefile
netwerk/protocol/http/Makefile
netwerk/protocol/http/public/Makefile
netwerk/protocol/http/src/Makefile
netwerk/protocol/http/res/Makefile
netwerk/protocol/jar/Makefile
netwerk/protocol/jar/public/Makefile
netwerk/protocol/jar/src/Makefile
@@ -335,8 +336,13 @@ netwerk/protocol/resource/src/Makefile
netwerk/mime/Makefile
netwerk/mime/public/Makefile
netwerk/mime/src/Makefile
netwerk/security/Makefile
netwerk/security/browser/Makefile
netwerk/security/psm/Makefile
netwerk/socket/Makefile
netwerk/socket/base/Makefile
netwerk/socket/ssl/Makefile
netwerk/socket/tests/Makefile
netwerk/streamconv/Makefile
netwerk/streamconv/converters/Makefile
netwerk/streamconv/public/Makefile
@@ -638,6 +644,12 @@ embedding/browser/build/Makefile
embedding/browser/webBrowser/Makefile
embedding/browser/setup/Makefile

# Security Makefiles
security/Makefile
security/psm/Makefile
security/psm/lib/Makefile
security/psm/lib/client/Makefile
security/psm/lib/protocol/Makefile

# xpfe/browser/public/Makefile

+17 −2
Original line number Diff line number Diff line
@@ -117,6 +117,10 @@ pull_nspr:
      cd $(MOZ_SRC)\.
      $(CVSCO_NSPR) mozilla/nsprpub

pull_psm:
	cd $(MOZ_SRC)\.
	$(CVSCO_PSM) mozilla/security

# pull either layout only or seamonkey the browser
pull_layout:
	cd $(MOZ_SRC)\.
@@ -131,14 +135,19 @@ pull_seamonkey:
# nmake has to be hardcoded, or we have to depend on mozilla/config
# being pulled already to figure out what $(NMAKE) should be.

clobber_all: clobber_nspr clobber_seamonkey
clobber_all: clobber_nspr clobber_psm clobber_seamonkey

build_all: build_nspr build_seamonkey
build_all: build_nspr build_psm build_seamonkey

clobber_nspr:
	@cd $(MOZ_SRC)\$(MOZ_TOP)\nsprpub
	nmake -f makefile.win clobber_all

clobber_psm:
	@cd $(MOZ_SRC)\$(MOZ_TOP)\security
	nmake -f makefile.win clobber_all


clobber_seamonkey:
	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
	-rd /s /q dist
@@ -158,6 +167,10 @@ build_nspr:
	@cd $(MOZ_SRC)\$(MOZ_TOP)\nsprpub
	nmake -f makefile.win export

build_psm:
	@cd $(MOZ_SRC)\$(MOZ_TOP)\security
	nmake -f makefile.win export
		
build_seamonkey:
	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
	set DIST_DIRS=1
@@ -190,6 +203,8 @@ install:
export:
	@cd $(MOZ_SRC)\$(MOZ_TOP)\nsprpub
	nmake -f makefile.win export
	@cd $(MOZ_SRC)\$(MOZ_TOP)\security
	nmake -f makefile.win export
	@cd $(MOZ_SRC)\$(MOZ_TOP)\.
	set DIST_DIRS=1
	set LAYOUT_DIRS=1
+19 −0
Original line number Diff line number Diff line
@@ -145,6 +145,20 @@ else
endif


#######################################################################
# PSM client libs
#

PSM_CO_MODULE= mozilla/security
PSM_CO_FLAGS := -P
CVSCO_PSM    = cvs $(CVS_FLAGS) co $(PSM_CO_FLAGS)
PSM_CO_TAG   = SeaMonkey_M14_BRANCH

ifdef PSM_CO_TAG
  PSM_CO_FLAGS := $(PSM_CO_FLAGS) -r $(PSM_CO_TAG)
endif


#######################################################################
# NSPR
#
@@ -204,6 +218,11 @@ real_checkout:
	($(CVSCO_NSPR) $(NSPR_CO_MODULE) || touch cvs-failed.tmp) 2>&1 \
	  | tee -a $(CVSCO_LOGFILE); \
	if test -f cvs-failed.tmp; then exit 1; else true; fi; \
	: Checkout PSM client libs; \
	echo $(CVSCO_PSM) $(PSM_CO_MODULE); \
	($(CVSCO_PSM) $(PSM_CO_MODULE) || touch cvs-failed.tmp) 2>&1 \
	  | tee -a $(CVSCO_LOGFILE); \
	if test -f cvs-failed.tmp; then exit 1; else true; fi; \
	: Checkout the SeaMonkeyAll; \
	echo $(CVSCO) $(MOZ_CO_MODULE); \
	($(CVSCO) $(MOZ_CO_MODULE) || touch cvs-failed.tmp) 2>&1 \
+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ DIRS = \
  db                           \
  dbm                          \
  modules\libutil              \
  security                     \
  netwerk                      \
  widget\timer                 \
  js                           \
Loading