portable

DittoSetup/Build Portable ZIP_10.bat → DittoSetup/BuildPortableZIP.bat

@@ -1,52 +1,52 @@
-set arg1=%1
-
-IF (%1) == () set arg1="DittoPortable"
-
-cd DittoSetup
-
-
-Rmdir Ditto /s /q
-
-MkDir Ditto
-MkDir Ditto\Help
-MkDir Ditto\Language
-MkDir Ditto\Themes
-MkDir Ditto\Addins
-
-if "%2" == "bit64" goto bit64
-
-copy ..\Release\Ditto.exe Ditto\Ditto.exe
-copy ..\Release\ICU_Loader.dll Ditto\ICU_Loader.dll
-copy ..\Release\Addins\*.dll Ditto\Addins\
-
-copy 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.CRT\vcruntime140.dll' Ditto\vcruntime140.dll
-copy 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.CRT\msvcp140.dll' Ditto\msvcp140.dll
-copy 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.MFC\mfc140u.dll' Ditto\mfc140u.dll
-
-if "%2"=="" GOTO skipBit64
-if "%2"=="bit32" GOTO skipBit64	
-:bit64
-
-copy ..\Release64\Ditto.exe Ditto\Ditto.exe
-copy ..\Release64\ICU_Loader.dll Ditto\ICU_Loader.dll
-copy ..\Release64\Addins\*.dll Ditto\Addins\
-
-copy 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.CRT\vcruntime140.dll' Ditto\vcruntime140.dll
-copy mfc-crt64\vcruntime140_1.dll Ditto\vcruntime140_1.dll
-copy 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.CRT\msvcp140.dll' Ditto\msvcp140.dll
-copy 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.MFC\mfc140u.dll' Ditto\mfc140u.dll
-
-:skipBit64
-
-copy Changes.txt Ditto\Changes.txt
-
-copy portable Ditto\portable
-
-copy ..\Debug\language\*.xml Ditto\language\
-copy ..\Debug\themes\*.xml Ditto\themes\
-
-7za.exe a -tzip Output\%arg1%.zip "Ditto\*" -r
-
-Rmdir Ditto /s /q
-
-cd ..
+set arg1=%1
+
+IF (%1) == () set arg1="DittoPortable"
+
+cd DittoSetup
+
+
+Rmdir Ditto /s /q
+
+MkDir Ditto
+MkDir Ditto\Help
+MkDir Ditto\Language
+MkDir Ditto\Themes
+MkDir Ditto\Addins
+
+if "%2" == "bit64" goto bit64
+
+copy ..\Release\Ditto.exe Ditto\Ditto.exe
+copy ..\Release\ICU_Loader.dll Ditto\ICU_Loader.dll
+copy ..\Release\Addins\*.dll Ditto\Addins\
+
+copy 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.CRT\vcruntime140.dll' Ditto\vcruntime140.dll
+copy 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.CRT\msvcp140.dll' Ditto\msvcp140.dll
+copy 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.MFC\mfc140u.dll' Ditto\mfc140u.dll
+
+if "%2"=="" GOTO skipBit64
+if "%2"=="bit32" GOTO skipBit64	
+:bit64
+
+copy ..\Release64\Ditto.exe Ditto\Ditto.exe
+copy ..\Release64\ICU_Loader.dll Ditto\ICU_Loader.dll
+copy ..\Release64\Addins\*.dll Ditto\Addins\
+
+copy 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.CRT\vcruntime140.dll' Ditto\vcruntime140.dll
+copy mfc-crt64\vcruntime140_1.dll Ditto\vcruntime140_1.dll
+copy 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.CRT\msvcp140.dll' Ditto\msvcp140.dll
+copy 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.MFC\mfc140u.dll' Ditto\mfc140u.dll
+
+:skipBit64
+
+copy Changes.txt Ditto\Changes.txt
+
+copy portable Ditto\portable
+
+copy ..\Debug\language\*.xml Ditto\language\
+copy ..\Debug\themes\*.xml Ditto\themes\
+
+7za.exe a -tzip Output\%arg1%.zip "Ditto\*" -r
+
+Rmdir Ditto /s /q
+
+cd ..

appveyor.yml

@@ -29,7 +29,7 @@ after_build:
   #- "DittoSetup\StampVer" -f%APPVEYOR_BUILD_VERSION% -p%APPVEYOR_BUILD_VERSION% Release64\Ditto.exe
   #- iscc /F"DittoSetup_%VERSION_FILENAME%" "DittoSetup\DittoSetup_10.iss"
   #- iscc /F"DittoSetup_64bit_%VERSION_FILENAME%" "DittoSetup\DittoSetup_10.iss" "/dbit64=1"
-  - cmd: 'DittoSetup\Build Portable ZIP_10.bat "DittoPortable_%VERSION_FILENAME%" bit32'
+  - cmd: DittoSetup\BuildPortableZIP.bat "DittoPortable_%VERSION_FILENAME%" bit32
 
 artifacts:
   #- path: DittoSetup\output\DittoSetup_%VERSION_FILENAME%.exe