sabrogden пре 5 година
родитељ
комит
451f4d9d94

+ 6 - 6
DittoSetup/Build Portable ZIP_10.bat

@@ -17,9 +17,9 @@ copy ..\Release\Ditto.exe Ditto\Ditto.exe
 copy ..\Release\ICU_Loader.dll Ditto\ICU_Loader.dll
 copy ..\Release\Addins\*.dll Ditto\Addins\
 
-copy mfc-crt\vcruntime140.dll Ditto\vcruntime140.dll
-copy mfc-crt\msvcp140.dll Ditto\msvcp140.dll
-copy mfc-crt\mfc140u.dll Ditto\mfc140u.dll
+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	
@@ -29,10 +29,10 @@ copy ..\Release64\Ditto.exe Ditto\Ditto.exe
 copy ..\Release64\ICU_Loader.dll Ditto\ICU_Loader.dll
 copy ..\Release64\Addins\*.dll Ditto\Addins\
 
-copy mfc-crt64\vcruntime140.dll Ditto\vcruntime140.dll
+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 mfc-crt64\msvcp140.dll Ditto\msvcp140.dll
-copy mfc-crt64\mfc140u.dll Ditto\mfc140u.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
 

+ 6 - 6
DittoSetup/DittoSetup_10.iss

@@ -70,10 +70,10 @@ Name: AddFireWallException; Description: Add Windows Firewall exception for Ditt
   Source: ..\Release64\ICU_Loader.dll; DestDir: {app}; Flags: ignoreversion
 	Source: ..\Release64\Addins\DittoUtil.dll; DestDir: {app}\Addins; Flags: ignoreversion
 	
-  Source: mfc-crt64\vcruntime140.dll;  DestDir: {app}; Flags: ignoreversion
+  Source: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.CRT\vcruntime140.dll;  DestDir: {app}; Flags: ignoreversion
   Source: mfc-crt64\vcruntime140_1.dll;  DestDir: {app}; Flags: ignoreversion
-  Source: mfc-crt64\msvcp140.dll;  DestDir: {app}; Flags: ignoreversion
-  Source: mfc-crt64\mfc140u.dll;  DestDir: {app}; Flags: ignoreversion
+  Source: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.CRT\msvcp140.dll;  DestDir: {app}; Flags: ignoreversion
+  Source: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.MFC\mfc140u.dll;  DestDir: {app}; Flags: ignoreversion
 
 #endif
 #ifndef bit64
@@ -81,9 +81,9 @@ Name: AddFireWallException; Description: Add Windows Firewall exception for Ditt
   Source: ..\Release\ICU_Loader.dll; DestDir: {app}; Flags: ignoreversion
   Source: ..\Release\Addins\DittoUtil.dll; DestDir: {app}\Addins; Flags: ignoreversion
 	
-  Source: mfc-crt\vcruntime140.dll;  DestDir: {app}; Flags: ignoreversion
-  Source: mfc-crt\msvcp140.dll;  DestDir: {app}; Flags: ignoreversion
-  Source: mfc-crt\mfc140u.dll;  DestDir: {app}; Flags: ignoreversion
+  Source: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.CRT\vcruntime140.dll;  DestDir: {app}; Flags: ignoreversion
+  Source: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.CRT\msvcp140.dll;  DestDir: {app}; Flags: ignoreversion
+  Source: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.MFC\mfc140u.dll;  DestDir: {app}; Flags: ignoreversion
 
 #endif
 

BIN
DittoSetup/mfc-crt/VC_redist.x86.exe


BIN
DittoSetup/mfc-crt/mfc140u.dll


BIN
DittoSetup/mfc-crt/msvcp140.dll


BIN
DittoSetup/mfc-crt/vcruntime140.dll


BIN
DittoSetup/mfc-crt64/VC_redist.x64.exe


BIN
DittoSetup/mfc-crt64/mfc140u.dll


BIN
DittoSetup/mfc-crt64/msvcp140.dll


BIN
DittoSetup/mfc-crt64/vcruntime140.dll


+ 9 - 3
appveyor.yml

@@ -11,6 +11,7 @@ branches:
     
 install:
 - set INNOSETUPPATH=C:\Program Files (x86)\Inno Setup 6
+- set versionFileName=3_24_{build}_0
 - set Path=%INNOSETUPPATH%;%PATH%
 
 assembly_info:
@@ -25,8 +26,13 @@ build_script:
 - cmd: nuget restore
 - echo Building 32Bit
 - cmd: msbuild CP_Main_10.sln /p:Configuration=Release /p:Platform=Win32
-- echo Building 64Bit
-- cmd: msbuild CP_Main_10.sln /p:Configuration=Release /p:Platform=x64
+#- echo Building 64Bit
+#- cmd: msbuild CP_Main_10.sln /p:Configuration=Release /p:Platform=x64
 
 after_build:
-- cmd ISCC.exe" /F"DittoSetup_%versionFileName%" "%workDir%\DittoSetup\DittoSetup_10.iss"
+- cmd ISCC.exe" /F"DittoSetup_%versionFileName%" "Ditto_Build\DittoSetup\DittoSetup_10.iss"
+
+artifacts:
+- path: Ditto_Build\DittoSetup\output\DittoSetup_%versionFileName%.exe
+  name: DittoSetup
+