Commit f998e452 authored by leaf%mozilla.org's avatar leaf%mozilla.org
Browse files

moving the client build into client.mak and toplevel makefile.win 

leaving nglayout.mak for cleanup by anyone who wants to do it.
parent bba30f20

client.mak

+24 −88
Original line number Diff line number Diff line
@@ -14,19 +14,26 @@ 
# Reserved.



DEPTH=.

IGNORE_MANIFEST=1

THIS_MAKEFILE=nglayout.mak

THAT_MAKEFILE=makefile.win



!if !defined(MOZ_TOP)

#enable builds from changed top level directories

MOZ_TOP=mozilla

!endif



#

# Arbitrary required defines (should probably just turn them on in the

#                              tree by default)



MODULAR_NETLIB = 1

STANDALONE_IMAGE_LIB = 1

NGLAYOUT_PLUGINS = 1



#

# Command macro defines

#



# let's be explicit about CVSROOT... some windows cvs clients

# are too stupid to correctly work without the -d option 

!if defined(MOZ_DATE)

CVSCO = cvs -q co -P -D "$(MOZ_DATE)"

!elseif defined(CVSROOT)
@@ -59,10 +66,14 @@ CVSCO_RAPTOR = $(CVSCO) 
CVSCO_LIZARD = $(CVSCO)

CVSCO_NETWORK = $(CVSCO)



# rules.mak include config.mak

include <$(DEPTH)\config\config.mak>



## The master target

############################################################

## This should really be in a different file, like client.mak

## but it's OK here for now.



pull_and_build_all: pull_all build_all





## Rules for pulling the source from the cvs repository

############################################################
@@ -71,96 +82,21 @@ pull_and_build_all: pull_all build_all 


pull_all: pull_seamonkey



pull_nglayout: pull_lizard pull_xpcom pull_imglib pull_netlib pull_nglayout \

pull_editor



pull_seamonkey:

	cd $(MOZ_SRC)\.

	$(CVSCO) $(MOZ_TOP)/nsprpub

	$(CVSCO_LIZARD) SeaMonkeyEditor



pull_lizard:

	cd $(MOZ_SRC)\.

	$(CVSCO_LIZARD) $(MOZ_TOP)/LICENSE

	$(CVSCO_LIZARD) $(MOZ_TOP)/LEGAL

	$(CVSCO_LIZARD) $(MOZ_TOP)/config

	$(CVSCO_LIZARD) $(MOZ_TOP)/dbm

	$(CVSCO_LIZARD) $(MOZ_TOP)/lib/liblayer

	$(CVSCO_LIZARD) $(MOZ_TOP)/modules/zlib

	$(CVSCO_LIZARD) $(MOZ_TOP)/modules/libutil

	$(CVSCO_LIZARD) $(MOZ_TOP)/nsprpub

	$(CVSCO_LIZARD) $(MOZ_TOP)/sun-java

	$(CVSCO_LIZARD) $(MOZ_TOP)/nav-java

	$(CVSCO_LIZARD) $(MOZ_TOP)/js

	$(CVSCO_LIZARD) $(MOZ_TOP)/modules/security/freenav

	$(CVSCO_LIBPREF) $(MOZ_TOP)/modules/libpref

	$(CVSCO_PLUGIN) $(MOZ_TOP)/modules/plugin

	$(CVSCO_LIZARD) $(MOZ_TOP)/modules/oji

	$(CVSCO_LIZARD) $(MOZ_TOP)/caps

        $(CVSCO_LIZARD) $(MOZ_TOP)/rdf

        $(CVSCO_LIZARD) $(MOZ_TOP)/intl

!if defined(NGPREFS)

	$(CVSCO_LIZARD) $(MOZ_TOP)/cmd/wincom

	$(CVSCO_LIZARD) $(MOZ_TOP)/cmd/winfe/defaults.h

	$(CVSCO_LIZARD) $(MOZ_TOP)/cmd/winfe/nsIDefaultBrowser.h

	$(CVSCO_LIZARD) $(MOZ_TOP)/cmd/winfe/prefs

!endif



pull_xpcom:

	@cd $(MOZ_SRC)\.

	$(CVSCO_XPCOM) $(MOZ_TOP)/modules/libreg 

	$(CVSCO_XPCOM) $(MOZ_TOP)/xpcom



pull_imglib:

	@cd $(MOZ_SRC)\.

	$(CVSCO_IMGLIB) $(MOZ_TOP)/jpeg

	$(CVSCO_IMGLIB) $(MOZ_TOP)/modules/libutil

	$(CVSCO_IMGLIB) $(MOZ_TOP)/modules/libimg 



pull_netlib:

	@cd $(MOZ_SRC)\.

	$(CVSCO_NETWORK) $(MOZ_TOP)/lib/xp

	$(CVSCO_NETWORK) $(MOZ_TOP)/lib/libpwcac

	$(CVSCO_NETWORK) $(MOZ_TOP)/network

	$(CVSCO_NETWORK) $(MOZ_TOP)/include



pull_nglayout:

	@cd $(MOZ_SRC)\.

	$(CVSCO_RAPTOR) $(MOZ_TOP)/base

	$(CVSCO_RAPTOR) $(MOZ_TOP)/dom

	$(CVSCO_RAPTOR) $(MOZ_TOP)/gfx

	$(CVSCO_RAPTOR) $(MOZ_TOP)/htmlparser

	$(CVSCO_RAPTOR) $(MOZ_TOP)/layout

	$(CVSCO_RAPTOR) $(MOZ_TOP)/view

	$(CVSCO_RAPTOR) $(MOZ_TOP)/webshell

	$(CVSCO_RAPTOR) $(MOZ_TOP)/widget

	$(CVSCO_RAPTOR) $(MOZ_TOP)/xpfe



