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

actually address review comments from Bug 326580 - Firefox 2.0 Windows Installer. r=bsmedberg

This commit is contained in:
rob_strong%exchangecode.com 2006-05-22 23:08:15 +00:00
Родитель 47817668ff
Коммит 0091ebc465
4 изменённых файлов: 122 добавлений и 114 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
toolkit/mozapps/installer/windows/install_sub.pl
Просмотреть файл

@ -292,8 +292,12 @@ sub BuildPlatformInstaller
die "copy $inConfigFiles/app.tag $gDirDistInstall/nsis";
system("cmd /C 7zipNSIS.bat");
move("$gDirDistInstall/nsis/SetupGeneric.exe", "$gDirDistInstall/nsis/$seiFileNameSpecific") ||
die "move $gDirDistInstall/nsis/SetupGeneric.exe $gDirDistInstall/nsis/$seiFileNameSpecific";
# Temporary name change to include -nsis before .exe
$nsisFileNameSpecific = $seiFileNameSpecific;
$nsisFileNameSpecific =~ s/\.exe$/-nsis\.exe/;
move("$gDirDistInstall/nsis/SetupGeneric.exe", "$gDirDistInstall/nsis/$nsisFileNameSpecific") ||
die "move $gDirDistInstall/nsis/SetupGeneric.exe $gDirDistInstall/nsis/$nsisFileNameSpecific";
}
print " done!\n\n";

28
toolkit/mozapps/installer/windows/nsis/installer.nsi
Просмотреть файл

@ -665,21 +665,25 @@ Section /o "Quality Feedback Agent" Section3
SectionEnd
Function install_inspector
${RemoveDir} "$INSTDIR\extensions\extensions\inspector@mozilla.org"
ClearErrors
${LogHeader} "Installing Developer Tools"
StrCpy $R0 "$EXEDIR\optional\extensions\inspector@mozilla.org"
StrCpy $R1 "$INSTDIR\extensions\inspector@mozilla.org"
Call DoCopyFiles
${If} ${FileExists} "$EXEDIR\optional\extensions\inspector@mozilla.org"
${RemoveDir} "$INSTDIR\extensions\extensions\inspector@mozilla.org"
ClearErrors
${LogHeader} "Installing Developer Tools"
StrCpy $R0 "$EXEDIR\optional\extensions\inspector@mozilla.org"
StrCpy $R1 "$INSTDIR\extensions\inspector@mozilla.org"
Call DoCopyFiles
${EndIf}
FunctionEnd
Function install_talkback
${RemoveDir} "$INSTDIR\extensions\extensions\talkback@mozilla.org"
ClearErrors
${LogHeader} "Installing Quality Feedback Agent"
StrCpy $R0 "$EXEDIR\optional\extensions\talkback@mozilla.org"
StrCpy $R1 "$INSTDIR\extensions\talkback@mozilla.org"
Call DoCopyFiles
${If} ${FileExists} "$EXEDIR\optional\extensions\talkback@mozilla.org"
${RemoveDir} "$INSTDIR\extensions\extensions\talkback@mozilla.org"
ClearErrors
${LogHeader} "Installing Quality Feedback Agent"
StrCpy $R0 "$EXEDIR\optional\extensions\talkback@mozilla.org"
StrCpy $R1 "$INSTDIR\extensions\talkback@mozilla.org"
Call DoCopyFiles
${EndIf}
FunctionEnd
Section "Uninstall"