Skip to content

Commit e2769c3

Browse files
jakub-kockajakub-kocka
authored
Merge pull request #249 from leeebo/feat/add_jihulab_git_mirror
feat(mirror): add Jihulab as optional git repo
2 parents 4068d48 + 9ec0a84 commit e2769c3

12 files changed

+50
-18
lines changed

‎src/InnoSetup/Configuration.iss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ var
3939
IsGithubSiteReachable: Boolean;
4040
IsAmazonS3SiteReachable: Boolean;
4141
IsGiteeSiteReachable: Boolean;
42+
IsJihulabSiteReachable: Boolean;
4243
4344
function GetConfigurationString(Key: String; Default: String):String;
4445
var Value: String;

‎src/InnoSetup/Environment.iss‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,13 +371,21 @@ begin
371371
if NeedToClone then
372372
begin
373373
374-
if (WizardIsComponentSelected('{#COMPONENT_OPTIMIZATION_GITEE_MIRROR}')) then begin
374+
if (WizardIsComponentSelected('{#COMPONENT_OPTIMIZATION_GIT_MIRROR_GITEE}')) then begin
375375
GitUseMirror := True;
376376
IsGitRecursive := False;
377377
GitRepository := 'https://gitee.com/EspressifSystems/esp-idf.git';
378378
GitSubmoduleUrl := 'https://gitee.com/esp-submodules/';
379379
end;
380380
381+
if (WizardIsComponentSelected('{#COMPONENT_OPTIMIZATION_GIT_MIRROR_JIHULAB}')) then begin
382+
{ The jihulab using same relative path as the official mirror,
383+
process the same way as from the GitHub }
384+
GitUseMirror := False;
385+
IsGitRecursive := True;
386+
GitRepository := 'https://jihulab.com/esp-mirror/espressif/esp-idf.git';
387+
end;
388+
381389
CmdLine := GitExecutablePath + ' clone --progress -b ' + IDFDownloadVersion;
382390
383391
if (WizardIsComponentSelected('{#COMPONENT_OPTIMIZATION_GIT_SHALLOW}')) then begin

‎src/InnoSetup/IdfToolsSetup.iss‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,9 @@
150150
#define COMPONENT_TARGET_ESP32_S2 = "target/esp32s/s2"
151151
#define COMPONENT_OPTIMIZATION = 'optimization'
152152
#define COMPONENT_OPTIMIZATION_ESPRESSIF_DOWNLOAD = 'optimization/espressif_download'
153-
#define COMPONENT_OPTIMIZATION_GITEE_MIRROR = 'optimization/gitee_mirror'
153+
#define COMPONENT_OPTIMIZATION_GIT_MIRROR = 'optimization/git_mirror'
154+
#define COMPONENT_OPTIMIZATION_GIT_MIRROR_JIHULAB = 'optimization/git_mirror/jihulab_mirror'
155+
#define COMPONENT_OPTIMIZATION_GIT_MIRROR_GITEE = 'optimization/git_mirror/gitee_mirror'
154156
#define COMPONENT_OPTIMIZATION_GIT_SHALLOW = 'optimization/git_shallow'
155157

156158
[Setup]
@@ -326,7 +328,9 @@ Name: "{#COMPONENT_TARGET_ESP32_S3}"; Description: {cm:ComponentTargetEsp32s3};
326328
#if OFFLINE == 'no'
327329
Name: "{#COMPONENT_OPTIMIZATION}"; Description: {cm:ComponentOptimization}; Types: custom;
328330
Name: "{#COMPONENT_OPTIMIZATION_ESPRESSIF_DOWNLOAD}"; Description: {cm:ComponentOptimizationEspressifDownload}; Types: full custom; Flags: checkablealone
329-
Name: "{#COMPONENT_OPTIMIZATION_GITEE_MIRROR}"; Description: {cm:ComponentOptimizationGiteeMirror}; Types: custom; Flags: checkablealone
331+
Name: "{#COMPONENT_OPTIMIZATION_GIT_MIRROR}"; Description: {cm:ComponentOptimizationGitMirror}; Types: custom;
332+
Name: "{#COMPONENT_OPTIMIZATION_GIT_MIRROR_JIHULAB}"; Description: {cm:ComponentOptimizationJihulabMirror}; Types: custom; Flags: checkablealone exclusive
333+
Name: "{#COMPONENT_OPTIMIZATION_GIT_MIRROR_GITEE}"; Description: {cm:ComponentOptimizationGiteeMirror}; Types: custom; Flags: checkablealone exclusive
330334
Name: "{#COMPONENT_OPTIMIZATION_GIT_SHALLOW}"; Description: {cm:ComponentOptimizationGitShallow}; Types: full custom; Flags: checkablealone
331335
#endif
332336