pull_editor:

	@cd $(MOZ_SRC)\.

	$(CVSCO_RAPTOR) $(MOZ_TOP)/editor

	$(CVSCO) SeaMonkeyEditor



############################################################



clobber_all:: clobber_nglayout clobber_apprunner



clobber_apprunner:

	@cd $(MOZ_SRC)\mozilla\xpfe

	nmake -f makefile.win clobber



clobber_nglayout:

	@cd $(MOZ_SRC)\mozilla\.

	nmake -f nglayout.mak clobber_all $(NGLAYOUT_ENV_VARS)

clobber_all:

	@cd $(MOZ_SRC)\$(MOZ_TOP)\.

	$(NMAKE) -f makefile.win clobber_all 



depend:

	nmake -f nglayout.mak depend $(NGLAYOUT_ENV_VARS)

	@cd $(MOZ_SRC)\$(MOZ_TOP)\.

	$(NMAKE) -f makefile.win depend 



build_all: build_seamonkey build_apprunner



build_seamonkey:

build_all:

	@cd $(MOZ_SRC)\mozilla\.

	nmake -f nglayout.mak all



build_apprunner:

	@cd $(MOZ_SRC)\mozilla\xpfe\.

	nmake -f makefile.win
 
	$(NMAKE) -f makefile.win all

makefile.win

+41 −81
Original line number Diff line number Diff line
@@ -15,14 +15,14 @@ 


#//------------------------------------------------------------------------

#//

#// Makefile to build the NS tree

#// Toplevel windows Makefile to build the mozilla tree

#//

#//------------------------------------------------------------------------



#//------------------------------------------------------------------------

#//

#// Specify the depth of the current directory relative to the

#// root of NS

#// root of mozilla

#//

#//------------------------------------------------------------------------

DEPTH=.
@@ -34,82 +34,54 @@ DEPTH=. 
#// 

#// DIRS          - There are subdirectories to process

#//

#// netcast needs to be before sun-java so marimba.* package is available

#// to netscape.netcast.* - spider

#//------------------------------------------------------------------------



!ifdef MOZ_SECURITY

SECDIR=security

!else

SECDIR=

!endif



DISTDIRS=$(NSPRDIR) dbm $(SECDIR) xpcom base caps



!if "$(WATCOM)" != ""

XTRADIRS = $(DISTDIRS)

!endif



!if "$(MOZ_BITS)" == "32"

DIRS_JSD = js\jsd

XTRADIRS = $(DISTDIRS)

!endif



!ifdef MOZ_SECURITY

CORECONF=coreconf

!else

CORECONF=

!endif



DIRS = \

!ifdef MOZILLA_OFFICIAL

config $(CORECONF) $(XTRADIRS) lib network include jpeg modules\zlib \

!else

    $(CORECONF) $(XTRADIRS) lib network include jpeg modules\zlib \

!endif

!ifdef MOZ_NETCAST

    netcast \

!endif

  config			\

  dbm				\

  nsprpub			\

  include			\

  jpeg				\

  modules\libreg		\

  xpcom				\

  modules\zlib			\

  modules\libutil		\

  sun-java			\

!ifdef MOZ_LDAP

    ldap \

!endif

!ifdef MOZ_JAVA

    ifc js nav-java \

!else

    nav-java js \

!endif

!ifdef MOZ_IFC_TOOLS

    ifc\tools \

!endif

!ifdef MOZ_JAVA

    $(DIRS_JSD) \

!endif

    privacy lib modules cmd



!if "$(STAND_ALONE_JAVA)" == "1"

!if "$(OS_TARGET)" == "WINNT"

#// When we build stand alone java with OS_TARGET == WINNT for

#// nspr20, we do a gmake separately outside of makefile.win

#// hence no NSPRDIR - sudu

DIRS=jpeg modules\zlib sun-java ifc js ifc\tools sun-java\java

!else

DIRS=$(NSPRDIR) jpeg modules\zlib sun-java ifc js ifc\tools sun-java\java

!endif

!endif 



!ifdef NSWINDBGMALLOC

LLFLAGS= $(LLFLAGS)                 \

        /EXPORT:malloc=ns_malloc    \

        /EXPORT:realloc=ns_realloc  \

        /EXPORT:calloc=ns_calloc    \

        /EXPORT:free=ns_free        \

        /EXPORT:_strdup=ns_strdup

  js				\

  modules\security\freenav	\

  modules\libpref		\

  modules\libimg		\

  modules\plugin		\

  modules\oji		\

  base                          \

  intl                          \

  caps                          \

  lib\xp			\

  lib\libpwcac			\

  network			\

!if defined(NGPREFS)

  cmd\wincom			\

  cmd\winfe\prefs		\

!endif

# the following are associated with the layout engine

  editor 			\

  expat				\

  htmlparser			\

  gfx				\

  dom				\

  view				\

  widget			\

  layout			\

  rdf                           \

  silentdl                      \

  webshell			\

  xpfe				\

  $(NULL)



!ifdef SERVER_BUILD

LLIBS=$(DIST)/lib/httpdlw.lib $(DIST)/lib/libsjboot.lib

!endif



#//------------------------------------------------------------------------

#//
@@ -117,15 +89,3 @@ LLIBS=$(DIST)/lib/httpdlw.lib $(DIST)/lib/libsjboot.lib 
#//

#//------------------------------------------------------------------------

include <$(DEPTH)\config\rules.mak>
 


#LCFLAGS=-D_USE_PR_DEBUG_MEMORY $(LCFLAGS)



export::

!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)

    $(MAKE_INSTALL) $(GLOWDIR)\glowcode.dll $(DIST)\bin

!endif



clobber_all::

    cd $(DEPTH)

    $(RM_R) dist