PATCH: [ 1607375 ] Move runtime files to separate folder in trunk

diff --git a/Installer/InnoSetup/Changes.txt b/Installer/InnoSetup/Changes.txt
index 4305f4e..2edbd5d 100755 (executable)
--- a/Installer/InnoSetup/Changes.txt
+++ b/Installer/InnoSetup/Changes.txt
@@ -1,3 +1,8 @@
+2007-01-22 Kimmo
+ PATCH: [ 1607375 ] Move runtime files to separate folder in trunk
+  Move InnoSetup/Runtimes folder to Installer/Runtimes
+  Delete Installer/Runtimes/Download URLs folder
+
 2007-01-15 Kimmo
  PATCH: [ 1414233 ] Template ExternalArchiveFormat.ini
   Submitted by Perry

diff --git a/Installer/InnoSetup/Runtimes/Download URLs/7-Zip.URL b/Installer/InnoSetup/Runtimes/Download URLs/7-Zip.URL
deleted file mode 100755 (executable)
index 0f80581..0000000
Binary files a/Installer/InnoSetup/Runtimes/Download URLs/7-Zip.URL and /dev/null differ

diff --git a/Installer/InnoSetup/Runtimes/Download URLs/Comctl32.DLL.URL b/Installer/InnoSetup/Runtimes/Download URLs/Comctl32.DLL.URL
deleted file mode 100755 (executable)
index fd1c1ed..0000000
Binary files a/Installer/InnoSetup/Runtimes/Download URLs/Comctl32.DLL.URL and /dev/null differ

diff --git a/Installer/InnoSetup/Runtimes/Download URLs/Internet Explorer.URL b/Installer/InnoSetup/Runtimes/Download URLs/Internet Explorer.URL
deleted file mode 100755 (executable)
index 0756f8c..0000000
--- a/Installer/InnoSetup/Runtimes/Download URLs/Internet Explorer.URL
+++ /dev/null
@@ -1,3 +0,0 @@
-[InternetShortcut]
-URL=http://www.microsoft.com/ie
-Modified=50D21E062208C40135

diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss
index bb6915f..a9fba73 100755 (executable)
--- a/Installer/InnoSetup/WinMerge.iss
+++ b/Installer/InnoSetup/WinMerge.iss
@@ -324,10 +324,10 @@ Source: ..\..\Docs\Users\Files.txt; DestDir: {app}; Flags: promptifolder; Compon
 ; We still need APPHelp.dll!
 
 ; begin VC system files
-Source: Runtimes\mfc71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Core
-Source: Runtimes\mfc71u.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; MinVersion: 0, 4; Components: Core
-Source: Runtimes\msvcr71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Core
-Source: Runtimes\msvcp71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Core
+Source: ..\Runtimes\mfc71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Core
+Source: ..\Runtimes\mfc71u.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; MinVersion: 0, 4; Components: Core
+Source: ..\Runtimes\msvcr71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Core
+Source: ..\Runtimes\msvcp71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Core
 ; end VC system files
 
 Source: ..\..\Build\MergeRelease\ShellExtension.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 4, 0; Check: not IsWin64

diff --git a/Installer/InnoSetup/Runtimes/Docs/Comctl32.DLL.mht b/Installer/Runtimes/Docs/Comctl32.DLL.mht
similarity index 100%
rename from Installer/InnoSetup/Runtimes/Docs/Comctl32.DLL.mht
rename to Installer/Runtimes/Docs/Comctl32.DLL.mht

diff --git a/Installer/InnoSetup/Runtimes/Docs/Inno Setup KB for Visual C++ Distribution.mht b/Installer/Runtimes/Docs/Inno Setup KB for Visual C++ Distribution.mht
similarity index 100%
rename from Installer/InnoSetup/Runtimes/Docs/Inno Setup KB for Visual C++ Distribution.mht
rename to Installer/Runtimes/Docs/Inno Setup KB for Visual C++ Distribution.mht

diff --git a/Installer/InnoSetup/Runtimes/Docs/Visual C++ Distribution.mht b/Installer/Runtimes/Docs/Visual C++ Distribution.mht
similarity index 100%
rename from Installer/InnoSetup/Runtimes/Docs/Visual C++ Distribution.mht
rename to Installer/Runtimes/Docs/Visual C++ Distribution.mht

diff --git a/Installer/InnoSetup/Runtimes/mfc71.dll b/Installer/Runtimes/mfc71.dll
similarity index 100%
rename from Installer/InnoSetup/Runtimes/mfc71.dll
rename to Installer/Runtimes/mfc71.dll

diff --git a/Installer/InnoSetup/Runtimes/mfc71u.dll b/Installer/Runtimes/mfc71u.dll
similarity index 100%
rename from Installer/InnoSetup/Runtimes/mfc71u.dll
rename to Installer/Runtimes/mfc71u.dll

diff --git a/Installer/InnoSetup/Runtimes/msvcp71.dll b/Installer/Runtimes/msvcp71.dll
similarity index 100%
rename from Installer/InnoSetup/Runtimes/msvcp71.dll
rename to Installer/Runtimes/msvcp71.dll

diff --git a/Installer/InnoSetup/Runtimes/msvcr71.dll b/Installer/Runtimes/msvcr71.dll
similarity index 100%
rename from Installer/InnoSetup/Runtimes/msvcr71.dll
rename to Installer/Runtimes/msvcr71.dll