‎src/InnoSetup/Languages/IdfToolsSetup_cs-CZ.isl‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@ SystemCheckUnableToDetermine=není možno určit
155155
SystemVersionTooLow=Příliš stará verze operačního systému. Použijte podporovanou verzi Windows.
156156
WindowsVersion=Verze Windows
157157
SystemCheckAlternativeMirror=Test alternativního zrcadla
158-
ComponentOptimizationGiteeMirror=Git zrcadlo gitee.com/EspressifSystems/esp-idf
158+
ComponentOptimizationGitMirror=Git Mirror
159+
ComponentOptimizationGiteeMirror=Git mirror gitee.com/EspressifSystems/esp-idf
160+
ComponentOptimizationJihulabMirror=Git mirror jihulab.com/esp-mirror/espressif/esp-idf/
159161
ComponentOptimizationGitShallow=Klon jedné větve (--single-branch)
160162
SummaryComponents=Komponenty
161163
SummaryDrivers=Ovladače

‎src/InnoSetup/Languages/IdfToolsSetup_en-US.isl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@ SystemCheckUnableToDetermine=unable to determine
155155
SystemVersionTooLow=Too old version of operating system. Please use supported version of Windows.
156156
WindowsVersion=Windows version
157157
SystemCheckAlternativeMirror=Testing alternative mirror
158+
ComponentOptimizationGitMirror=Git Mirror
158159
ComponentOptimizationGiteeMirror=Git mirror gitee.com/EspressifSystems/esp-idf
160+
ComponentOptimizationJihulabMirror=Git mirror jihulab.com/esp-mirror/espressif/esp-idf/
159161
ComponentOptimizationGitShallow=Single branch clone (--single-branch)
160162
SummaryComponents=Components
161163
SummaryDrivers=Drivers

‎src/InnoSetup/Languages/IdfToolsSetup_es-ES.isl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ SystemCheckUnableToDetermine=unable to determine
156156
SystemVersionTooLow=Too old version of operating system. Please use supported version of Windows.
157157
WindowsVersion=Windows version
158158
SystemCheckAlternativeMirror=Testing alternative mirror
159+
ComponentOptimizationGitMirror=Git Mirror
159160
ComponentOptimizationGiteeMirror=Git mirror gitee.com/EspressifSystems/esp-idf
161+
ComponentOptimizationJihulabMirror=Git mirror jihulab.com/esp-mirror/espressif/esp-idf/
160162
ComponentOptimizationGitShallow=Single branch clone (--single-branch)
161163
SummaryComponents=Components
162164
SummaryDrivers=Drivers

‎src/InnoSetup/Languages/IdfToolsSetup_pt-BR.isl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ SystemCheckUnableToDetermine=unable to determine
156156
SystemVersionTooLow=Too old version of operating system. Please use supported version of Windows.
157157
WindowsVersion=Windows version
158158
SystemCheckAlternativeMirror=Testing alternative mirror
159+
ComponentOptimizationGitMirror=Git Mirror
159160
ComponentOptimizationGiteeMirror=Git mirror gitee.com/EspressifSystems/esp-idf
161+
ComponentOptimizationJihulabMirror=Git mirror jihulab.com/esp-mirror/espressif/esp-idf/
160162
ComponentOptimizationGitShallow=Single branch clone (--single-branch)
161163
SummaryComponents=Components
162164
SummaryDrivers=Drivers

