зеркало из https://github.com/mozilla/pjs.git
A bunch of things to get the BeOS build to work. Mostly
BeOS specific fixes, except for the change to nsinstall.c that ignores trailing "/." in the function mkdirs (as creating a "." dir fails under BeOS).
This commit is contained in:
Родитель
d9b9a5a8e5
Коммит
f96a5f0ec0
|
@ -116,6 +116,12 @@ mkdirs(char *path, mode_t mode)
|
|||
char *cp;
|
||||
struct stat sb;
|
||||
int res;
|
||||
int l;
|
||||
|
||||
/* strip trailing "/." */
|
||||
l = strlen(path);
|
||||
if(l > 1 && path[l - 1] == '.' && path[l - 2] == '/')
|
||||
path[l - 2] = 0;
|
||||
|
||||
while (*path == '/' && path[1] == '/')
|
||||
path++;
|
||||
|
|
|
@ -439,9 +439,9 @@ ifdef SHARED_LIBRARY
|
|||
# BeOS specific section: link against dependant shared libs
|
||||
#
|
||||
BEOS_LIB_LIST = $(shell cat $(topsrcdir)/dependencies.beos/$(LIBRARY_NAME).dependencies)
|
||||
BEOS_LINK_LIBS = $(foreach lib,$(BEOS_LIB_LIST),$(shell $(topsrcdir)/config/beos/checklib.sh $(DIST)/bin $(lib))) $(shell $(topsrcdir)/config/beos/appstub.sh $(DIST)/bin)
|
||||
BEOS_LINK_LIBS = $(foreach lib,$(BEOS_LIB_LIST),$(shell $(topsrcdir)/config/beos/checklib.sh $(DIST)/bin $(lib)))
|
||||
LDFLAGS += -L$(DIST)/bin $(BEOS_LINK_LIBS) $(NSPR_LIBS)
|
||||
EXTRA_DSO_LDOPTS += -L$(DIST)/bin $(BEOS_LINK_LIBS) $(NSPR_LIBS) $(DIST)/bin/_APP_
|
||||
EXTRA_DSO_LDOPTS += -L$(DIST)/bin $(BEOS_LINK_LIBS) $(NSPR_LIBS)
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
|
@ -53,12 +53,10 @@ CPPSRCS = \
|
|||
nsRadioButton.cpp \
|
||||
nsScrollbar.cpp \
|
||||
nsSound.cpp \
|
||||
nsTabWidget.cpp \
|
||||
nsTextAreaWidget.cpp\
|
||||
nsTextHelper.cpp \
|
||||
nsTextWidget.cpp \
|
||||
nsToolkit.cpp \
|
||||
nsTooltipWidget.cpp \
|
||||
nsWidgetFactory.cpp \
|
||||
nsWindow.cpp \
|
||||
$(NULL)
|
||||
|
|
|
@ -173,6 +173,16 @@ NS_METHOD nsMenu::SetAccessKey(const nsString &aText)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
/**
|
||||
* Set enabled state
|
||||
*
|
||||
*/
|
||||
NS_METHOD nsMenu::SetEnabled(PRBool aIsEnabled)
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
NS_METHOD nsMenu::AddItem(nsISupports * aItem)
|
||||
{
|
||||
|
@ -357,6 +367,12 @@ NS_METHOD nsMenu::GetNativeData(void ** aData)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
NS_METHOD nsMenu::SetNativeData(void * aData)
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
NS_METHOD nsMenu::AddMenuListener(nsIMenuListener * aMenuListener)
|
||||
{
|
||||
|
@ -374,11 +390,6 @@ NS_METHOD nsMenu::RemoveMenuListener(nsIMenuListener * aMenuListener)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_METHOD nsMenu::SetEnabled(PRBool aIsEnabled)
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
// nsIMenuListener interface
|
||||
//-------------------------------------------------------------------------
|
||||
|
|
|
@ -71,6 +71,7 @@ public:
|
|||
NS_IMETHOD RemoveItem(const PRUint32 aPos);
|
||||
NS_IMETHOD RemoveAll();
|
||||
NS_IMETHOD GetNativeData(void** aData);
|
||||
NS_IMETHOD SetNativeData(void * aData);
|
||||
NS_IMETHOD AddMenuListener(nsIMenuListener * aMenuListener);
|
||||
NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener);
|
||||
NS_IMETHOD SetEnabled(PRBool aIsEnabled);
|
||||
|
|
|
@ -417,6 +417,18 @@ NS_METHOD nsMenuItem::DoCommand()
|
|||
return rv;
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
NS_METHOD nsMenuItem::SetDOMNode(nsIDOMNode * aDOMNode)
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
NS_METHOD nsMenuItem::GetDOMNode(nsIDOMNode ** aDOMNode)
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
NS_METHOD nsMenuItem::SetDOMElement(nsIDOMElement * aDOMElement)
|
||||
{
|
||||
|
|
|
@ -67,6 +67,8 @@ public:
|
|||
|
||||
NS_IMETHOD SetCommand(const nsString & aStrCmd);
|
||||
NS_IMETHOD DoCommand();
|
||||
NS_IMETHOD SetDOMNode(nsIDOMNode * aDOMNode);
|
||||
NS_IMETHOD GetDOMNode(nsIDOMNode ** aDOMNode);
|
||||
NS_IMETHOD SetDOMElement(nsIDOMElement * aDOMElement);
|
||||
NS_IMETHOD GetDOMElement(nsIDOMElement ** aDOMElement);
|
||||
NS_IMETHOD SetWebShell(nsIWebShell * aWebShell);
|
||||
|
|
|
@ -42,8 +42,6 @@
|
|||
#include "nsMenuItem.h"
|
||||
#include "nsPopUpMenu.h"
|
||||
#endif
|
||||
#include "nsTabWidget.h"
|
||||
#include "nsTooltipWidget.h"
|
||||
#include "nsFontRetrieverService.h"
|
||||
|
||||
// Drag & Drop, Clipboard
|
||||
|
|
|
@ -22,7 +22,7 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
LIBRARY_NAME = timer_s
|
||||
LIBRARY_NAME = timer_beos
|
||||
|
||||
MODULE=timer
|
||||
|
||||
|
@ -36,8 +36,8 @@ CPPSRCS = \
|
|||
nsTimer.cpp \
|
||||
$(NULL)
|
||||
|
||||
MKSHLIB =
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
#MKSHLIB =
|
||||
#override NO_SHARED_LIB=1
|
||||
#override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
@ -48,6 +48,7 @@
|
|||
#include <sys/param.h>
|
||||
#include <OS.h>
|
||||
#include <image.h>
|
||||
#include "prenv.h"
|
||||
#endif
|
||||
|
||||
#include "plstr.h"
|
||||
|
|
Загрузка…
Ссылка в новой задаче