commit 26ede05f976d6e51bf1f51627b5572034667194e Author: Shondoit Walker shondoit@gmail.com Date: Fri Apr 13 23:34:06 2012 +0200

Changed the mozbuild installer sequence to directly install into our own directory. --- build-scripts/install-mozbuild.bat | 4 ++++ build-scripts/versions.mk | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build-scripts/install-mozbuild.bat b/build-scripts/install-mozbuild.bat new file mode 100644 index 0000000..8e5cdb8 --- /dev/null +++ b/build-scripts/install-mozbuild.bat @@ -0,0 +1,4 @@ +SET MOZBUILDSETUP=%1 +SET TARGETDIR=%2 +SET TARGETDIR=%TARGETDIR:/=% +"%MOZBUILDSETUP%" /S /D=%TARGETDIR% diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index f783ee0..d837576 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -211,10 +211,7 @@ $(FIREFOX_DIR): $(FETCH_DIR)/$(FIREFOX_PACKAGE) ../src/current-patches/firefox/*

$(MOZBUILD_DIR): $(FETCH_DIR)/$(MOZBUILD_PACKAGE) ../src/current-patches/mozilla-build/start-msvc.patch ../src/current-patches/mozilla-build/guess-msvc-x64.bat patch-mozilla-build.sh | $(BUILD_DIR) rm -rf $(MOZBUILD_DIR) /c/mozilla-build -# We could try passing a /D argument here, but then we'd need to convert -# mingw paths into windows paths. We'll just go with the default here. - cd $(FETCH_DIR) && cmd.exe /c "$(MOZBUILD_PACKAGE) /S" - mv /c/mozilla-build $(MOZBUILD_DIR) + cmd.exe //c "$(PWD)/install-mozbuild.bat" "$(abspath $(FETCH_DIR)/$(MOZBUILD_PACKAGE))" "$(abspath $(MOZBUILD_DIR))" # We have to patch mozillabuild cp ../src/current-patches/mozilla-build/start-msvc.patch $(MOZBUILD_DIR) cp ../src/current-patches/mozilla-build/guess-msvc-x64.bat $(MOZBUILD_DIR)