Index: scripts/internal/clear_env.bat =================================================================== diff -u -N -r0a2c7bb7c7f07f0ea6defb6a46bf6a4bd68057ad -r3c1c924c0fdd122aee60269256386ec80417e171 --- scripts/internal/clear_env.bat (.../clear_env.bat) (revision 0a2c7bb7c7f07f0ea6defb6a46bf6a4bd68057ad) +++ scripts/internal/clear_env.bat (.../clear_env.bat) (revision 3c1c924c0fdd122aee60269256386ec80417e171) @@ -44,15 +44,15 @@ exit /b 1 ) - mkdir "%TmpDir%\zip32" - if not exist "%TmpDir%\zip32" ( - echo ERROR: Creating temporary zip32 folder failed. + mkdir "%TmpDir%\32bit" + if not exist "%TmpDir%\32bit" ( + echo ERROR: Creating temporary 32bit folder failed. goto error ) - mkdir "%TmpDir%\zip64" - if not exist "%TmpDir%\zip64" ( - echo ERROR: Creating temporary zip64 folder failed. + mkdir "%TmpDir%\64bit" + if not exist "%TmpDir%\64bit" ( + echo ERROR: Creating temporary 64bit folder failed. goto error ) ) Index: scripts/internal/prepare_env.bat =================================================================== diff -u -N -r0dad97fd1b1e4c79c037b3b638181c2214c0d8f8 -r3c1c924c0fdd122aee60269256386ec80417e171 --- scripts/internal/prepare_env.bat (.../prepare_env.bat) (revision 0dad97fd1b1e4c79c037b3b638181c2214c0d8f8) +++ scripts/internal/prepare_env.bat (.../prepare_env.bat) (revision 3c1c924c0fdd122aee60269256386ec80417e171) @@ -24,18 +24,18 @@ ) rem Prepare directories -if not exist "%TmpDir%\zip32" ( - mkdir "%TmpDir%\zip32" - if not exist "%TmpDir%\zip32" ( - echo ERROR: Creating temporary zip32 folder failed. +if not exist "%TmpDir%\32bit" ( + mkdir "%TmpDir%\32bit" + if not exist "%TmpDir%\32bit" ( + echo ERROR: Creating temporary 32bit folder failed. goto error ) ) -if not exist "%TmpDir%\zip64" ( - mkdir "%TmpDir%\zip64" - if not exist "%TmpDir%\zip64" ( - echo ERROR: Creating temporary zip64 folder failed. +if not exist "%TmpDir%\64bit" ( + mkdir "%TmpDir%\64bit" + if not exist "%TmpDir%\64bit" ( + echo ERROR: Creating temporary 64bit folder failed. goto error ) ) Index: scripts/make_existing_release.bat =================================================================== diff -u -N -r122f5f17f602b989c626ab31bb7f32c4211f93bd -r3c1c924c0fdd122aee60269256386ec80417e171 --- scripts/make_existing_release.bat (.../make_existing_release.bat) (revision 122f5f17f602b989c626ab31bb7f32c4211f93bd) +++ scripts/make_existing_release.bat (.../make_existing_release.bat) (revision 3c1c924c0fdd122aee60269256386ec80417e171) @@ -172,33 +172,35 @@ rem Prepare files SET Res=0 -xcopy "bin\release\ch.exe" "%TmpDir%\zip32\" >"%TmpDir%\command.log" || SET Res=1 -xcopy "License.txt" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "bin\release\chext.dll" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "bin\release\libicpf32u.dll" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "bin\release\libchcore32u.dll" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "bin\release\libictranslate32u.dll" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "bin\release\ictranslate.exe" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "bin\release\sqlite3_32.dll" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "%VSInstallDirX86%\VC\redist\x86\Microsoft.VC120.CRT\*" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "%VSInstallDirX86%\VC\redist\x86\Microsoft.VC120.MFC\*" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "%VSInstallDirX86%\Common7\IDE\Remote Debugger\x86\dbghelp.dll" "%TmpDir%\zip32\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy /E /I "bin\release\help" "%TmpDir%\zip32\help" >>"%TmpDir%\command.log" || SET Res=1 -xcopy /E /I "bin\release\langs" "%TmpDir%\zip32\langs" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "bin\release\ch.exe" "%TmpDir%\32bit\" >"%TmpDir%\command.log" || SET Res=1 +xcopy "License.txt" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "bin\release\chext.dll" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "bin\release\libicpf32u.dll" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "bin\release\libchcore32u.dll" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "bin\release\libictranslate32u.dll" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "bin\release\ictranslate.exe" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "bin\release\sqlite3_32.dll" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "scripts\portable_config\ch.xml" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "%VSInstallDirX86%\VC\redist\x86\Microsoft.VC120.CRT\*" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "%VSInstallDirX86%\VC\redist\x86\Microsoft.VC120.MFC\*" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "%VSInstallDirX86%\Common7\IDE\Remote Debugger\x86\dbghelp.dll" "%TmpDir%\32bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy /E /I "bin\release\help" "%TmpDir%\32bit\help" >>"%TmpDir%\command.log" || SET Res=1 +xcopy /E /I "bin\release\langs" "%TmpDir%\32bit\langs" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "bin\release\ch64.exe" "%TmpDir%\zip64\" >"%TmpDir%\command.log" || SET Res=1 -xcopy "License.txt" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "bin\release\chext64.dll" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "bin\release\libicpf64u.dll" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "bin\release\libchcore64u.dll" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "bin\release\libictranslate64u.dll" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "bin\release\ictranslate64.exe" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "bin\release\sqlite3_64.dll" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "%VSInstallDirX86%\VC\redist\x64\Microsoft.VC120.CRT\*" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "%VSInstallDirX86%\VC\redist\x64\Microsoft.VC120.MFC\*" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy "%VSInstallDirX86%\Common7\IDE\Remote Debugger\x64\dbghelp.dll" "%TmpDir%\zip64\" >>"%TmpDir%\command.log" || SET Res=1 -xcopy /E /I "bin\release\help" "%TmpDir%\zip64\help" >>"%TmpDir%\command.log" || SET Res=1 -xcopy /E /I "bin\release\langs" "%TmpDir%\zip64\langs" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "bin\release\ch64.exe" "%TmpDir%\64bit\" >"%TmpDir%\command.log" || SET Res=1 +xcopy "License.txt" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "bin\release\chext64.dll" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "bin\release\libicpf64u.dll" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "bin\release\libchcore64u.dll" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "bin\release\libictranslate64u.dll" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "bin\release\ictranslate64.exe" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "bin\release\sqlite3_64.dll" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "scripts\portable_config\ch.xml" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "%VSInstallDirX86%\VC\redist\x64\Microsoft.VC120.CRT\*" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "%VSInstallDirX86%\VC\redist\x64\Microsoft.VC120.MFC\*" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy "%VSInstallDirX86%\Common7\IDE\Remote Debugger\x64\dbghelp.dll" "%TmpDir%\64bit\" >>"%TmpDir%\command.log" || SET Res=1 +xcopy /E /I "bin\release\help" "%TmpDir%\64bit\help" >>"%TmpDir%\command.log" || SET Res=1 +xcopy /E /I "bin\release\langs" "%TmpDir%\64bit\langs" >>"%TmpDir%\command.log" || SET Res=1 if %Res% NEQ 0 ( echo ERROR: Detected a problem when copying files. See the log below: @@ -208,7 +210,7 @@ cd "%TmpDir%\" -"%SEVENZIPEXE%" a -tzip "%OutputDir%\ch-%CHTextVersion%.zip" zip32 zip64 >"%TmpDir%\command.log" +"%SEVENZIPEXE%" a -tzip "%OutputDir%\ch-%CHTextVersion%.zip" 32bit 64bit >"%TmpDir%\command.log" if errorlevel 1 ( echo ERROR: Could not create win32 zip archive. See the log below: type "%TmpDir%\command.log" Index: scripts/portable_config/ch.xml =================================================================== diff -u -N --- scripts/portable_config/ch.xml (revision 0) +++ scripts/portable_config/ch.xml (revision 3c1c924c0fdd122aee60269256386ec80417e171) @@ -0,0 +1,2 @@ + + \ No newline at end of file