dist/bin/components is where all loadable components will be installed.
git-svn-id: svn://10.0.0.236/trunk@23058 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
df6e2353c4
commit
a6d34909ca
@ -63,10 +63,10 @@ $(LIBNSPR)
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\bin\$(DLLNAME).dll
|
||||
rm -f $(DIST)\bin\components\$(DLLNAME).dll
|
||||
rm -f $(DIST)\lib\$(DLLNAME).lib
|
||||
|
||||
|
||||
@ -62,9 +62,9 @@ LLIBS= \
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
libs:: $(DLL)
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\bin\$(DLLNAME).dll
|
||||
rm -f $(DIST)\bin\components\$(DLLNAME).dll
|
||||
rm -f $(DIST)\bin\$(DLLNAME).lib
|
||||
|
||||
@ -63,9 +63,9 @@ LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
libs:: $(DLL)
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\bin\$(DLLNAME).dll
|
||||
rm -f $(DIST)\bin\components\$(DLLNAME).dll
|
||||
rm -f $(DIST)\lib\$(DLLNAME).lib
|
||||
|
||||
@ -82,9 +82,9 @@ LCFLAGS = \
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\bin\$(DLLNAME).dll
|
||||
rm -f $(DIST)\bin\components\$(DLLNAME).dll
|
||||
rm -f $(DIST)\lib\$(DLLNAME).lib
|
||||
|
||||
@ -66,9 +66,9 @@ LCFLAGS = \
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\bin\$(DLLNAME).dll
|
||||
rm -f $(DIST)\bin\components\$(DLLNAME).dll
|
||||
rm -f $(DIST)\lib\$(DLLNAME).lib
|
||||
|
||||
@ -67,9 +67,9 @@ LCFLAGS = \
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\bin\$(DLLNAME).dll
|
||||
rm -f $(DIST)\bin\components\$(DLLNAME).dll
|
||||
rm -f $(DIST)\lib\$(DLLNAME).lib
|
||||
|
||||
@ -70,9 +70,9 @@ LCFLAGS = \
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\bin\$(DLLNAME).dll
|
||||
rm -f $(DIST)\bin\components\$(DLLNAME).dll
|
||||
rm -f $(DIST)\bin\$(DLLNAME).lib
|
||||
|
||||
@ -59,9 +59,9 @@ LLIBS= \
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
libs:: $(DLL)
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\bin\$(DLLNAME).dll
|
||||
rm -f $(DIST)\bin\components\$(DLLNAME).dll
|
||||
rm -f $(DIST)\bin\$(DLLNAME).lib
|
||||
|
||||
@ -67,7 +67,7 @@ LINCS= -I$(PUBLIC)\rdf \
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
|
||||
$(MAKE_INSTALL) ..\resources\sidebar.xul $(DIST)\bin\res\rdf
|
||||
$(MAKE_INSTALL) ..\resources\sidebar.css $(DIST)\bin\res\rdf
|
||||
|
||||
@ -71,9 +71,9 @@ EXPORTS= \
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).dll $(DIST)\bin
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).dll $(DIST)\bin\components
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).lib $(DIST)\lib
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(MODULE).lib
|
||||
rm -f $(DIST)\bin\$(MODULE).dll
|
||||
rm -f $(DIST)\bin\components\$(MODULE).dll
|
||||
|
||||
@ -1619,13 +1619,8 @@ nsresult nsRepository::AutoRegister(NSRegistrationInstant when,
|
||||
}
|
||||
#else
|
||||
//XXX get default pathlist from registry
|
||||
//XXX Temporary hack. Registering components from current directory
|
||||
#ifdef XP_UNIX
|
||||
//XXX Temporary hack. Registering components from components directory
|
||||
const char *defaultPathList = "./components";
|
||||
#else
|
||||
// XXX This will change to ./components very soon
|
||||
const char *defaultPathList = ".";
|
||||
#endif
|
||||
SyncComponentsInPathList(defaultPathList);
|
||||
#endif
|
||||
return (NS_OK);
|
||||
@ -1670,11 +1665,7 @@ nsresult nsRepository::SyncComponentsInDir(const char *dir)
|
||||
unsigned int n = strlen(fullname);
|
||||
if (n+1 < sizeof(fullname))
|
||||
{
|
||||
#ifdef XP_WIN
|
||||
fullname[n] = PR_GetDirectorySeparator();
|
||||
#else
|
||||
fullname[n] = '/';
|
||||
#endif
|
||||
n++;
|
||||
}
|
||||
char *filepart = fullname + n;
|
||||
|
||||
@ -1619,13 +1619,8 @@ nsresult nsRepository::AutoRegister(NSRegistrationInstant when,
|
||||
}
|
||||
#else
|
||||
//XXX get default pathlist from registry
|
||||
//XXX Temporary hack. Registering components from current directory
|
||||
#ifdef XP_UNIX
|
||||
//XXX Temporary hack. Registering components from components directory
|
||||
const char *defaultPathList = "./components";
|
||||
#else
|
||||
// XXX This will change to ./components very soon
|
||||
const char *defaultPathList = ".";
|
||||
#endif
|
||||
SyncComponentsInPathList(defaultPathList);
|
||||
#endif
|
||||
return (NS_OK);
|
||||
@ -1670,11 +1665,7 @@ nsresult nsRepository::SyncComponentsInDir(const char *dir)
|
||||
unsigned int n = strlen(fullname);
|
||||
if (n+1 < sizeof(fullname))
|
||||
{
|
||||
#ifdef XP_WIN
|
||||
fullname[n] = PR_GetDirectorySeparator();
|
||||
#else
|
||||
fullname[n] = '/';
|
||||
#endif
|
||||
n++;
|
||||
}
|
||||
char *filepart = fullname + n;
|
||||
|
||||
@ -91,9 +91,8 @@ OBJS = \
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).dll $(DIST)\bin
|
||||
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
|
||||
$(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).lib $(DIST)\lib
|
||||
$(MAKE_INSTALL) $(DLL) $(DIST)\bin
|
||||
$(MAKE_INSTALL) ..\xul\MailAppShell.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\MailAppShellNoTB.html $(DIST)\bin\res\samples
|
||||
$(MAKE_INSTALL) ..\xul\MailFrame.html $(DIST)\bin\res\samples
|
||||
@ -199,7 +198,7 @@ install:: $(DLL)
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(MODULE).lib
|
||||
rm -f $(DIST)\bin\$(MODULE).dll
|
||||
rm -f $(DIST)\bin\components\$(MODULE).dll
|
||||
rm -f $(DIST)\res\samples\MailAppShell.html
|
||||
rm -f $(DIST)\res\samples\MailAppShellNoTB.html
|
||||
rm -f $(DIST)\res\samples\MailFrame.html
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user