Thread: [Winmerge-svn] SF.net SVN: winmerge:[7157] trunk/ArchiveSupport/Merge7zInstaller
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <jt...@us...> - 2010-05-13 11:38:09
|
Revision: 7157 http://winmerge.svn.sourceforge.net/winmerge/?rev=7157&view=rev Author: jtuc Date: 2010-05-13 11:38:03 +0000 (Thu, 13 May 2010) Log Message: ----------- Add Merge7zInstaller.vcxproj.* for VS2010 Added Paths: ----------- trunk/ArchiveSupport/Merge7zInstaller/Merge7zInstaller.vcxproj trunk/ArchiveSupport/Merge7zInstaller/Merge7zInstaller.vcxproj.filters Added: trunk/ArchiveSupport/Merge7zInstaller/Merge7zInstaller.vcxproj =================================================================== --- trunk/ArchiveSupport/Merge7zInstaller/Merge7zInstaller.vcxproj (rev 0) +++ trunk/ArchiveSupport/Merge7zInstaller/Merge7zInstaller.vcxproj 2010-05-13 11:38:03 UTC (rev 7157) @@ -0,0 +1,162 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{BB886DD9-A08B-48CB-A831-38E697004EF2}</ProjectGuid> + <SccProjectName /> + <SccLocalPath /> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\Build\Merge7zInstaller\Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\BuildTmp\Merge7zInstaller\Debug\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\Build\Merge7zInstaller\Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\BuildTmp\Merge7zInstaller\Release\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeaderOutputFile>.\..\..\BuildTmp\Merge7zInstaller\Debug/Merge7zInstaller.pch</PrecompiledHeaderOutputFile> + <AssemblerListingLocation>.\..\..\BuildTmp\Merge7zInstaller\Debug/</AssemblerListingLocation> + <ObjectFileName>.\..\..\BuildTmp\Merge7zInstaller\Debug/</ObjectFileName> + <ProgramDataBaseFileName>.\..\..\BuildTmp\Merge7zInstaller\Debug/</ProgramDataBaseFileName> + <BrowseInformation>true</BrowseInformation> + <WarningLevel>Level3</WarningLevel> + <SuppressStartupBanner>true</SuppressStartupBanner> + <DebugInformationFormat>OldStyle</DebugInformationFormat> + <IntrinsicFunctions>true</IntrinsicFunctions> + <ExceptionHandling>false</ExceptionHandling> + <BufferSecurityCheck>false</BufferSecurityCheck> + </ClCompile> + <Link> + <OutputFile>.\..\..\Build\Merge7zInstaller\Debug/Merge7zInstaller.exe</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>.\..\..\Build\Merge7zInstaller\Debug/Merge7zInstaller.pdb</ProgramDatabaseFile> + <SubSystem>Windows</SubSystem> + <TargetMachine>MachineX86</TargetMachine> + </Link> + <Midl> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MkTypLibCompatible>true</MkTypLibCompatible> + <SuppressStartupBanner>true</SuppressStartupBanner> + <TargetEnvironment>Win32</TargetEnvironment> + <TypeLibraryName>.\..\..\Build\Merge7zInstaller\Debug/Merge7zInstaller.tlb</TypeLibraryName> + <HeaderFileName> + </HeaderFileName> + </Midl> + <ResourceCompile> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0407</Culture> + </ResourceCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MinSpace</Optimization> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <PrecompiledHeaderOutputFile>.\..\..\BuildTmp\Merge7zInstaller\Release/Merge7zInstaller.pch</PrecompiledHeaderOutputFile> + <AssemblerListingLocation>.\..\..\BuildTmp\Merge7zInstaller\Release/</AssemblerListingLocation> + <ObjectFileName>.\..\..\BuildTmp\Merge7zInstaller\Release/</ObjectFileName> + <ProgramDataBaseFileName>.\..\..\BuildTmp\Merge7zInstaller\Release/</ProgramDataBaseFileName> + <WarningLevel>Level3</WarningLevel> + <SuppressStartupBanner>true</SuppressStartupBanner> + <IntrinsicFunctions>true</IntrinsicFunctions> + <ExceptionHandling>false</ExceptionHandling> + <BufferSecurityCheck>false</BufferSecurityCheck> + </ClCompile> + <CustomBuildStep> + <Command>upx "$(OUTDIR)\Merge7zInstaller.exe" +cd "$(OUTDIR)" +del Merge7z.7z +del Merge7z.zip +mkdir Zip +FOR %%A IN (Zip\*.*) DO del %%A +FOR %%A IN (Zip\Codecs\*.*) DO del %%A +FOR %%A IN (Zip\Formats\*.*) DO del %%A +FOR %%A IN (Zip\Lang\*.*) DO del %%A +Merge7zInstaller /commit /standalone /select M M Zip +cd Zip +7z a ..\Merge7z.7z -bd -r * -mx5 +7z a -tzip ..\Merge7z.zip -bd -r * +</Command> + <Outputs>$(OutDir)Merge7z.7z;$(OutDir)Merge7z.zip;%(Outputs)</Outputs> + </CustomBuildStep> + <Link> + <OutputFile>.\..\..\Build\Merge7zInstaller\Release/Merge7zInstaller.exe</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <SubSystem>Windows</SubSystem> + <TargetMachine>MachineX86</TargetMachine> + </Link> + <Midl> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MkTypLibCompatible>true</MkTypLibCompatible> + <SuppressStartupBanner>true</SuppressStartupBanner> + <TargetEnvironment>Win32</TargetEnvironment> + <TypeLibraryName>.\..\..\Build\Merge7zInstaller\Release/Merge7zInstaller.tlb</TypeLibraryName> + <HeaderFileName> + </HeaderFileName> + </Midl> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0407</Culture> + </ResourceCompile> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="Installer.cpp"> + <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> + <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation> + <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization> + <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="Installer.rc" /> + </ItemGroup> + <ItemGroup> + <None Include="Files.rc2" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/ArchiveSupport/Merge7zInstaller/Merge7zInstaller.vcxproj.filters =================================================================== --- trunk/ArchiveSupport/Merge7zInstaller/Merge7zInstaller.vcxproj.filters (rev 0) +++ trunk/ArchiveSupport/Merge7zInstaller/Merge7zInstaller.vcxproj.filters 2010-05-13 11:38:03 UTC (rev 7157) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Quellcodedateien"> + <UniqueIdentifier>{dbb2ba5b-abca-4d8d-8722-434ee0806a8c}</UniqueIdentifier> + <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions> + </Filter> + <Filter Include="Ressourcendateien"> + <UniqueIdentifier>{1b7e2315-c882-4320-9d81-3a38bb29bb3f}</UniqueIdentifier> + <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> + </Filter> + <Filter Include="Header-Dateien"> + <UniqueIdentifier>{379810b4-9256-4b9f-9a5f-a75fc24c5855}</UniqueIdentifier> + <Extensions>h;hpp;hxx;hm;inl</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="Installer.cpp"> + <Filter>Quellcodedateien</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="Installer.rc"> + <Filter>Quellcodedateien</Filter> + </ResourceCompile> + </ItemGroup> + <ItemGroup> + <None Include="Files.rc2"> + <Filter>Ressourcendateien</Filter> + </None> + </ItemGroup> +</Project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jt...@us...> - 2010-12-25 22:26:07
|
Revision: 7478 http://winmerge.svn.sourceforge.net/winmerge/?rev=7478&view=rev Author: jtuc Date: 2010-12-25 22:26:00 +0000 (Sat, 25 Dec 2010) Log Message: ----------- Add versions 7z918 through 7z920 to Merge7zInstaller, and base application specific installation on 7z920. Modified Paths: -------------- trunk/ArchiveSupport/Merge7zInstaller/Files.rc2 trunk/ArchiveSupport/Merge7zInstaller/Installer.cpp Modified: trunk/ArchiveSupport/Merge7zInstaller/Files.rc2 =================================================================== --- trunk/ArchiveSupport/Merge7zInstaller/Files.rc2 2010-12-25 22:21:39 UTC (rev 7477) +++ trunk/ArchiveSupport/Merge7zInstaller/Files.rc2 2010-12-25 22:26:00 UTC (rev 7478) @@ -1,7 +1,7 @@ Files.rc2 RCDATA Files.rc2 #define SHARPEN($) #$ -#define VIIZIP($) $ 7-ZIP SHARPEN(/7z465bin/$) +#define VIIZIP($) $ 7-ZIP SHARPEN(/7z920bin/$) #define MERGE7Z($) $ Merge7z SHARPEN(../../Build/MergeRelease/$) #define MERGE7ZU($) $ Merge7z SHARPEN(../../Build/MergeUnicodeRelease/$) @@ -27,6 +27,12 @@ MERGE7ZU(Merge7z916U.dll) MERGE7Z(Merge7z917.dll) MERGE7ZU(Merge7z917U.dll) +MERGE7Z(Merge7z918.dll) +MERGE7ZU(Merge7z918U.dll) +MERGE7Z(Merge7z919.dll) +MERGE7ZU(Merge7z919U.dll) +MERGE7Z(Merge7z920.dll) +MERGE7ZU(Merge7z920U.dll) VIIZIP(7zip_pad.xml) VIIZIP(7z.dll) @@ -57,7 +63,9 @@ VIIZIP(Lang/fur.txt) VIIZIP(Lang/fy.txt) VIIZIP(Lang/gl.txt) +VIIZIP(Lang/gu.txt) VIIZIP(Lang/he.txt) +VIIZIP(Lang/hi.txt) VIIZIP(Lang/hr.txt) VIIZIP(Lang/hu.txt) VIIZIP(Lang/hy.txt) @@ -67,6 +75,7 @@ VIIZIP(Lang/it.txt) VIIZIP(Lang/ja.txt) VIIZIP(Lang/ka.txt) +VIIZIP(Lang/kk.txt) VIIZIP(Lang/ko.txt) VIIZIP(Lang/ku.txt) VIIZIP(Lang/ku-ckb.txt) @@ -87,6 +96,7 @@ VIIZIP(Lang/pt-br.txt) VIIZIP(Lang/ro.txt) VIIZIP(Lang/ru.txt) +VIIZIP(Lang/sa.txt) VIIZIP(Lang/si.txt) VIIZIP(Lang/sk.txt) VIIZIP(Lang/sl.txt) @@ -98,6 +108,7 @@ VIIZIP(Lang/th.txt) VIIZIP(Lang/tr.txt) VIIZIP(Lang/tt.txt) +VIIZIP(Lang/ug.txt) VIIZIP(Lang/uk.txt) VIIZIP(Lang/uz.txt) VIIZIP(Lang/va.txt) Modified: trunk/ArchiveSupport/Merge7zInstaller/Installer.cpp =================================================================== --- trunk/ArchiveSupport/Merge7zInstaller/Installer.cpp 2010-12-25 22:21:39 UTC (rev 7477) +++ trunk/ArchiveSupport/Merge7zInstaller/Installer.cpp 2010-12-25 22:26:00 UTC (rev 7478) @@ -34,11 +34,12 @@ Accept extraction folder on command line Batch options: /standalone, /select, /commit 2010-05-13 Jochen Neubeck Base application specific installation on 7z465 +2010-12-25 Jochen Neubeck Base application specific installation on 7z920 */ #include <windows.h> -#define VERSION7Z 4.65 +#define VERSION7Z 9.20 #define SHARPEN(X) #X #define SHARPEN2(X) SHARPEN(X) @@ -265,11 +266,6 @@ { bCommit = TRUE; } - /*//just for test - else if (0 == lstrcmpi(lpArgLower, "\"ping pong\"")) - { - MessageBox(hWnd, "", lpArgLower, 0); - }*/ else { DWORD dwAttributes = GetFileAttributes(lpArgLower); @@ -376,7 +372,7 @@ { TCHAR buffer[40]; const UINT major = UINT(VERSION7Z); - const UINT minor = UINT(VERSION7Z * 100) % 100; + const UINT minor = UINT(VERSION7Z * 100 + 0.5) % 100; wsprintf(buffer, "Merge7z%u%02u.dll", major, minor); int lower = SendDlgItemMessage(hWnd, 100, LB_FINDSTRINGEXACT, -1, (LPARAM)buffer); wsprintf(buffer, "Merge7z%u%02uU.dll", major, minor); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |