8000 [~] 改成Unicode，需要使用Unicode版本編譯 · Aikes/winpython@002e0d2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 002e0d2

Browse files
AikesAikes
committed
[~] 改成Unicode，需要使用Unicode版本編譯
--------------------------- [+]:新增 [-]:刪除 [*]:修正 [~]:異動
1 parent 001c4fe commit 002e0d2

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

‎portable/installer.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ SectionEnd
7474
;------------------------------------------------------------------------------
7575
Function .onInit
7676
; Check if an instance of this installer is already running
77-
System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${ID}") i .r1 ?e'
77+
System::Call 'kernel32::CreateMutex(i 0, i 0, t "${ID}") i .r1 ?e'
7878
Pop $R0
7979
StrCmp $R0 0 +3
8080
MessageBox MB_OK|MB_ICONEXCLAMATION "Installer is already running."

‎portable/launcher.nsi

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,51 +92,51 @@ workdir:
9292
SetOutPath "${WORKDIR}"
9393
end_workdir:
9494

95-
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("WINPYDIR", "${WINPYDIR}").r0'
96-
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("WINPYVER", "${WINPYVER}").r0'
95+
System::Call 'Kernel32::SetEnvironmentVariable(t, t) i("WINPYDIR", "${WINPYDIR}").r0'
96+
System::Call 'Kernel32::SetEnvironmentVariable(t, t) i("WINPYVER", "${WINPYVER}").r0'
9797

9898
; Addition of R_HOME Environment Variable if %R_Home%\bin exists
9999
StrCmp "${R_HOME}" "" end_Rsettings
100100
IfFileExists "${R_HOME}\bin\*.*" 0 end_Rsettings
101101

102-
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("R_HOME", "${R_HOME}").r0'
102+
System::Call 'Kernel32::SetEnvironmentVariable(t, t) i("R_HOME", "${R_HOME}").r0'
103103

104104
end_Rsettings:
105105

106106
; Addition of JULIA and JULIA_HOME Environment Variable if %JULIA% program exists
107107
StrCmp "${JULIA}" "" end_Julia_settings
108108
IfFileExists "${JULIA}" 0 end_Julia_settings
109109

110-
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("JULIA", "${JULIA}").r0'
110+
System::Call 'Kernel32::SetEnvironmentVariable(t, t) i("JULIA", "${JULIA}").r0'
111111

112112
StrCmp "${JULIA_HOME}" "" end_Julia_settings
113113
IfFileExists "${JULIA_HOME}\*.*" 0 end_Julia_settings
114-
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("JULIA_HOME", "${JULIA_HOME}").r0'
114+
System::Call 'Kernel32::SetEnvironmentVariable(t, t) i("JULIA_HOME", "${JULIA_HOME}").r0'
115115

116116
; Addition for JULIA_PKGDIR
117117
StrCmp "${JULIA_PKGDIR}" "" end_Julia_settings
118118
IfFileExists "${JULIA_PKGDIR}\*.*" 0 end_Julia_settings
119-
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("JULIA_PKGDIR", "${JULIA_PKGDIR}").r0'
119+
System::Call 'Kernel32::SetEnvironmentVariable(t, t) i("JULIA_PKGDIR", "${JULIA_PKGDIR}").r0'
120120

121121
end_Julia_settings:
122122

123123

124124
; Addition for QT_API=pyqt5 if Qt5 detected
125125
IfFileExists "${WINPYDIR}\Lib\site-packages\PyQt5\*.*" 0 end_QT_API_settings
126-
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("QT_API", "pyqt5").r0'
126+
System::Call 'Kernel32::SetEnvironmentVariable(t, t) i("QT_API", "pyqt5").r0'
127127

128128
end_QT_API_settings:
129129

130130
; jupyter
131131
StrCmp "${JUPYTER_DATA_DIR}" "" end_jupyter_data_setting
132-
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("JUPYTER_DATA_DIR", "${JUPYTER_DATA_DIR}").r0'
132+
System::Call 'Kernel32::SetEnvironmentVariable(t, t) i("JUPYTER_DATA_DIR", "${JUPYTER_DATA_DIR}").r0'
133133

134134
end_jupyter_data_setting:
135135

136136
;================================================================
137137
; Settings directory
138138
IfFileExists "$EXEDIR\settings\*.*" 0 end_settings
139-
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("HOME", "$EXEDIR\settings").r0'
139+
System::Call 'Kernel32::SetEnvironmentVariable(t, t) i("HOME", "$EXEDIR\settings").r0'
140140
StrCmp "${SETTINGSDIR}" "" end_settings
141141
CreateDirectory "$EXEDIR\settings\${SETTINGSDIR}"
142142
; Handle portability in Spyder's settings
@@ -180,7 +180,7 @@ ReadINIStr $R7 $R6 "debug" "state"
180180
StrCmp $R7 "" no_debug
181181
StrCmp $R7 "disabled" no_debug
182182
StrCpy $R7 "enabled"
183-
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("WINPYDEBUG", "True").r0'
183+
System::Call 'Kernel32::SetEnvironmentVariable(t, t) i("WINPYDEBUG", "True").r0'
184184
no_debug:
185185

186186

@@ -198,7 +198,7 @@ envvar_loop:
198198

199199
${StrFilter} $1 "+" "" " " $1 ; Upper case + remove trailing spaces
200200
StrCmp $1 "PATH" found_path
201-
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("$1", "$2").r0'
201+
System::Call 'Kernel32::SetEnvironmentVariable(t, t) i("$1", "$2").r0'
202202
Goto end_found_path
203203

204204
found_path:
@@ -212,7 +212,7 @@ envvar_loop:
212212
envvar_done:
213213

214214
StrCpy $R0 "${PREPATH};$R0;${POSTPATH}"
215-
System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("PATH", R0).r0'
215+
System::Call 'Kernel32::SetEnvironmentVariable(t, t) i("PATH", R0).r0'
216216
;================================================================
217217

218218

0 commit comments

Comments
 (0)
0