Commiting this from windows caused my special characters to disappear

This commit is contained in:
atotic 1998-05-22 06:35:58 +00:00
Родитель 13d04a09eb
Коммит f7c8c2e43f
1 изменённых файлов: 71 добавлений и 69 удалений

Просмотреть файл

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