OSDN > 軟體搜索 > System > Storage > File Management > WinMerge Japanese > SCM > git > winmerge-jp > 提交

WinMerge Japanese
Fork

R/O
HTTP
SSH
HTTPS

winmerge-jp: 提交

Commit MetaInfo

修訂	01e6bd91a9c9e9f898bff827e22963b4f5ab4943 (tree)
時間	2015-12-13 15:28:35
作者	sdottaka@users.sourceforge.net <sdottaka@user...>
Commiter	sdottaka@users.sourceforge.net

Log Message

- Use vcomp140.dll instead of vcomp120.dll
- Change the value of WizardImageStretch to 'true' for high DPI
- Change Readme path

Change Summary

modified: BuildArc.cmd (diff)
modified: Installer/InnoSetup/WinMerge.iss (diff)
modified: Installer/InnoSetup/WinMergeX64.iss (diff)

差異

--- a/BuildArc.cmd

+++ b/BuildArc.cmd

		@@ -46,7 +46,7 @@ mkdir "%DISTDIR%\2.14-zip-version\WinMerge\GnuWin32" 2> NUL
46	46	mkdir "%DISTDIR%\2.14-x64-zip-version\WinMerge\GnuWin32" 2> NUL
47	47
48	48	rem Readme
49		-for %%i in (Build\Docs\.) do (
	49	+for %%i in (Translations\Docs\Readme\.) do (
50	50	copy "%%i" "%DISTDIR%\2.14-zip-version\WinMerge\%%~nxi"
51	51	copy "%%i" "%DISTDIR%\2.14-x64-zip-version\WinMerge\%%~nxi"
52	52	)

--- a/Installer/InnoSetup/WinMerge.iss

+++ b/Installer/InnoSetup/WinMerge.iss

		@@ -51,7 +51,7 @@
51	51
52	52	#define AppVersion GetFileVersion(SourcePath + "\..\..\Build\MergeUnicodeRelease\WinMergeU.exe")
53	53	#define FriendlyAppVersion Copy(GetFileVersion(SourcePath + "\..\..\Build\MergeUnicodeRelease\WinMergeU.exe"), 1, 5)
54		-#define VS120COMNTOOLS GetEnv('VS120COMNTOOLS')
	54	+#define VS140COMNTOOLS GetEnv('VS140COMNTOOLS')
55	55
56	56	[Setup]
57	57	AppName=WinMerge

		@@ -93,7 +93,7 @@ UninstallDisplayIcon={app}\{code:ExeName}
93	93	;Artwork References
94	94	WizardImageFile=Art\Large Logo.bmp
95	95	WizardSmallImageFile=Art\Small Logo.bmp
96		-WizardImageStretch=false
	96	+WizardImageStretch=true
97	97
98	98	;It is confusing, if Setup/Uninstall use the same icon like WinMerge!
99	99	;SetupIconFile=..\..\src\res\Merge.ico

		@@ -460,7 +460,7 @@ Source: ..\..\Translations\Docs\Readme\ReadMe-Greek.txt; DestDir: {app}\Docs; Co
460	460	Source: ..\..\Translations\WinMerge\Hungarian.po; DestDir: {app}\Languages; Components: Languages\Hungarian; Flags: ignoreversion comparetimestamp
461	461	Source: ..\..\Translations\WinMerge\Italian.po; DestDir: {app}\Languages; Components: Languages\Italian; Flags: ignoreversion comparetimestamp
462	462	Source: ..\..\Translations\WinMerge\Japanese.po; DestDir: {app}\Languages; Components: Languages\Japanese; Flags: ignoreversion comparetimestamp
463		-Source: ..\..\Build\Docs\ReadMe-Japanese.txt; DestDir: {app}\Docs; Components: Languages\Japanese
	463	+Source: ..\..\Translations\Docs\Readme\ReadMe-Japanese.txt; DestDir: {app}\Docs; Components: Languages\Japanese
464	464	Source: ..\..\Build\Manual\htmlhelp\WinMerge_ja.chm; DestDir: {app}\Docs; Components: Languages\Japanese
465	465	Source: ..\..\Translations\WinMerge\Korean.po; DestDir: {app}\Languages; Components: Languages\Korean; Flags: ignoreversion comparetimestamp
466	466	Source: ..\..\Translations\WinMerge\Norwegian.po; DestDir: {app}\Languages; Components: Languages\Norwegian; Flags: ignoreversion comparetimestamp

		@@ -483,14 +483,14 @@ Source: ..\..\Translations\Docs\Readme\ReadMe-Turkish.txt; DestDir: {app}\Docs;
483	483	Source: ..\..\Translations\WinMerge\Ukrainian.po; DestDir: {app}\Languages; Components: Languages\Ukrainian; Flags: ignoreversion comparetimestamp
484	484	Source: ..\..\Translations\Docs\Readme\ReadMe-Ukrainian.txt; DestDir: {app}\Docs; Components: Languages\Ukrainian
485	485
486		-Source: ..\..\Build\Filters\*.flt; DestDir: {app}\Filters; Flags: sortfilesbyextension comparetimestamp ignoreversion; Components: filters
487		-Source: ..\..\Build\Filters\FileFilter.tmpl; DestDir: {app}\Filters; Flags: sortfilesbyextension comparetimestamp ignoreversion; Components: filters
	486	+Source: ..\..\Filters\*.flt; DestDir: {app}\Filters; Flags: sortfilesbyextension comparetimestamp ignoreversion; Components: filters
	487	+Source: ..\..\Filters\FileFilter.tmpl; DestDir: {app}\Filters; Flags: sortfilesbyextension comparetimestamp ignoreversion; Components: filters
488	488
489	489	;Documentation
490		-Source: ..\..\Build\Docs\ReadMe.txt; DestDir: {app}\Docs; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
491		-Source: ..\..\Build\Docs\Contributors.txt; DestDir: {app}; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
	490	+Source: ..\..\Docs\Users\ReadMe.txt; DestDir: {app}\Docs; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
	491	+Source: ..\..\Docs\Users\Contributors.txt; DestDir: {app}; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
492	492	Source: ..\..\Docs\Users\ReleaseNotes.html; DestDir: {app}\Docs; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
493		-Source: ..\..\Build\Docs\ChangeLog.txt; DestDir: {app}\Docs; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
	493	+Source: ..\..\Docs\Users\ChangeLog.txt; DestDir: {app}\Docs; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
494	494	Source: ..\..\Build\Manual\htmlhelp\WinMerge.chm; DestDir: {app}\Docs\; Flags: overwritereadonly uninsremovereadonly; Components: Core
495	495	Source: ..\..\Docs\users\GPL.rtf; DestDir: {app}\Docs\; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
496	496

		@@ -527,7 +527,7 @@ Source: ..\..\Externals\winimerge\GPL.txt; DestDir: {app}\WinIMerge; Components:
527	527	Source: ..\..\Externals\winimerge\freeimage-license-gplv2.txt; DestDir: {app}\WinIMerge; Components: WinIMerge
528	528	;Source: ..\..\Externals\winimerge\Build\Release\WinIMerge.exe; DestDir: {app}\WinIMerge; Components: WinIMerge
529	529	Source: ..\..\Externals\winimerge\Build\Release\WinIMergeLib.dll; DestDir: {app}\WinIMerge; Components: WinIMerge
530		-Source: {#VS120COMNTOOLS}\..\..\VC\redist\x86\Microsoft.VC120.OpenMP\vcomp120.dll; DestDir: {app}; Components: WinIMerge
	530	+Source: {#VS140COMNTOOLS}\..\..\VC\redist\x86\Microsoft.VC140.OpenMP\vcomp140.dll; DestDir: {app}; Components: WinIMerge
531	531
532	532	;GnuWin32 Patch for Windows
533	533	Source: C:\Program Files\WinMerge\GnuWin32\.; DestDir: {app}\GnuWin32; Flags: recursesubdirs; Components: Patch

--- a/Installer/InnoSetup/WinMergeX64.iss

+++ b/Installer/InnoSetup/WinMergeX64.iss

		@@ -51,7 +51,7 @@
51	51
52	52	#define AppVersion GetFileVersion(SourcePath + "\..\..\Build\X64\MergeUnicodeRelease\WinMergeU.exe")
53	53	#define FriendlyAppVersion Copy(GetFileVersion(SourcePath + "\..\..\Build\X64\MergeUnicodeRelease\WinMergeU.exe"), 1, 5)
54		-#define VS120COMNTOOLS GetEnv('VS120COMNTOOLS')
	54	+#define VS140COMNTOOLS GetEnv('VS140COMNTOOLS')
55	55
56	56	[Setup]
57	57	AppName=WinMerge

		@@ -93,7 +93,7 @@ UninstallDisplayIcon={app}\{code:ExeName}
93	93	;Artwork References
94	94	WizardImageFile=Art\Large Logo.bmp
95	95	WizardSmallImageFile=Art\Small Logo.bmp
96		-WizardImageStretch=false
	96	+WizardImageStretch=true
97	97
98	98	;It is confusing, if Setup/Uninstall use the same icon like WinMerge!
99	99	;SetupIconFile=..\..\src\res\Merge.ico

		@@ -439,7 +439,7 @@ Source: ..\..\Translations\Docs\Readme\ReadMe-Greek.txt; DestDir: {app}\Docs; Co
439	439	Source: ..\..\Translations\WinMerge\Hungarian.po; DestDir: {app}\Languages; Components: Languages\Hungarian; Flags: ignoreversion comparetimestamp
440	440	Source: ..\..\Translations\WinMerge\Italian.po; DestDir: {app}\Languages; Components: Languages\Italian; Flags: ignoreversion comparetimestamp
441	441	Source: ..\..\Translations\WinMerge\Japanese.po; DestDir: {app}\Languages; Components: Languages\Japanese; Flags: ignoreversion comparetimestamp
442		-Source: ..\..\Build\Docs\ReadMe-Japanese.txt; DestDir: {app}\Docs; Components: Languages\Japanese
	442	+Source: ..\..\Translations\Docs\Readme\ReadMe-Japanese.txt; DestDir: {app}\Docs; Components: Languages\Japanese
443	443	Source: ..\..\Build\Manual\htmlhelp\WinMerge_ja.chm; DestDir: {app}\Docs; Components: Languages\Japanese
444	444	Source: ..\..\Translations\WinMerge\Korean.po; DestDir: {app}\Languages; Components: Languages\Korean; Flags: ignoreversion comparetimestamp
445	445	Source: ..\..\Translations\WinMerge\Norwegian.po; DestDir: {app}\Languages; Components: Languages\Norwegian; Flags: ignoreversion comparetimestamp

		@@ -462,14 +462,14 @@ Source: ..\..\Translations\Docs\Readme\ReadMe-Turkish.txt; DestDir: {app}\Docs;
462	462	Source: ..\..\Translations\WinMerge\Ukrainian.po; DestDir: {app}\Languages; Components: Languages\Ukrainian; Flags: ignoreversion comparetimestamp
463	463	Source: ..\..\Translations\Docs\Readme\ReadMe-Ukrainian.txt; DestDir: {app}\Docs; Components: Languages\Ukrainian
464	464
465		-Source: ..\..\Build\Filters\*.flt; DestDir: {app}\Filters; Flags: sortfilesbyextension comparetimestamp ignoreversion; Components: filters
466		-Source: ..\..\Build\Filters\FileFilter.tmpl; DestDir: {app}\Filters; Flags: sortfilesbyextension comparetimestamp ignoreversion; Components: filters
	465	+Source: ..\..\Filters\*.flt; DestDir: {app}\Filters; Flags: sortfilesbyextension comparetimestamp ignoreversion; Components: filters
	466	+Source: ..\..\Filters\FileFilter.tmpl; DestDir: {app}\Filters; Flags: sortfilesbyextension comparetimestamp ignoreversion; Components: filters
467	467
468	468	;Documentation
469		-Source: ..\..\Build\Docs\ReadMe.txt; DestDir: {app}\Docs; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
470		-Source: ..\..\Build\Docs\Contributors.txt; DestDir: {app}; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
	469	+Source: ..\..\Docs\Users\ReadMe.txt; DestDir: {app}\Docs; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
	470	+Source: ..\..\Docs\Users\Contributors.txt; DestDir: {app}; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
471	471	Source: ..\..\Docs\Users\ReleaseNotes.html; DestDir: {app}\Docs; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
472		-Source: ..\..\Build\Docs\ChangeLog.txt; DestDir: {app}\Docs; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
	472	+Source: ..\..\Docs\Users\ChangeLog.txt; DestDir: {app}\Docs; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
473	473	Source: ..\..\Build\Manual\htmlhelp\WinMerge.chm; DestDir: {app}\Docs\; Flags: overwritereadonly uninsremovereadonly; Components: Core
474	474	Source: ..\..\Docs\users\GPL.rtf; DestDir: {app}\Docs\; Flags: comparetimestamp ignoreversion promptifolder; Components: Core
475	475

		@@ -505,7 +505,7 @@ Source: ..\..\Externals\winimerge\GPL.txt; DestDir: {app}\WinIMerge; Components:
505	505	Source: ..\..\Externals\winimerge\freeimage-license-gplv2.txt; DestDir: {app}\WinIMerge; Components: WinIMerge
506	506	;Source: ..\..\Externals\winimerge\Build\x64\Release\WinIMerge.exe; DestDir: {app}\WinIMerge; Components: WinIMerge
507	507	Source: ..\..\Externals\winimerge\Build\x64\Release\WinIMergeLib.dll; DestDir: {app}\WinIMerge; Components: WinIMerge
508		-Source: {#VS120COMNTOOLS}\..\..\VC\redist\x64\Microsoft.VC120.OpenMP\vcomp120.dll; DestDir: {app}; Components: WinIMerge
	508	+Source: {#VS140COMNTOOLS}\..\..\VC\redist\x64\Microsoft.VC140.OpenMP\vcomp140.dll; DestDir: {app}; Components: WinIMerge
509	509
510	510	;GnuWin32 Patch for Windows
511	511	Source: C:\Program Files\WinMerge\GnuWin32\.; DestDir: {app}\GnuWin32; Flags: recursesubdirs; Components: Patch

Show on old repository browser

WinMerge Japanese Fork

winmerge-jp: 提交

Commit MetaInfo

Log Message

Change Summary

差異

WinMerge Japanese
Fork