mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 414624. Remove extra backslash from path to installed MozillaBuild. r=ted.mielczarek@gmail.com

This commit is contained in:
jwatt%jwatt.org 2008-02-04 13:02:19 +00:00
Родитель 512b761a2c
Коммит b20be373a8
4 изменённых файлов: 22 добавлений и 34 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

13
tools/build-environment/win32/start-msvc6.bat
Просмотреть файл

@ -1,15 +1,12 @@
@echo off
SET MOZ_MSVCVERSION=6
SET MOZBUILDDIR=%~dp0
SET MOZILLABUILDDRIVE=%~d0%
SET MOZILLABUILDPATH=%~p0%
SET MOZILLABUILD=%MOZILLABUILDDRIVE%%MOZILLABUILDPATH%
echo "Mozilla tools directory: %MOZILLABUILD%"
echo "Mozilla tools directory: %MOZBUILDDIR%"
REM Get MSVC paths
call "%MOZILLABUILD%\guess-msvc.bat"
call "%MOZBUILDDIR%guess-msvc.bat"
if "%VC6DIR%"=="" (
ECHO "Microsoft Visual C++ version 6 was not found. Exiting."
@ -18,7 +15,7 @@ if "%VC6DIR%"=="" (
)
REM For MSVC6, we use the "old" non-static moztools
set MOZ_TOOLS=%MOZILLABUILD%\moztools-180compat
set MOZ_TOOLS=%MOZBUILDDIR%moztools-180compat
rem append moztools to PATH
SET PATH=%PATH%;%MOZ_TOOLS%\bin
@ -27,4 +24,4 @@ rem Prepend MSVC paths
call "%VC6DIR%\Bin\vcvars32.bat"
cd "%USERPROFILE%"
start "MSYS Shell - MSVC6 Environment" "%MOZILLABUILD%\msys\bin\rxvt" -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn "Courier New" -tn msys -geometry 80x25 -e /bin/bash --login -i
start "MSYS Shell - MSVC6 Environment" "%MOZBUILDDIR%msys\bin\rxvt" -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn "Courier New" -tn msys -geometry 80x25 -e /bin/bash --login -i

13
tools/build-environment/win32/start-msvc71.bat
Просмотреть файл

@ -1,15 +1,12 @@
@echo off
SET MOZ_MSVCVERSION=7.1
SET MOZBUILDDIR=%~dp0
SET MOZILLABUILDDRIVE=%~d0%
SET MOZILLABUILDPATH=%~p0%
SET MOZILLABUILD=%MOZILLABUILDDRIVE%%MOZILLABUILDPATH%
echo "Mozilla tools directory: %MOZILLABUILD%"
echo "Mozilla tools directory: %MOZBUILDDIR%"
REM Get MSVC paths
call "%MOZILLABUILD%\guess-msvc.bat"
call "%MOZBUILDDIR%guess-msvc.bat"
if "%VC71DIR%"=="" (
ECHO "Microsoft Visual C++ version 7.1 was not found. Exiting."
@ -18,7 +15,7 @@ if "%VC71DIR%"=="" (
)
REM Use the "new" moztools-static
set MOZ_TOOLS=%MOZILLABUILD%\moztools
set MOZ_TOOLS=%MOZBUILDDIR%moztools
rem append moztools to PATH
SET PATH=%PATH%;%MOZ_TOOLS%\bin
@ -43,4 +40,4 @@ if defined MOZBUILD_USE_SDK (
)
cd "%USERPROFILE%"
start "MSYS Shell - MSVC7.1 Environment" "%MOZILLABUILD%\msys\bin\rxvt" -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn "Courier New" -tn msys -geometry 80x25 -e /bin/bash --login -i
start "MSYS Shell - MSVC7.1 Environment" "%MOZBUILDDIR%msys\bin\rxvt" -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn "Courier New" -tn msys -geometry 80x25 -e /bin/bash --login -i

15
tools/build-environment/win32/start-msvc8.bat
Просмотреть файл

@ -1,18 +1,15 @@
@echo off
SET MOZ_MSVCVERSION=8
SET MOZBUILDDIR=%~dp0
SET MOZILLABUILDDRIVE=%~d0%
SET MOZILLABUILDPATH=%~p0%
SET MOZILLABUILD=%MOZILLABUILDDRIVE%%MOZILLABUILDPATH%
echo "Mozilla tools directory: %MOZILLABUILD%"
echo "Mozilla tools directory: %MOZBUILDDIR%"
REM Get MSVC paths
call "%MOZILLABUILD%\guess-msvc.bat"
call "%MOZBUILDDIR%guess-msvc.bat"
REM Use the "new" moztools-static
set MOZ_TOOLS=%MOZILLABUILD%\moztools
set MOZ_TOOLS=%MOZBUILDDIR%moztools
rem append moztools to PATH
SET PATH=%PATH%;%MOZ_TOOLS%\bin
@ -50,9 +47,9 @@ if "%USESDK%"=="1" (
rem random VC paths which we don't want.
rem Add the atlthunk compat library to the end of our LIB
set PATH=%SDKDIR%\bin;%PATH%
set LIB=%SDKDIR%\lib;%LIB%;%MOZILLABUILD%\atlthunk_compat
set LIB=%SDKDIR%\lib;%LIB%;%MOZBUILDDIR%atlthunk_compat
set INCLUDE=%SDKDIR%\include;%SDKDIR%\include\atl;%INCLUDE%
)
cd "%USERPROFILE%"
start "MSYS Shell - MSVC8 Environment" "%MOZILLABUILD%\msys\bin\rxvt" -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn "Courier New" -tn msys -geometry 80x25 -e /bin/bash --login -i
start "MSYS Shell - MSVC8 Environment" "%MOZBUILDDIR%msys\bin\rxvt" -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn "Courier New" -tn msys -geometry 80x25 -e /bin/bash --login -i

15
tools/build-environment/win32/start-msvc9.bat
Просмотреть файл

@ -1,18 +1,15 @@
@echo off
SET MOZ_MSVCVERSION=9
SET MOZBUILDDIR=%~dp0
SET MOZILLABUILDDRIVE=%~d0%
SET MOZILLABUILDPATH=%~p0%
SET MOZILLABUILD=%MOZILLABUILDDRIVE%%MOZILLABUILDPATH%
echo "Mozilla tools directory: %MOZILLABUILD%"
echo "Mozilla tools directory: %MOZBUILDDIR%"
REM Get MSVC paths
call "%MOZILLABUILD%\guess-msvc.bat"
call "%MOZBUILDDIR%guess-msvc.bat"
REM Use the "new" moztools-static
set MOZ_TOOLS=%MOZILLABUILD%\moztools
set MOZ_TOOLS=%MOZBUILDDIR%moztools
rem append moztools to PATH
SET PATH=%PATH%;%MOZ_TOOLS%\bin
@ -44,9 +41,9 @@ if "%VC9DIR%"=="" (
rem random VC paths which we don't want.
rem Add the atlthunk compat library to the end of our LIB
set PATH=%SDKDIR%\bin;%PATH%
set LIB=%SDKDIR%\lib;%LIB%;%MOZILLABUILD%\atlthunk_compat
set LIB=%SDKDIR%\lib;%LIB%;%MOZBUILDDIR%atlthunk_compat
set INCLUDE=%SDKDIR%\include;%SDKDIR%\include\atl;%INCLUDE%
)
cd "%USERPROFILE%"
start "MSYS Shell - MSVC9 Environment" "%MOZILLABUILD%\msys\bin\rxvt" -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn "Courier New" -tn msys -geometry 80x25 -e /bin/bash --login -i
start "MSYS Shell - MSVC9 Environment" "%MOZBUILDDIR%msys\bin\rxvt" -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn "Courier New" -tn msys -geometry 80x25 -e /bin/bash --login -i