Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-13 11:38:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 680636 - Execute nsinstall.py as Python module under PyMake; r=khuey

Browse Source
This commit is contained in:
Gregory Szorc 2011-08-22 19:32:51 +01:00
parent 24449bb83a
commit 0da575fa20
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/config.mk
View File

@ -672,6 +672,9 @@ endif
PWD := $(CURDIR)
endif
ifdef .PYMAKE
NSINSTALL = %nsinstall nsinstall
else
ifdef NSINSTALL_BIN
NSINSTALL = $(NSINSTALL_BIN)
else
@ -681,7 +684,7 @@ else
NSINSTALL = $(CONFIG_TOOLS)/nsinstall$(HOST_BIN_SUFFIX)
endif # OS2
endif # NSINSTALL_BIN
endif # .PYMAKE
ifeq (,$(CROSS_COMPILE)$(filter-out WINNT OS2, $(OS_ARCH)))
INSTALL = $(NSINSTALL)

2
config/nsinstall.py
View File

@ -101,7 +101,7 @@ def nsinstall(argv):
sys.exit(1)
if options.m:
os.chmod(args[0], options.m)
sys.exit()
return 0
if options.m:
os.makedirs(args[0], options.m)
else:

5
js/src/config/config.mk
View File

@ -672,6 +672,9 @@ endif
PWD := $(CURDIR)
endif
ifdef .PYMAKE
NSINSTALL = %nsinstall nsinstall
else
ifdef NSINSTALL_BIN
NSINSTALL = $(NSINSTALL_BIN)
else
@ -681,7 +684,7 @@ else
NSINSTALL = $(CONFIG_TOOLS)/nsinstall$(HOST_BIN_SUFFIX)
endif # OS2
endif # NSINSTALL_BIN
endif # .PYMAKE
ifeq (,$(CROSS_COMPILE)$(filter-out WINNT OS2, $(OS_ARCH)))
INSTALL = $(NSINSTALL)

2
js/src/config/nsinstall.py
View File

@ -101,7 +101,7 @@ def nsinstall(argv):
sys.exit(1)
if options.m:
os.chmod(args[0], options.m)
sys.exit()
return 0
if options.m:
os.makedirs(args[0], options.m)
else: