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"; die "copy $inConfigFiles/app.tag $gDirDistInstall/nsis";
system("cmd /C 7zipNSIS.bat"); 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"; print " done!\n\n";

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

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

124
toolkit/mozapps/installer/windows/nsis/options.ini
Просмотреть файл

@ -1,62 +1,62 @@
[Settings] [Settings]
NumFields=7 NumFields=7
[Field 1] [Field 1]
Type=label Type=label
Text=Choose the type of setup you prefer, then click Next. Text=Choose the type of setup you prefer, then click Next.
Left=0 Left=0
Right=-1 Right=-1
Top=0 Top=0
Bottom=10 Bottom=10
[Field 2] [Field 2]
Type=RadioButton Type=RadioButton
Text=&Standard Text=&Standard
Left=15 Left=15
Right=-1 Right=-1
Top=25 Top=25
Bottom=35 Bottom=35
State=1 State=1
Flags=GROUP Flags=GROUP
[Field 3] [Field 3]
Type=RadioButton Type=RadioButton
Text=&Complete Text=&Complete
Left=15 Left=15
Right=-1 Right=-1
Top=55 Top=55
Bottom=65 Bottom=65
State=0 State=0
[Field 4] [Field 4]
Type=RadioButton Type=RadioButton
Text=C&ustom Text=C&ustom
Left=15 Left=15
Right=-1 Right=-1
Top=85 Top=85
Bottom=95 Bottom=95
State=0 State=0
[Field 5] [Field 5]
Type=label Type=label
Text=Browser will be installed with the most common options. Text=Browser will be installed with the most common options.
Left=30 Left=30
Right=-1 Right=-1
Top=37 Top=37
Bottom=47 Bottom=47
[Field 6] [Field 6]
Type=label Type=label
Text=Browser will be installed with all available options. Text=Browser will be installed with all available options.
Left=30 Left=30
Right=-1 Right=-1
Top=67 Top=67
Bottom=77 Bottom=77
[Field 7] [Field 7]
Type=label Type=label
Text=You may choose individual options to be installed. Recommended for experienced\nusers. Text=You may choose individual options to be installed. Recommended for experienced\nusers.
Left=30 Left=30
Right=-1 Right=-1
Top=97 Top=97
Bottom=117 Bottom=117

76
toolkit/mozapps/installer/windows/nsis/shortcuts.ini
Просмотреть файл

@ -1,38 +1,38 @@
[Settings] [Settings]
NumFields=4 NumFields=4
[Field 1] [Field 1]
Type=label Type=label
Text=Create icons for Firefox: Text=Create icons for Firefox:
Left=0 Left=0
Right=-1 Right=-1
Top=5 Top=5
Bottom=15 Bottom=15
[Field 2] [Field 2]
Type=checkbox Type=checkbox
Text=On my &Desktop Text=On my &Desktop
Left=15 Left=15
Right=-1 Right=-1
Top=20 Top=20
Bottom=30 Bottom=30
State=1 State=1
Flags=GROUP Flags=GROUP
[Field 3] [Field 3]
Type=checkbox Type=checkbox
Text=In my &Start Menu Programs folder Text=In my &Start Menu Programs folder
Left=15 Left=15
Right=-1 Right=-1
Top=40 Top=40
Bottom=50 Bottom=50
State=1 State=1
[Field 4] [Field 4]
Type=checkbox Type=checkbox
Text=In my &Quick Launch bar Text=In my &Quick Launch bar
Left=15 Left=15
Right=-1 Right=-1
Top=60 Top=60
Bottom=70 Bottom=70
State=1 State=1