Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes for bugs 33542 and 41567, abandon res directory r=dveditz

Browse Source
This commit is contained in:
morse%netscape.com 2000-06-07 05:10:52 +00:00
parent 30142b627b
commit 1e4e128ca3
6 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/mac/NGLayoutBuildList.pm
View File

@ -504,7 +504,7 @@ sub MakeResourceAliases()
_InstallResources(":mozilla:gfx:src:MANIFEST", "$resource_dir"."gfx:");
_InstallResources(":mozilla:extensions:wallet:src:MANIFEST", "$resource_dir");
_InstallResources(":mozilla:extensions:wallet:src:MANIFEST", "$defaults_dir"."wallet:");
my($entitytab_dir) = "$resource_dir" . "entityTables";
_InstallResources(":mozilla:intl:unicharutil:tables:MANIFEST", "$entitytab_dir");

4
extensions/wallet/src/Makefile.in
View File

@ -40,7 +40,7 @@ CPPSRCS = \
nsBasicStreamGenerator.cpp \
$(NULL)
RES_FILES = \
DEFAULTS_FILES = \
$(srcdir)/DistinguishedSchema.tbl \
$(srcdir)/FieldSchema.tbl \
$(srcdir)/URLFieldSchema.tbl \
@ -61,6 +61,6 @@ EXTRA_DSO_LDOPTS = \
include $(topsrcdir)/config/rules.mk
install::
$(INSTALL) $(RES_FILES) $(DIST)/bin/res
$(INSTALL) $(DEFAULTS_FILES) $(DIST)/bin/defaults/wallet
$(INSTALL) $(CHROME_FILES) $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet

16
extensions/wallet/src/makefile.win
View File

@ -76,18 +76,18 @@ clobber::
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
rm -f $(DIST)\bin\components\$(DLLNAME).dll
rm -f $(DIST)\lib\$(DLLNAME).lib
rm -f $(DIST)\bin\res\DistinguishedSchema.tbl
rm -f $(DIST)\bin\res\FieldSchema.tbl
rm -f $(DIST)\bin\res\URLFieldSchema.tbl
rm -f $(DIST)\bin\res\SchemaConcat.tbl
rm -f $(DIST)\bin\defaults\wallet\DistinguishedSchema.tbl
rm -f $(DIST)\bin\defaults\wallet\FieldSchema.tbl
rm -f $(DIST)\bin\defaults\wallet\URLFieldSchema.tbl
rm -f $(DIST)\bin\defaults\wallet\SchemaConcat.tbl
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\cookie.properties
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\wallet.properties
install:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
$(MAKE_INSTALL) DistinguishedSchema.tbl $(DIST)\bin\res
$(MAKE_INSTALL) FieldSchema.tbl $(DIST)\bin\res
$(MAKE_INSTALL) URLFieldSchema.tbl $(DIST)\bin\res
$(MAKE_INSTALL) SchemaConcat.tbl $(DIST)\bin\res
$(MAKE_INSTALL) DistinguishedSchema.tbl $(DIST)\bin\defaults\wallet
$(MAKE_INSTALL) FieldSchema.tbl $(DIST)\bin\defaults\wallet
$(MAKE_INSTALL) URLFieldSchema.tbl $(DIST)\bin\defaults\wallet
$(MAKE_INSTALL) SchemaConcat.tbl $(DIST)\bin\defaults\wallet
$(MAKE_INSTALL) cookie.properties $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
$(MAKE_INSTALL) wallet.properties $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet

9
extensions/wallet/src/wallet.cpp
View File

@ -1493,13 +1493,14 @@ PUBLIC nsresult Wallet_ProfileDirectory(nsFileSpec& dirSpec) {
return res;
}
PUBLIC nsresult Wallet_ResourceDirectory(nsFileSpec& dirSpec) {
PUBLIC nsresult Wallet_DefaultsDirectory(nsFileSpec& dirSpec) {
nsIFileSpec* spec =
NS_LocateFileOrDirectory(nsSpecialFileSpec::App_ResDirectory);
NS_LocateFileOrDirectory(nsSpecialFileSpec::App_DefaultsFolder50);
if (!spec) {
return NS_ERROR_FAILURE;
}
nsresult res = spec->GetFileSpec(&dirSpec);
dirSpec += "wallet";
NS_RELEASE(spec);
return res;
}
@ -1655,7 +1656,7 @@ wallet_ReadFromFile
if (!strm.is_open()) {
if (!localFile) {
/* if we failed to download the file, see if an initial version of it exists */
rv = Wallet_ResourceDirectory(dirSpec);
rv = Wallet_DefaultsDirectory(dirSpec);
if (NS_FAILED(rv)) {
return;
}
@ -1782,7 +1783,7 @@ wallet_ReadFromURLFieldToSchemaFile
nsInputFileStream strm(dirSpec + filename);
if (!strm.is_open()) {
/* if we failed to download the file, see if an initial version of it exists */
rv = Wallet_ResourceDirectory(dirSpec);
rv = Wallet_DefaultsDirectory(dirSpec);
if (NS_FAILED(rv)) {
return;
}

8
xpinstall/packager/packages-unix
View File

@ -201,10 +201,10 @@ bin/defaults/profile/*
; bin/plugins/*
bin/searchplugins/*
bin/res/entityTables/*
bin/res/FieldSchema.tbl
bin/res/SchemaConcat.tbl
bin/res/URLFieldSchema.tbl
bin/res/DistinguishedSchema.tbl
bin/defaults/wallet/FieldSchema.tbl
bin/defaults/wallet/SchemaConcat.tbl
bin/defaults/wallet/URLFieldSchema.tbl
bin/defaults/wallet/DistinguishedSchema.tbl
bin/res/arrow.gif
bin/res/charsetalias.properties
bin/res/acceptlanguage.properties

8
xpinstall/packager/packages-win
View File

@ -199,10 +199,10 @@ bin\res\html.css
bin\res\ua.css
bin\res\quirk.css
bin\res\arrow.gif
bin\res\FieldSchema.tbl
bin\res\SchemaConcat.tbl
bin\res\URLFieldSchema.tbl
bin\res\DistinguishedSchema.tbl
bin\defaults\wallet\FieldSchema.tbl
bin\defaults\wallet\SchemaConcat.tbl
bin\defaults\wallet\URLFieldSchema.tbl
bin\defaults\wallet\DistinguishedSchema.tbl
bin\res\wincharset.properties
bin\res\charsetalias.properties
bin\res\charsetData.properties