‎src/InnoSetup/Languages/IdfToolsSetup_pt-PT.isl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ SystemCheckUnableToDetermine=unable to determine
156156
SystemVersionTooLow=Too old version of operating system. Please use supported version of Windows.
157157
WindowsVersion=Windows version
158158
SystemCheckAlternativeMirror=Testing alternative mirror
159+
ComponentOptimizationGitMirror=Git Mirror
159160
ComponentOptimizationGiteeMirror=Git mirror gitee.com/EspressifSystems/esp-idf
161+
ComponentOptimizationJihulabMirror=Git mirror jihulab.com/esp-mirror/espressif/esp-idf/
160162
ComponentOptimizationGitShallow=Single branch clone (--single-branch)
161163
SummaryComponents=Components
162164
SummaryDrivers=Drivers

‎src/InnoSetup/Languages/IdfToolsSetup_sk-SK.isl‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@ SystemCheckUnableToDetermine=nie je možné určiť
155155
SystemVersionTooLow=Príliš stará verzia operačného systému. Použite podporovanú verziu Windows.
156156
WindowsVersion=Verzia Windows
157157
SystemCheckAlternativeMirror=Test alternatívneho zrkadla
158-
ComponentOptimizationGiteeMirror=Git zrkadlo gitee.com/EspressifSystems/esp-idf
158+
ComponentOptimizationGitMirror=Git Mirror
159+
ComponentOptimizationGiteeMirror=Git mirror gitee.com/EspressifSystems/esp-idf
160+
ComponentOptimizationJihulabMirror=Git mirror jihulab.com/esp-mirror/espressif/esp-idf/
159161
ComponentOptimizationGitShallow=Klon jednej vetvy (--single-branch)
160162
SummaryComponents=Komponenty
161163
SummaryDrivers=Ovládače

‎src/InnoSetup/Languages/IdfToolsSetup_zh-CN.isl‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -152,18 +152,20 @@ SystemCheckToolsPathSpecialCharacter=系统代码页面设置为 65001，工具
152152
SystemCheckTmpPathSpecialCharacter=系统代码页面设置为 65001，环境变量 TMP 包含特殊字符。由于 JRE 的限制，当 TMP 包含特殊字符时，Espressif-IDE 无法运行。请将 TMP 变量放置于不包含特殊字符的路径，并重试安装。
153153
SystemCheckActiveCodePage=活动代码页：
154154
SystemCheckUnableToDetermine=无法确定
155-
SystemVersionTooLow=Too old version of operating system. Please use supported version of Windows.
156-
WindowsVersion=Windows version
157-
SystemCheckAlternativeMirror=Testing alternative mirror
158-
ComponentOptimizationGiteeMirror=Git mirror gitee.com/EspressifSystems/esp-idf
159-
ComponentOptimizationGitShallow=Single branch clone (--single-branch)
155+
SystemVersionTooLow=Windows 操作系统版本过旧或不支持。请使用支持的版本。
156+
WindowsVersion=Windows 版本
157+
SystemCheckAlternativeMirror=测试备选镜像
158+
ComponentOptimizationGitMirror=Git 镜像
159+
ComponentOptimizationGiteeMirror=Git 镜像 (码云) gitee.com/EspressifSystems/esp-idf
160+
ComponentOptimizationJihulabMirror=Git 镜像 (极狐) jihulab.com/esp-mirror/espressif/esp-idf/
161+
ComponentOptimizationGitShallow=仅克隆当前分支 (--single-branch)
160162
SummaryComponents=Components
161-
SummaryDrivers=Drivers
163+
SummaryDrivers=驱动程序
162164
SummaryTargets=Targets
163-
SummaryOptimization=Optimization
164-
ComponentToitJaguar=Toit language support - Jaguar live reloading tool (jag.exe)
165-
InstallingToit=Installing Toit language
165+
SummaryOptimization=优化下载
166+
ComponentToitJaguar=Toit 语言支持 - Jaguar live reloading tool (jag.exe)
167+
InstallingToit=正在安装 Toit 语言
166168
ComponentJdk=Amazon Corretto 11 JDK
167-
SettingEnvironmentVariable=Setting environment variable
168-
SystemCheckEnvironmentVariables=Environment variables
169-
SystemCheckPathExtError=PATHEXT does not contain .EXE
169+
SettingEnvironmentVariable=正在设置环境变量
170+
SystemCheckEnvironmentVariables=环境变量
171+
SystemCheckPathExtError=PATHEXT 路径中不包含 .EXE

0 commit comments

Comments
 (0)