OSDN Git Service

Add libiconv2dll to install script
authorFrank Li <lznuaa@gmail.com>
Thu, 26 Feb 2009 09:45:57 +0000 (17:45 +0800)
committerFrank Li <lznuaa@gmail.com>
Thu, 26 Feb 2009 09:45:57 +0000 (17:45 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
ext/gitexe/igit.exe [moved from ext/igit.exe with 100% similarity]
ext/gitexe/libiconv2.dll [new file with mode: 0644]
src/TortoiseGitSetup/StructureFragment.wxi
src/TortoiseGitSetup/VersionNumberInclude.wxi

similarity index 100%
rename from ext/igit.exe
rename to ext/gitexe/igit.exe
diff --git a/ext/gitexe/libiconv2.dll b/ext/gitexe/libiconv2.dll
new file mode 100644 (file)
index 0000000..17da219
Binary files /dev/null and b/ext/gitexe/libiconv2.dll differ
index 3a173e6..2b8e3d0 100644 (file)
@@ -231,7 +231,8 @@ out everything for now, leaving these enabled as they are would make the install
             </Component>\r
 \r
             <Component Id="C__wingit" Guid="$(var.GuidGitLib)" Win64="$(var.Win64YesNo)">\r
-              <File Id="F__wingit" ShortName="IGIT.EXE" Name="igit.exe" DiskId="1" Source="..\..\ext\igit.exe" KeyPath="yes" />\r
+              <File Id="F__wingit" ShortName="IGIT.EXE" Name="igit.exe" DiskId="1" Source="..\..\ext\gitexe\igit.exe" KeyPath="yes" />\r
+                         <File Id="F__libiconv2" ShortName="LIBICONV.DLL" Name="libiconv2.dll" DiskId="1" Source="..\..\ext\gitexe\libiconv2.dll" />\r
             </Component>\r
             \r
             <Component Id="C__TortoiseSVN" Guid="$(var.GuidTortoiseSVN)" Win64="$(var.Win64YesNo)">\r
index ff8e0b7..fac9f6e 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Include Id="VersionNumberInclude">\r
        <?define MajorVersion="0" ?>\r
-       <?define MinorVersion="3" ?>\r
-       <?define MicroVersion="3" ?>\r
+       <?define MinorVersion="4" ?>\r
+       <?define MicroVersion="0" ?>\r
        <?define BuildVersion="0" ?>\r
 </Include>\r