Updated: Installer script to version 2.6.5

InternalError503 · Mar 1, 2017 · 598c3bf · 598c3bf
1 parent 12d18d1
commit 598c3bf
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 17 deletions.
diff --git a/_Build/_Installer/app.config b/_Build/_Installer/app.config
@@ -1,6 +1,6 @@
 ;Script generated by 8pecxstudios.
 ;Copyright (c) 2012-2017 8pecxstudios
-;Script Version: 2.6.4
+;Script Version: 2.6.5
 
 ;Define our conditionals
 #define SignedInstall False

diff --git a/_Build/_Installer/files.inc b/_Build/_Installer/files.inc
@@ -1,13 +1,7 @@
 [Files]
-#if PackageType == "amd86" || PackageType == "amd64" || PackageType == "intel86" || PackageType == "intel64"
-Source: "{content}\browser\{#PackageType}\browser\components\browsercomps.dll"; DestDir: "{app}\browser\components"; Flags: ignoreversion signonce
-Source: "{content}\browser\{#PackageType}\browser\components\components.manifest"; DestDir: "{app}\browser\components"; Flags: ignoreversion
-#endif 
 Source: "{content}\browser\{#PackageType}\browser\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi"; DestDir: "{app}\browser\extensions"; Flags: ignoreversion
 Source: "{content}\browser\{#PackageType}\browser\features\CTR@8pecxstudios.com.xpi"; DestDir: "{app}\browser\features"; Tasks: cyberctr; Flags: promptifolder replacesameversion
-#if PackageType == "beta86" || PackageType == "beta64"
 Source: "{content}\browser\{#PackageType}\browser\features\disableSHA1rollout@mozilla.org.xpi"; DestDir: "{app}\browser\features"; Flags: promptifolder replacesameversion
-#endif 
 Source: "{content}\browser\{#PackageType}\browser\features\firefox@getpocket.com.xpi"; DestDir: "{app}\browser\features"; Tasks: pocket; Flags: promptifolder replacesameversion
 Source: "{content}\browser\{#PackageType}\browser\features\langpack-*@8pecxstudios.com.xpi"; DestDir: "{app}\browser\features"; Tasks: languages; Flags: promptifolder replacesameversion
 Source: "{content}\browser\{#PackageType}\browser\VisualElements\VisualElements_70.png"; DestDir: "{app}\browser\VisualElements"; Flags: ignoreversion
@@ -51,9 +45,6 @@ Source: "{content}\browser\{#PackageType}\omni.ja"; DestDir: "{app}"; Flags: ign
 Source: "{content}\browser\{#PackageType}\platform.ini"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{content}\browser\{#PackageType}\plugin-container.exe"; DestDir: "{app}"; Flags: ignoreversion signonce
 Source: "{content}\browser\{#PackageType}\plugin-hang-ui.exe"; DestDir: "{app}"; Flags: ignoreversion signonce
-#if PackageType == "amd86" || PackageType == "amd64" || PackageType == "intel86" || PackageType == "intel64"
-Source: "{content}\browser\{#PackageType}\precomplete"; DestDir: "{app}"; Flags: ignoreversion
-#endif
 Source: "{content}\browser\{#PackageType}\removed-files"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{content}\browser\{#PackageType}\softokn3.chk"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{content}\browser\{#PackageType}\softokn3.dll"; DestDir: "{app}"; Flags: ignoreversion signonce

diff --git a/_Build/_Installer/setup.inc b/_Build/_Installer/setup.inc
@@ -78,8 +78,4 @@ AllowNoIcons=yes
 WizardImageFile={#PackageBranding}\WizModernImage.bmp
 WizardSmallImageFile={#PackageBranding}\WizModernSmallImage.bmp
 OutputDir={#PackageOutPutPath}
-#if PackageType == "beta86" || PackageType == "beta64"
-MinVersion=0,6.1
-#else
-MinVersion=0,6.0sp2
-#endif
+MinVersion=0,6.1
diff --git a/_Build/_Installer/tasks.inc b/_Build/_Installer/tasks.inc
@@ -2,7 +2,7 @@
 ;Note when changing task ordering, Need to update array order for clean install checkbox in code section.
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 Name: "cleaninstall"; Description: "{cm:CleanInstallDescription}"; GroupDescription: "{cm:CleanInstallGroupDescription}"; Flags: dontinheritcheck unchecked
-Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
+Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.2
 Name: "cyberctr"; Description: "{cm:CyberCTRInstallDescription}"; GroupDescription: "{cm:SystemAddonsGroupDescription}"
 Name: "pocket"; Description: "{cm:PocketInstallDescription}"; GroupDescription: "{cm:SystemAddonsGroupDescription}"; Flags: unchecked
 Name: "languages"; Description: "{cm:LanguageInstallDescription}"; GroupDescription: "{cm:SystemAddonsGroupDescription}"
diff --git a/_Build/_InstallerConfig/app.config b/_Build/_InstallerConfig/app.config
@@ -1,6 +1,6 @@
 ;Script generated by 8pecxstudios.
 ;Copyright (c) 2012-2017 8pecxstudios
-;Script Version: 2.6.4
+;Script Version: 2.6.5
 
 ;Define our conditionals
 #define SignedInstall True