diff --git a/nglayout.mac b/nglayout.mac index 46e39ae6490..9761e4b668a 100644 --- a/nglayout.mac +++ b/nglayout.mac @@ -48,53 +48,53 @@ CVSCO_LIZARD = {CVSCO} # standalone nglayout test program. The order is important. The # DIST_DIRS need to be built before the RAPTOR_DIRS. -DIST_DIRS = - nsprpub - include - jpeg - "modules/libreg" - xpcom - "modules/zlib" - "modules/libutil" - sun-java - nav-java - js - "modules/security/freenav" - "modules/libpref" - "modules/libimg" - base - "lib/xp" +DIST_DIRS = + nsprpub + include + jpeg + "modules/libreg" + xpcom + "modules/zlib" + "modules/libutil" + sun-java + nav-java + js + "modules/security/freenav" + "modules/libpref" + "modules/libimg" + base + "lib/xp" "lib/libnet" # The list of directories to build the nglayout layout engine and # related libraries. -RAPTOR_DIRS = - htmlparser - dom - gfx - view - widget - layout +RAPTOR_DIRS = + htmlparser + dom + gfx + view + widget + layout webshell # Main rules -all all_dist all_nglayout +all all_dist all_nglayout -export export_dist export_nglayout +export export_dist export_nglayout -libs libs_dist libs_nglayout +libs libs_dist libs_nglayout -install install_dist install_nglayout +install install_dist install_nglayout -depend depend_dist depend_nglayout +depend depend_dist depend_nglayout -clobber clobber_dist clobber_nglayout +clobber clobber_dist clobber_nglayout cd {MOZ_SRC}\{MOZ_TOP} -rd /s /q dist -clobber_all clobber_all_dist clobber_all_nglayout +clobber_all clobber_all_dist clobber_all_nglayout cd {MOZ_SRC}\{MOZ_TOP} -rd /s /q dist @@ -102,7 +102,7 @@ clobber_all # Rule to build subdirectories -{DIST_DIRS} {RAPTOR_DIRS} +{DIST_DIRS} {RAPTOR_DIRS} #!if "{WINOS}" == "WIN95" # @echo +++ make: cannot recursively make on win95 using command.com, use w95make. #!else @@ -116,9 +116,9 @@ clobber_all # Rules for pulling the source from the cvs repository -pull_all pull_lizard pull_xpcom pull_imglib pull_netlib pull_nglayout pull_mac +pull_all pull_lizard pull_xpcom pull_imglib pull_netlib pull_nglayout pull_mac -pull_lizard +pull_lizard cd {MOZ_SRC} {CVSCO_LIZARD} "{MOZ_TOP}/LICENSE" {CVSCO_LIZARD} "{MOZ_TOP}/LEGAL" @@ -133,24 +133,24 @@ pull_lizard {CVSCO_LIZARD} "{MOZ_TOP}/modules/security/freenav" {CVSCO_XPCOM} "{MOZ_TOP}/modules/libpref" -pull_xpcom +pull_xpcom cd {MOZ_SRC} {CVSCO_XPCOM} "{MOZ_TOP}/modules/libreg" {CVSCO_XPCOM} "{MOZ_TOP}/xpcom" -pull_imglib +pull_imglib cd {MOZ_SRC} {CVSCO_IMGLIB} "{MOZ_TOP}/jpeg" {CVSCO_IMGLIB} "{MOZ_TOP}/modules/libutil" {CVSCO_IMGLIB} "{MOZ_TOP}/modules/libimg" -pull_netlib +pull_netlib cd {MOZ_SRC} {CVSCO_NETLIB} "{MOZ_TOP}/lib/xp" {CVSCO_NETLIB} "{MOZ_TOP}/lib/libnet" {CVSCO_NETLIB} "{MOZ_TOP}/include" -pull_nglayout +pull_nglayout cd {MOZ_SRC} {CVSCO_RAPTOR} "{MOZ_TOP}/base" {CVSCO_RAPTOR} "{MOZ_TOP}/dom" @@ -161,101 +161,103 @@ pull_nglayout {CVSCO_RAPTOR} "{MOZ_TOP}/webshell" {CVSCO_RAPTOR} "{MOZ_TOP}/widget" -pull_mac +pull_mac cd {MOZ_SRC} {CVSCO_LIZARD} "{MOZ_TOP}/build/mac" {CVSCO_LIZARD} "{MOZ_TOP}/cmd/macfe" {CVSCO_LIZARD} "{MOZ_TOP}/lib/mac/MacMemoryAllocator" {CVSCO_LIZARD} "{MOZ_TOP}/lib/mac/NSStdLib" + {CVSCO_LIZARD} "{MOZ_TOP}/lib/mac/MoreFiles" + {CVSCO_LIZARD} "{MOZ_TOP}/lib/mac/NSRuntime" ###################################################################### # Build rules for the "dist" portion. The "dist" contains those things # which are imported by the nglayout test programs. -all_dist +all_dist @cd {MOZ_SRC}\{MOZ_TOP} {NMAKE} -f {THIS_MAKEFILE} export_dist {NMAKE} -f {THIS_MAKEFILE} libs_dist {NMAKE} -f {THIS_MAKEFILE} install_dist -export_dist +export_dist set MAKE_ARGS export -export_dist {DIST_DIRS} +export_dist {DIST_DIRS} -libs_dist +libs_dist set MAKE_ARGS libs -libs_dist {DIST_DIRS} +libs_dist {DIST_DIRS} -install_dist +install_dist set MAKE_ARGS install -install_dist {DIST_DIRS} +install_dist {DIST_DIRS} -depend_dist +depend_dist set MAKE_ARGS depend -depend_dist {DIST_DIRS} +depend_dist {DIST_DIRS} -clobber_dist +clobber_dist set MAKE_ARGS clobber -clobber_dist {DIST_DIRS} +clobber_dist {DIST_DIRS} -clobber_all_dist +clobber_all_dist set MAKE_ARGS clobber_all -clobber_all_dist {DIST_DIRS} +clobber_all_dist {DIST_DIRS} ###################################################################### # Build rules for the "nglayout" portion. This builds the nglayout software # including the sample webshell viewer application. -all_nglayout +all_nglayout cd {MOZ_SRC}\{MOZ_TOP} {NMAKE} -f {THIS_MAKEFILE} export_nglayout {NMAKE} -f {THIS_MAKEFILE} libs_nglayout {NMAKE} -f {THIS_MAKEFILE} install_nglayout -export_nglayout +export_nglayout set MAKE_ARGS export -export_nglayout {RAPTOR_DIRS} +export_nglayout {RAPTOR_DIRS} -libs_nglayout +libs_nglayout set MAKE_ARGS libs -libs_nglayout {RAPTOR_DIRS} +libs_nglayout {RAPTOR_DIRS} -install_nglayout +install_nglayout set MAKE_ARGS install -install_nglayout {RAPTOR_DIRS} +install_nglayout {RAPTOR_DIRS} -depend_nglayout +depend_nglayout set MAKE_ARGS=depend -depend_nglayout {RAPTOR_DIRS} +depend_nglayout {RAPTOR_DIRS} -clobber_nglayout +clobber_nglayout set MAKE_ARGS=clobber -clobber_all_nglayout +clobber_all_nglayout set MAKE_ARGS=clobber_all -clobber_all_nglayout {RAPTOR_DIRS} +clobber_all_nglayout {RAPTOR_DIRS} ###################################################################### # Build nglayout Doc++ documentation DOCXX = {MOZ_TOOLS}\bin\docxx -DOCXX_RAPTOR = {DOCXX} -H -A -p -f -B c \fake_banner-file_name -j -a +DOCXX_RAPTOR = {DOCXX} -H -A -p -f -B c \fake_banner-file_name -j -a DOCXX_DESTDIR = {MOZ_SRC}\{MOZ_TOP}\dist\documentation -doc_nglayout +doc_nglayout -rm -rf {DOCXX_DESTDIR} -@mkdir {DOCXX_DESTDIR} @for %d in (nglayout xpcom img dom netlib} do \ @@ -278,15 +280,15 @@ TARBALL_ZIP = {MOZ_SRC}\win-{DATE}.zip TARFILES = mozilla README\\nglayout -tarballs tarball_zip tarball_gz +tarballs tarball_zip tarball_gz -tarball_zip prepare_for_tarballing +tarball_zip prepare_for_tarballing @echo Making {TARBALL_ZIP} cd {MOZ_SRC} rm -f {TARBALL_ZIP} {ZIP} -9 -r -q {TARBALL_ZIP} {TARFILES} -tarball_gz prepare_for_tarballing +tarball_gz prepare_for_tarballing @echo Making {TARBALL} cd {MOZ_SRC} rm -f {TARBALL} {TARBALL}.gz @@ -294,5 +296,5 @@ tarball_gz @echo Making gzip of {TARBALL} {GZIP} -9 -q {TARBALL} -prepare_for_tarballing +prepare_for_tarballing {NMAKE} -f {THIS_MAKEFILE} clobber clobber_all