Skip to content

Commit

Permalink
Update _Build files
Browse files Browse the repository at this point in the history
Update: Language patches
Update: Language packager
Update: Chocolately files
Removed: Windows Vista support from installer
Adjusted: Installation files for Beta
  • Loading branch information
InternalError503 committed Feb 20, 2017
1 parent 3338200 commit 732d783
Show file tree
Hide file tree
Showing 16 changed files with 283 additions and 58 deletions.
2 changes: 1 addition & 1 deletion _Build/_Chocolately/package/cyberfox.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>cyberfox</id>
<version>51.0.1</version>
<version>51.0.3</version>
<title>Cyberfox</title>
<authors>8pecxstudios, toady</authors>
<owners>8pecxstudios, toady</owners>
Expand Down
2 changes: 1 addition & 1 deletion _Build/_Chocolately/package/tools/chocolateyInstall.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$packageName = 'cyberfox'
$installerType = 'exe'
$version = '51.0.1'
$version = '51.0.3'
$url = "https://8pecxstudios.com/download/latest/Cyberfox-${version}.en-US.win32.intel.exe"
$url64 = "https://8pecxstudios.com/download/latest/Cyberfox-${version}.en-US.win64-x86_64.intel.exe"
$silentArgs = '/VERYSILENT'
Expand Down
2 changes: 1 addition & 1 deletion _Build/_Installer/app.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;Script generated by 8pecxstudios.
;Copyright (c) 2012-2017 8pecxstudios
;Script Version: 2.6.1
;Script Version: 2.6.2

;Define our conditionals
#define SignedInstall False
Expand Down
4 changes: 4 additions & 0 deletions _Build/_Installer/files.inc
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
[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
Source: "{content}\browser\{#PackageType}\browser\features\firefox@getpocket.com.xpi"; DestDir: "{app}\browser\features"; Tasks: pocket; Flags: promptifolder replacesameversion
Expand Down Expand Up @@ -46,7 +48,9 @@ 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
Expand Down
4 changes: 3 additions & 1 deletion _Build/_Installer/installDelete.inc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[InstallDelete]
Type: filesandordirs; Name: "{app}\browser\components"
Type: filesandordirs; Name: "{app}\distribution"
Type: files; Name: "{app}\browser\features\CTR@8pecxstudios.com.xpi"
Type: files; Name: "{app}\browser\features\loop@mozilla.org.xpi"
Expand All @@ -10,4 +11,5 @@ Type: files; Name: "{app}\msvcp120.dll"
Type: files; Name: "{app}\sandboxbroker.dll"
Type: files; Name: "{app}\qipcap*.dll"
Type: files; Name: "{app}\vcomp120.dll"
Type: files; Name: "{app}\SHA512SUMS"
Type: files; Name: "{app}\SHA512SUMS"
Type: files; Name: "{app}\precomplete"
6 changes: 5 additions & 1 deletion _Build/_Installer/setup.inc
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,8 @@ AllowNoIcons=yes
WizardImageFile={#PackageBranding}\WizModernImage.bmp
WizardSmallImageFile={#PackageBranding}\WizModernSmallImage.bmp
OutputDir={#PackageOutPutPath}
MinVersion=0,6.0sp2
#if PackageType == "beta86" || PackageType == "beta64"
MinVersion=0,6.1
#else
MinVersion=0,6.0sp2
#endif
4 changes: 2 additions & 2 deletions _Build/_InstallerConfig/app.config
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
;Script generated by 8pecxstudios.
;Copyright (c) 2012-2017 8pecxstudios
;Script Version: 2.6.1
;Script Version: 2.6.2

;Define our conditionals
#define SignedInstall False
#define SignedInstall True
;Arch = i368 for x86 installers | Arch = amd64 for x64 installers
#define Arch "__ARCH__"
#define PackageType "__PACKAGE__"
Expand Down
40 changes: 40 additions & 0 deletions _Build/_Language/Language Autopacker Version Beta.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
@echo off
title Language Autopacker Version Beta: 1.1
ECHO&color 03
ECHO.###########################################################
ECHO.# #
ECHO.# Copyright(c) 2017 8pecxstudios #
ECHO.# --------------------------------------- #
ECHO.# #
ECHO.# 8pecxstudios #
ECHO.# #
ECHO.# --------------------------------------- #
ECHO.###########################################################
ECHO.
set DestinPath=%~DP0_XPI_Folder
set OutputPath=..\_Installation\LanguageB

if exist "%OutputPath%" (
del /q /f "%OutputPath%"
mkdir "%OutputPath%"
) else (
mkdir "%OutputPath%"
)

if not exist "..\_7ZipPortable\App\7-Zip\7za.exe" goto :exit
set SevenZip=..\_7ZipPortable\App\7-Zip\7za.exe

for /f %%f in ('dir /b "%DestinPath%"') do (
if exist "%DestinPath%\%%f\%%f" del "%DestinPath%\%%f\%%f"
%SevenZip% a -mmt -mx9 -tzip "%DestinPath%\%%f\langpack-%%~nf@8pecxstudios.com.xpi" "%DestinPath%\%%f\*"
copy /y "%DestinPath%\%%f\langpack-%%~nf@8pecxstudios.com.xpi" "%OutputPath%\"
del "%DestinPath%\%%f\langpack-%%~nf@8pecxstudios.com.xpi"
)

if exist "%OutputPath%\langpack-en-US@8pecxstudios.com.xpi" (
del "%OutputPath%\langpack-en-US@8pecxstudios.com.xpi"
)

:exit
popd
exit /b %ERRORLEVEL%
40 changes: 40 additions & 0 deletions _Build/_Language/Language Autopacker Version.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
@echo off
title Language Autopacker Version: 1.1
ECHO&color 03
ECHO.###########################################################
ECHO.# #
ECHO.# Copyright(c) 2017 8pecxstudios #
ECHO.# --------------------------------------- #
ECHO.# #
ECHO.# 8pecxstudios #
ECHO.# #
ECHO.# --------------------------------------- #
ECHO.###########################################################
ECHO.
set DestinPath=%~DP0_XPI_Folder
set OutputPath=..\_Installation\LanguageA

if exist "%OutputPath%" (
del /q /f "%OutputPath%"
mkdir "%OutputPath%"
) else (
mkdir "%OutputPath%"
)

if not exist "..\_7ZipPortable\App\7-Zip\7za.exe" goto :exit
set SevenZip=..\_7ZipPortable\App\7-Zip\7za.exe

for /f %%f in ('dir /b "%DestinPath%"') do (
if exist "%DestinPath%\%%f\%%f" del "%DestinPath%\%%f\%%f"
%SevenZip% a -mmt -mx9 -tzip "%DestinPath%\%%f\langpack-%%~nf@8pecxstudios.com.xpi" "%DestinPath%\%%f\*"
copy /y "%DestinPath%\%%f\langpack-%%~nf@8pecxstudios.com.xpi" "%OutputPath%\"
del "%DestinPath%\%%f\langpack-%%~nf@8pecxstudios.com.xpi"
)

if exist "%OutputPath%\langpack-en-US@8pecxstudios.com.xpi" (
del "%OutputPath%\langpack-en-US@8pecxstudios.com.xpi"
)

:exit
popd
exit /b %ERRORLEVEL%
67 changes: 67 additions & 0 deletions _Build/_Language/XPI Language Copy AllSearchplugins.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
@echo off

title XPI Language Modifiy All Searchplugins Version: 1.0
ECHO.
ECHO.###########################################################
ECHO.# #
ECHO.# Copyright(c) 2017 8pecxstudios #
ECHO.# --------------------------------------- #
ECHO.# #
ECHO.# 8pecxstudios #
ECHO.# #
ECHO.# --------------------------------------- #
ECHO.###########################################################
ECHO.
set CD=%~DP0
if not exist "_Searches" mkdir "_Searches"
set OutputPath=_Searches
set InputPath=_XPI_Folder
ECHO.
ECHO.###########################################################
ECHO.# #
ECHO.# Please Select Option #
ECHO.# --------------------------------------- #
ECHO.# #
ECHO.# Press 1 to Copy Searchplugins #
ECHO.# Press 2 to Update Searchplugins #
ECHO.# Press 3 to exit #
ECHO.# #
ECHO.# --------------------------------------- #
ECHO.###########################################################
ECHO.
ECHO.-----------
ECHO.1. Copy Searchplugins
ECHO.2. Update Searchplugins
ECHO.3. Exit.
ECHO.Any Key. Cancel.
ECHO.-----------
SET /P uin=Choose an option (1,2,3)?
if /i {%uin%}=={1} (goto :copinst)
if /i {%uin%}=={2} (goto :upinst)
if /i {%uin%}=={3} (goto :eof)
goto :eof


:copinst
if not exist %InputPath% goto :eof
cls
for /f %%f in ('dir /b "%InputPath%"') do (
mkdir "%OutputPath%\%%~nf"
copy /y "%InputPath%\%%f\browser\chrome\%%~nf\locale\browser\searchplugins\*.*" "%OutputPath%\%%~nf\"
del "%OutputPath%\%%~nf\duckduckgo.xml"
del "%OutputPath%\%%~nf\ixquick.xml"
del "%OutputPath%\%%~nf\list.json"
del "%OutputPath%\%%~nf\privatelee.xml"
del "%OutputPath%\%%~nf\qwant.xml"
del "%OutputPath%\%%~nf\startpage.xml"
del "%OutputPath%\%%~nf\unbubbleeu.xml"
del "%OutputPath%\%%~nf\youtube.xml"
)
exit /b %ERRORLEVEL%
:upinst
if not exist %InputPath% goto :eof
cls
for /f %%f in ('dir /b "%InputPath%"') do (
copy /y "%OutputPath%\%%~nf\*.*" "%InputPath%\%%f\browser\chrome\%%~nf\locale\browser\searchplugins\"
)
exit /b %ERRORLEVEL%
21 changes: 21 additions & 0 deletions _Build/_Language/XPI Language Copy Searchplugins.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
@echo off
title XPI Language Copy Searchplugins 1.0
ECHO.
ECHO.###########################################################
ECHO.# #
ECHO.# Copyright(c) 2017 8pecxstudios #
ECHO.# --------------------------------------- #
ECHO.# #
ECHO.# 8pecxstudios #
ECHO.# #
ECHO.# --------------------------------------- #
ECHO.###########################################################
ECHO.
if not exist "_XPI_Folder" goto :end
set InputPath=_XPI_Folder
set Plugins=_SearchPlugins

for /f %%f in ('dir /b "%InputPath%"') do (
copy /y "%Plugins%\*.*" "%InputPath%\%%f\browser\chrome\%%~nf\locale\browser\searchplugins\"
)
exit /b %ERRORLEVEL%
54 changes: 54 additions & 0 deletions _Build/_Language/XPI Language Modifiy list.JSON.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
@echo off

title XPI Language Modifiy list.json Version: 1.0
ECHO.
ECHO.###########################################################
ECHO.# #
ECHO.# Copyright(c) 2017 8pecxstudios #
ECHO.# --------------------------------------- #
ECHO.# #
ECHO.# 8pecxstudios #
ECHO.# #
ECHO.# --------------------------------------- #
ECHO.###########################################################
ECHO.
set CD=%~DP0
if not exist "_listJSON" mkdir "_listJSON"
set OutputPath=_listJSON
set InputPath=_XPI_Folder
ECHO.
ECHO.###########################################################
ECHO.# #
ECHO.# Please Select Option #
ECHO.# --------------------------------------- #
ECHO.# #
ECHO.# Press 1 to Copy list.json #
ECHO.# Press 2 to Update list.json #
ECHO.# Press 3 to exit #
ECHO.# #
ECHO.# --------------------------------------- #
ECHO.###########################################################
ECHO.
ECHO.-----------
ECHO.1. Copy list.json
ECHO.2. Update list.json
ECHO.3. Exit.
ECHO.Any Key. Cancel.
ECHO.-----------
SET /P uin=Choose an option (1,2,3)?
if /i {%uin%}=={1} (goto :copinst)
if /i {%uin%}=={2} (goto :upinst)
if /i {%uin%}=={3} (goto :eof)
goto :eof


:copinst
if not exist %InputPath% goto :eof
cls
for /f %%f in ('dir /b "%InputPath%"') do copy /y "%InputPath%\%%f\browser\chrome\%%~nf\locale\browser\searchplugins\list.json" "%OutputPath%\%%~nf.list.json"
exit /b %ERRORLEVEL%
:upinst
if not exist %InputPath% goto :eof
cls
for /f %%f in ('dir /b "%InputPath%"') do copy /y "%OutputPath%\%%~nf.list.json" "%InputPath%\%%f\browser\chrome\%%~nf\locale\browser\searchplugins\list.json"
exit /b %ERRORLEVEL%
Loading

0 comments on commit 732d783

Please sign in to comment.