Bug 548788 - [Shredder] Trunk packaging shouting about a missing file: "config/printconfigsetting.py': [Errno 2] No such file or directory"; (Av1) 2+1 s/topsrcdir/MOZILLA_DIR/.

r=ted.mielczarek.
This commit is contained in:
Serge Gautherie 2010-03-03 11:12:28 +01:00
parent 89102af7cc
commit 1f439cdc7f
2 changed files with 3 additions and 3 deletions

View File

@ -163,9 +163,9 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME).crashreporter-symbols
TEST_PACKAGE = $(PKG_BASENAME).tests.tar.bz2
ifneq (,$(wildcard $(DIST)/bin/application.ini))
BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
else
BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
endif
MOZ_SOURCE_STAMP = $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)

View File

@ -92,7 +92,7 @@ ifdef MOZ_FASTSTART
CABARGS += -faststart
endif
VSINSTALLDIR ?= $(error VSINSTALLDIR not set, must be set to the Visual Studio install directory)
MAKE_CAB = $(PYTHON) $(topsrcdir)/build/package/wince/make_wince_cab.py \
MAKE_CAB = $(PYTHON) $(MOZILLA_DIR)/build/package/wince/make_wince_cab.py \
$(CABARGS) "$(VSINSTALLDIR)/SmartDevices/SDK/SDKTools/cabwiz.exe" \
"$(MOZ_PKG_DIR)" "$(MOZ_APP_DISPLAYNAME)" "$(PKG_PATH)$(PKG_BASENAME).cab"
endif