diff --git a/_Build/_Chocolately/package/cyberfox.nuspec b/_Build/_Chocolately/package/cyberfox.nuspec index 535852e5a6..848aa61fe1 100644 --- a/_Build/_Chocolately/package/cyberfox.nuspec +++ b/_Build/_Chocolately/package/cyberfox.nuspec @@ -2,7 +2,7 @@ cyberfox - 51.0.1 + 51.0.3 Cyberfox 8pecxstudios, toady 8pecxstudios, toady diff --git a/_Build/_Chocolately/package/tools/chocolateyInstall.ps1 b/_Build/_Chocolately/package/tools/chocolateyInstall.ps1 index ff1ed51662..517ff5fc5b 100644 --- a/_Build/_Chocolately/package/tools/chocolateyInstall.ps1 +++ b/_Build/_Chocolately/package/tools/chocolateyInstall.ps1 @@ -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' diff --git a/_Build/_Installer/app.config b/_Build/_Installer/app.config index 02d08559b5..42e5e046f5 100644 --- 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.1 +;Script Version: 2.6.2 ;Define our conditionals #define SignedInstall False diff --git a/_Build/_Installer/files.inc b/_Build/_Installer/files.inc index 9b76880e32..ce144084a8 100644 --- a/_Build/_Installer/files.inc +++ b/_Build/_Installer/files.inc @@ -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 @@ -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 diff --git a/_Build/_Installer/installDelete.inc b/_Build/_Installer/installDelete.inc index 7711208b03..a6e9396f8b 100644 --- a/_Build/_Installer/installDelete.inc +++ b/_Build/_Installer/installDelete.inc @@ -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" @@ -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" \ No newline at end of file +Type: files; Name: "{app}\SHA512SUMS" +Type: files; Name: "{app}\precomplete" \ No newline at end of file diff --git a/_Build/_Installer/setup.inc b/_Build/_Installer/setup.inc index 2b7f3a0f14..515c123273 100644 --- a/_Build/_Installer/setup.inc +++ b/_Build/_Installer/setup.inc @@ -78,4 +78,8 @@ AllowNoIcons=yes WizardImageFile={#PackageBranding}\WizModernImage.bmp WizardSmallImageFile={#PackageBranding}\WizModernSmallImage.bmp OutputDir={#PackageOutPutPath} -MinVersion=0,6.0sp2 \ No newline at end of file +#if PackageType == "beta86" || PackageType == "beta64" +MinVersion=0,6.1 +#else +MinVersion=0,6.0sp2 +#endif \ No newline at end of file diff --git a/_Build/_InstallerConfig/app.config b/_Build/_InstallerConfig/app.config index 02d08559b5..37521b9285 100644 --- a/_Build/_InstallerConfig/app.config +++ b/_Build/_InstallerConfig/app.config @@ -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__" diff --git a/_Build/_Language/Language Autopacker Version Beta.cmd b/_Build/_Language/Language Autopacker Version Beta.cmd new file mode 100644 index 0000000000..c6eaa60602 --- /dev/null +++ b/_Build/_Language/Language Autopacker Version Beta.cmd @@ -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% \ No newline at end of file diff --git a/_Build/_Language/Language Autopacker Version.cmd b/_Build/_Language/Language Autopacker Version.cmd new file mode 100644 index 0000000000..2bb8c6c792 --- /dev/null +++ b/_Build/_Language/Language Autopacker Version.cmd @@ -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% \ No newline at end of file diff --git a/_Build/_Language/XPI Language Copy AllSearchplugins.cmd b/_Build/_Language/XPI Language Copy AllSearchplugins.cmd new file mode 100644 index 0000000000..83e91743b4 --- /dev/null +++ b/_Build/_Language/XPI Language Copy AllSearchplugins.cmd @@ -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% \ No newline at end of file diff --git a/_Build/_Language/XPI Language Copy Searchplugins.cmd b/_Build/_Language/XPI Language Copy Searchplugins.cmd new file mode 100644 index 0000000000..02b54e52a6 --- /dev/null +++ b/_Build/_Language/XPI Language Copy Searchplugins.cmd @@ -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% \ No newline at end of file diff --git a/_Build/_Language/XPI Language Modifiy list.JSON.cmd b/_Build/_Language/XPI Language Modifiy list.JSON.cmd new file mode 100644 index 0000000000..450c73da07 --- /dev/null +++ b/_Build/_Language/XPI Language Modifiy list.JSON.cmd @@ -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% \ No newline at end of file diff --git a/_Build/_Language/_Language-patches/en-US.bookmarks.html b/_Build/_Language/_Language-patches/en-US.bookmarks.html index 69db337740..85d6a0097f 100644 --- a/_Build/_Language/_Language-patches/en-US.bookmarks.html +++ b/_Build/_Language/_Language-patches/en-US.bookmarks.html @@ -1,28 +1,24 @@ + + - + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - -Bookmarks -

Bookmarks

+ +8pecxstudios +

8pecxstudios

-

-

Bookmarks Toolbar Folder

-
Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar -

-

Getting started -

-

8pecxstudios Cyberfox

-

-

Help and tutorials -
Support forums -
Stay up to date -
User reviews -
Notifications -
-

-

+

+

Bookmarks Toolbar Folder

+
Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar +

+

Getting Started +
Notifications +
+

8pecxstudios

+

+

Help and Tutorials +
Stay up to date +
User Reviews +
+
diff --git a/_Build/_Language/_Language-patches/pl.bookmarks.html b/_Build/_Language/_Language-patches/pl.bookmarks.html index 7a97cc73af..780d4b39ad 100644 --- a/_Build/_Language/_Language-patches/pl.bookmarks.html +++ b/_Build/_Language/_Language-patches/pl.bookmarks.html @@ -1,27 +1,24 @@ + + - + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - -Zakładki -

Zakładki

+ +8pecxstudios +

8pecxstudios

-

-

Pasek zakładek

-
Zakładki umieszczone w tym folderze będą widoczne na pasku zakładek -

-

Pierwsze kroki -

-

8pecxstudios Cyberfox

-

-

Pomoc i tutoriale -
Forum pomocy -
Bądź na bieżąco -
Recenzje użytkowników -
-

-

+

+

Pasek zakładek

+
Zakładki umieszczone w tym folderze będą widoczne na pasku zakładek +

+

Pierwsze kroki +
Pomoc i tutoriale +
+

8pecxstudios

+

+

Pomoc i tutoriale +
Bądź na bieżąco +
Recenzje użytkowników +
+
diff --git a/_Build/_Language/_Language-patches/ru.browser.dtd b/_Build/_Language/_Language-patches/ru.browser.dtd index afec5f9d78..2e97ef828c 100644 --- a/_Build/_Language/_Language-patches/ru.browser.dtd +++ b/_Build/_Language/_Language-patches/ru.browser.dtd @@ -177,8 +177,8 @@ - - + + diff --git a/_Build/license.txt b/_Build/license.txt index 24ad2a9213..eaf960bd9f 100644 --- a/_Build/license.txt +++ b/_Build/license.txt @@ -1,6 +1,6 @@ -Copyright (c) 2015 8pecxstudios +Copyright (c) 2012-2017 8pecxstudios -License for BuildInstallScript.exe | BuildISS.exe | GetHash-CL.exe +License for BuildInstallScript.exe | BuildISS.exe | GetHash-CL.exe | build_installer.exe | GenUpdateInfo.exe THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,