зеркало из https://github.com/mozilla/gecko-dev.git
initial steps toward moving cvs pull information out of nglayout.mak.
Also, change pull_all to pull using module information instead of each directory individually.
This commit is contained in:
cltbld%netscape.com
Родитель
0f51bd0e95
Коммит
1ed17c58cd
274
client.mak
274
client.mak
|
|
@ -13,188 +13,134 @@
|
|||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
|
||||
DEPTH=.
|
||||
IGNORE_MANIFEST=1
|
||||
THIS_MAKEFILE=nglayout.mak
|
||||
THAT_MAKEFILE=makefile.win
|
||||
|
||||
# Enable builds from user defined top level directory.
|
||||
!if !defined(MOZ_TOP)
|
||||
#enable builds from changed top level directories
|
||||
MOZ_TOP=mozilla
|
||||
!endif
|
||||
|
||||
MODULAR_NETLIB=1
|
||||
NGLAYOUT_MAKEFILE=nglayout.mak
|
||||
NGLAYOUT_PLUGINS=1
|
||||
STANDALONE_IMAGE_LIB=1
|
||||
#
|
||||
# Command macro defines
|
||||
#
|
||||
|
||||
!if defined(MOZ_DATE)
|
||||
CVSCO = cvs -q co -P -D "$(MOZ_DATE)"
|
||||
!else
|
||||
CVSCO = cvs -q co -P
|
||||
!endif
|
||||
|
||||
CVSCO_TAG = cvs -q co -P
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#// Figure out how to do the pull.
|
||||
#//------------------------------------------------------------------------
|
||||
!if "$(MOZ_BRANCH)" != ""
|
||||
CVS_BRANCH=-r $(MOZ_BRANCH)
|
||||
HAVE_BRANCH=1
|
||||
# Branch tags we use
|
||||
|
||||
IMGLIB_BRANCH =
|
||||
PLUGIN_BRANCH =
|
||||
XPCOM_BRANCH =
|
||||
|
||||
!if defined(MOZ_DATE)
|
||||
# CVS commands to pull the appropriate branch versions
|
||||
CVSCO_LIBPREF = $(CVSCO)
|
||||
CVSCO_PLUGIN = $(CVSCO)
|
||||
!else
|
||||
HAVE_BRANCH=0
|
||||
# CVS commands to pull the appropriate branch versions
|
||||
CVSCO_LIBPREF = $(CVSCO) -A
|
||||
CVSCO_PLUGIN = $(CVSCO) -A
|
||||
!endif
|
||||
|
||||
!if "$(MOZ_DATE)" != ""
|
||||
CVS_BRANCH=-D "$(MOZ_DATE)"
|
||||
HAVE_DATE=1
|
||||
!else
|
||||
HAVE_DATE=0
|
||||
CVSCO_XPCOM = $(CVSCO)
|
||||
CVSCO_IMGLIB = $(CVSCO)
|
||||
CVSCO_RAPTOR = $(CVSCO)
|
||||
CVSCO_LIZARD = $(CVSCO)
|
||||
CVSCO_NETWORK = $(CVSCO)
|
||||
|
||||
|
||||
############################################################
|
||||
## This should really be in a different file, like client.mak
|
||||
## but it's OK here for now.
|
||||
|
||||
## Rules for pulling the source from the cvs repository
|
||||
############################################################
|
||||
|
||||
pull_and_build_all: pull_seamonkey build_seamonkey
|
||||
|
||||
pull_all: pull_seamonkey
|
||||
|
||||
pull_nglayout: pull_lizard pull_xpcom pull_imglib pull_netlib pull_nglayout \
|
||||
pull_editor
|
||||
|
||||
pull_seamonkey:
|
||||
cd $(MOZ_SRC)\.
|
||||
$(CVSCO_TAG) -r NSPRPUB_RELEASE_3_0 $(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_TAG) -r NSPRPUB_RELEASE_3_0 $(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
|
||||
!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
|
||||
|
||||
!if $(HAVE_DATE) && $(HAVE_BRANCH)
|
||||
ERR_MESSAGE=$(ERR_MESSAGE)^
|
||||
Cannot specify both MOZ_BRANCH and MOZ_DATE
|
||||
!endif
|
||||
pull_xpcom:
|
||||
@cd $(MOZ_SRC)\.
|
||||
$(CVSCO_XPCOM) $(MOZ_TOP)/modules/libreg
|
||||
$(CVSCO_XPCOM) $(MOZ_TOP)/xpcom
|
||||
|
||||
NMAKE=@nmake -nologo -$(MAKEFLAGS)
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Stuff a do complete pull and build
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
default:: build_all
|
||||
|
||||
pull_and_build_all:: pull_all \
|
||||
build_all
|
||||
|
||||
#// Do this when you pull a new tree, or else you will often get bugs
|
||||
#// when replaceing an old dist with a new dist.
|
||||
|
||||
pull_clobber_build_all:: pull_all \
|
||||
clobber_all \
|
||||
build_all
|
||||
|
||||
clobber_build_all:: clobber_all \
|
||||
build_all
|
||||
|
||||
pull_all:: pull_config pull_nglayout pull_client_source_product
|
||||
|
||||
pull_config:
|
||||
@cd $(MOZ_SRC)
|
||||
$(CVSCO) $(MOZ_TOP)/config
|
||||
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) $(MOZ_TOP)/$(NGLAYOUT_MAKEFILE)
|
||||
@cd $(MOZ_SRC)/$(MOZ_TOP)
|
||||
$(NMAKE) -f $(NGLAYOUT_MAKEFILE) pull_all $(NGLAYOUT_ENV_VARS)
|
||||
@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
|
||||
|
||||
############################################################
|
||||
|
||||
pull_client_source_product:
|
||||
@echo +++ client.mak: checking out the client with "$(CVS_BRANCH)"
|
||||
cd $(MOZ_SRC)\.
|
||||
-cvs -q co $(CVS_BRANCH) $(MOZ_TOP)/modules/softupdt
|
||||
|
||||
|
||||
build_all: build_nglayout
|
||||
# since we only need to use nglayout right now (soon to be fixed)
|
||||
# build_dist \
|
||||
# build_client
|
||||
|
||||
build_nglayout:
|
||||
cd $(MOZ_SRC)\$(MOZ_TOP)
|
||||
$(NMAKE) -f $(NGLAYOUT_MAKEFILE) $(NGLAYOUT_ENV_VARS)
|
||||
|
||||
build_dist:
|
||||
@echo +++ client.mak: building dist
|
||||
cd $(MOZ_SRC)\$(MOZ_TOP)
|
||||
$(NMAKE) -f makefile.win
|
||||
|
||||
|
||||
clobber_all:: clobber_nglayout
|
||||
|
||||
clobber_nglayout:
|
||||
cd $(MOZ_SRC)\$(MOZ_TOP)
|
||||
$(NMAKE) -f $(NGLAYOUT_MAKEFILE) clobber_all $(NGLAYOUT_ENV_VARS)
|
||||
|
||||
depend:
|
||||
-del /s /q make.dep
|
||||
$(NMAKE) -f makefile.win depend
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#// Utility stuff...
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
# Verify that MOZ_SRC is set correctly
|
||||
#//------------------------------------------------------------------------
|
||||
# Check to see if it is set at all
|
||||
|
||||
!if "$(MOZ_SRC)"!=""
|
||||
|
||||
#
|
||||
# create a temp file at the root and make sure it is visible from MOZ_SRC
|
||||
#
|
||||
!if [copy $(MAKEDIR)\client.mak $(MAKEDIR)\xyzzy.tmp > NUL] == 0
|
||||
!endif
|
||||
|
||||
!if !EXIST( $(MOZ_SRC)\$(MOZ_TOP)\xyzzy.tmp )
|
||||
ERR_MESSAGE=$(ERR_MESSAGE)^
|
||||
MOZ_SRC isn't set correctly: [$(MOZ_SRC)\$(MOZ_TOP)]!=[$(MAKEDIR)]
|
||||
!endif
|
||||
|
||||
!if [del $(MAKEDIR)\xyzzy.tmp]
|
||||
!endif
|
||||
|
||||
!else
|
||||
# MOZ_SRC isn't set at all
|
||||
ERR_MESSAGE=$(ERR_MESSAGE)^
|
||||
Environment variable MOZ_SRC isn't set.
|
||||
!endif
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
# Verify that MOZ_BITS is set
|
||||
#//------------------------------------------------------------------------
|
||||
!if !defined(MOZ_BITS)
|
||||
ERR_MESSAGE=$(ERR_MESSAGE)^
|
||||
Environment variable MOZ_BITS isn't set.
|
||||
!endif
|
||||
|
||||
!if !defined(MOZ_TOOLS)
|
||||
ERR_MESSAGE=$(ERR_MESSAGE)^
|
||||
Environment variable MOZ_TOOLS isn't set.
|
||||
!endif
|
||||
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#// Display error
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
|
||||
!if "$(ERR_MESSAGE)" != ""
|
||||
ERR_MESSAGE = ^
|
||||
client.mak: ^
|
||||
$(ERR_MESSAGE) ^
|
||||
^
|
||||
client.mak: usage^
|
||||
^
|
||||
nmake -f client.mak [MOZ_BRANCH=<cvs_branch_name>] ^
|
||||
[MOZ_DATE=<cvs_date>]^
|
||||
[pull_and_build_all]^
|
||||
[pull_all]^
|
||||
[pull_dist]^
|
||||
[pull_client]^
|
||||
[build_all]^
|
||||
[build_dist]^
|
||||
[build_ldap]^
|
||||
[build_client]^
|
||||
^
|
||||
Environment variables:^
|
||||
^
|
||||
MOZ_BITS set to either 32 or 16 ^
|
||||
MOZ_SRC set to the directory above $(MOZ_TOP) or "$(MAKEDIR)\.."^
|
||||
MOZ_TOOLS set to the directory containing the java compiler see ^
|
||||
http://warp/tools/nt^
|
||||
JAVA_HOME set to the same thing as MOZ_TOOLS^
|
||||
CVSROOT set to the public mozilla cvs server^
|
||||
|
||||
!ERROR $(ERR_MESSAGE)
|
||||
|
||||
!endif
|
||||
build_all: build_seamonkey
|
||||
|
||||
build_seamonkey:
|
||||
@cd $(MOZ_SRC)\mozilla\.
|
||||
nmake -f nglayout.mak all
|
||||
|
|
|
|||
32
nglayout.mak
32
nglayout.mak
|
|
@ -19,10 +19,13 @@ THIS_MAKEFILE=nglayout.mak
|
|||
THAT_MAKEFILE=makefile.win
|
||||
|
||||
!if !defined(MODULAR_NETLIB) || !defined(STANDALONE_IMAGE_LIB) || !defined(NGLAYOUT_PLUGINS)
|
||||
ERR_MSG = ^
|
||||
You need to set MODULAR_NETLIB=1, STANDALONE_IMAGE_LIB=1 ^
|
||||
and NGLAYOUT_PLUGINS=1 in your environment.
|
||||
!ERROR $(ERR_MSG)
|
||||
#ERR_MSG = ^
|
||||
#You need to set MODULAR_NETLIB=1, STANDALONE_IMAGE_LIB=1 ^
|
||||
#and NGLAYOUT_PLUGINS=1 in your environment.
|
||||
#!ERROR $(ERR_MSG)
|
||||
set MODULAR_NETLIB=1
|
||||
set STANDALONE_IMAGE_LIB=1
|
||||
set NGLAYOUT_PLUGINS=1
|
||||
!endif
|
||||
|
||||
!if !defined(MOZ_TOP)
|
||||
|
|
@ -63,6 +66,12 @@ IMGLIB_BRANCH =
|
|||
PLUGIN_BRANCH =
|
||||
XPCOM_BRANCH =
|
||||
|
||||
##############################
|
||||
## all this pull logic now exists in client.mak
|
||||
## which is the right place for it to be.
|
||||
## It should be removed from here as soon as practical
|
||||
##############################
|
||||
|
||||
!if defined(MOZ_DATE)
|
||||
# CVS commands to pull the appropriate branch versions
|
||||
CVSCO_LIBPREF = $(CVSCO)
|
||||
|
|
@ -170,11 +179,24 @@ $(DIST_DIRS) $(RAPTOR_DIRS)::
|
|||
|
||||
######################################################################
|
||||
|
||||
##############################
|
||||
## all this pull logic now exists in client.mak
|
||||
## which is the right place for it to be.
|
||||
## It should be removed from here as soon as practical
|
||||
##############################
|
||||
|
||||
# Rules for pulling the source from the cvs repository
|
||||
|
||||
pull_all: pull_lizard pull_xpcom pull_imglib pull_netlib pull_nglayout \
|
||||
pull_all: pull_seamonkey
|
||||
|
||||
pull_nglayout: pull_lizard pull_xpcom pull_imglib pull_netlib pull_nglayout \
|
||||
pull_editor
|
||||
|
||||
pull_seamonkey:
|
||||
cd $(MOZ_SRC)\.
|
||||
$(CVSCO_TAG) -r NSPRPUB_RELEASE_3_0 NSPR
|
||||
$(CVSCO_LIZARD) SeaMonkeyEditor
|
||||
|
||||
pull_lizard:
|
||||
cd $(MOZ_SRC)\.
|
||||
$(CVSCO_LIZARD) $(MOZ_TOP)/LICENSE
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче