• R/O
  • SSH

MassPlusPlus: Commit

Mass++ ソースリポジトリ


Commit MetaInfo

Revision2beb5ba3a640b2928b5244f305d233f066b019af (tree)
Time2015-06-07 21:54:17
AuthorMasaki Murase
CommiterMasaki Murase

Log Message

modified InnnoSetup Configuration to install Identififcation and Mascot Plug-ins
changed VC2010 Redistribution package to VC2010 SP1 Redistiribution
removed VC2008 Redistribution (for test)

Change Summary

Incremental Difference

diff -r 619a409b044a -r 2beb5ba3a640 build/InnoSetup/mspp-64.iss
--- a/build/InnoSetup/mspp-64.iss Sun Jun 07 21:52:12 2015 +0900
+++ b/build/InnoSetup/mspp-64.iss Sun Jun 07 21:54:17 2015 +0900
@@ -103,7 +103,11 @@
103103 Source: "build\msvs\stage\x64-Release\plugins\MatrixOverlappingViewPlugin\*"; DestDir: "{app}\plugins\MatrixOverlappingViewPlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
104104 Source: "build\msvs\stage\x64-Release\plugins\BasicScalingPlugin\*"; DestDir: "{app}\plugins\BasicScalingPlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
105105 Source: "build\msvs\stage\x64-Release\plugins\MatrixPeaksMergePlugin\*"; DestDir: "{app}\plugins\MatrixPeaksMergePlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
106+Source: "build\msvs\stage\x64-Release\plugins\IdentificationPlugin\*"; DestDir: "{app}\plugins\IdentificationPlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
107+Source: "build\msvs\stage\x64-Release\plugins\MascotSearchPlugin\*"; DestDir: "{app}\plugins\MascotSearchPlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
108+Source: "build\msvs\stage\x64-Release\plugins\MascotPMFForLCMSPlugin\*"; DestDir: "{app}\plugins\MascotPMFForLCMSPlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
106109 Source: "build\msvs\stage\x64-Release\plugins\XTandemSearchPlugin\*"; DestDir: "{app}\plugins\XTandemSearchPlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
110+Source: "build\msvs\opt\tandem\*"; DestDir: "{app}\opt\tandem"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
107111 Source: "build\msvs\stage\x64-Release\plugins\MassBankToolsPlugin\*"; DestDir: "{app}\plugins\MassBankToolsPlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
108112 Source: "build\msvs\stage\x64-Release\plugins\CompoundDbPlugin\*"; DestDir: "{app}\plugins\CompoundDbPlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
109113 Source: "build\msvs\stage\x64-Release\plugins\TppPlugin\*"; DestDir: "{app}\plugins\TppPlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
@@ -279,22 +283,22 @@
279283 end;
280284
281285
282-function InstallCpp2008(url: String): Boolean;
283-var
284- Rslt: boolean;
285- CHECK_KEY: String;
286-
287- begin
288- Rslt := True;
289- CHECK_KEY := 'SOFTWARE\MOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{9A25302D-30C0-39D9-BD6F-21E6EC160475}';
290- if RegKeyExists(HKEY_LOCAL_MACHINE, CHECK_KEY) then
291- Rslt := False;
292- if Rslt then
293- begin
294- UrlDownloadToFile(0, PChar(url), PChar(ExpandConstant('{tmp}') + '\vc9-' + ExtractFileName(url)), 0, 0);
295- end;
296- Result := Rslt;
297-end;
286+//function InstallCpp2008(url: String): Boolean;
287+//var
288+// Rslt: boolean;
289+// CHECK_KEY: String;
290+//
291+// begin
292+// Rslt := True;
293+// CHECK_KEY := 'SOFTWARE\MOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{9A25302D-30C0-39D9-BD6F-21E6EC160475}';
294+// if RegKeyExists(HKEY_LOCAL_MACHINE, CHECK_KEY) then
295+// Rslt := False;
296+// if Rslt then
297+// begin
298+// UrlDownloadToFile(0, PChar(url), PChar(ExpandConstant('{tmp}') + '\vc9-' + ExtractFileName(url)), 0, 0);
299+// end;
300+// Result := Rslt;
301+//end;
298302
299303 function InstallFramework4(url: String): Boolean;
300304 var
@@ -478,6 +482,7 @@
478482
479483
480484 [Run]
481-Filename: "{tmp}\vcredist_x64.exe"; StatusMsg: "Installing Visual C++ 2010 runtime ..."; Check: InstallCpp('http://download.microsoft.com/download/3/2/2/3224B87F-CFA0-4E70-BDA3-3DE650EFEBA5/vcredist_x64.exe');
482-Filename: "{tmp}\vc9-vcredist_x86.exe"; StatusMsg: "Installing Visual C++ 2008 runtime ..."; Check: InstallCpp2008('http://download.microsoft.com/download/d/d/9/dd9a82d0-52ef-40db-8dab-795376989c03/vcredist_x86.exe');
485+;Filename: "{tmp}\vcredist_x64.exe"; StatusMsg: "Installing Visual C++ 2010 runtime ..."; Check: InstallCpp('http://download.microsoft.com/download/3/2/2/3224B87F-CFA0-4E70-BDA3-3DE650EFEBA5/vcredist_x64.exe');
486+Filename: "{tmp}\vcredist_x64.exe"; StatusMsg: "Installing Visual C++ 2010 runtime ..."; Check: InstallCpp('http://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x64.exe');
487+;Filename: "{tmp}\vc9-vcredist_x86.exe"; StatusMsg: "Installing Visual C++ 2008 runtime ..."; Check: InstallCpp2008('http://download.microsoft.com/download/d/d/9/dd9a82d0-52ef-40db-8dab-795376989c03/vcredist_x86.exe');
483488 Filename: "{tmp}\dotNetFx40_Full_x86_x64.exe"; StatusMsg: "Installing Framework4 runtime ..."; Check: InstallFramework4('http://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe');
diff -r 619a409b044a -r 2beb5ba3a640 build/InnoSetup/mspp.iss
--- a/build/InnoSetup/mspp.iss Sun Jun 07 21:52:12 2015 +0900
+++ b/build/InnoSetup/mspp.iss Sun Jun 07 21:54:17 2015 +0900
@@ -102,7 +102,11 @@
102102 Source: "build\msvs\stage\Win32-Release\plugins\MatrixOverlappingViewPlugin\*"; DestDir: "{app}\plugins\MatrixOverlappingViewPlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
103103 Source: "build\msvs\stage\Win32-Release\plugins\BasicScalingPlugin\*"; DestDir: "{app}\plugins\BasicScalingPlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
104104 Source: "build\msvs\stage\Win32-Release\plugins\MatrixPeaksMergePlugin\*"; DestDir: "{app}\plugins\MatrixPeaksMergePlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
105+Source: "build\msvs\stage\Win32-Release\plugins\IdentificationPlugin\*"; DestDir: "{app}\plugins\IdentificationPlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
106+Source: "build\msvs\stage\Win32-Release\plugins\MascotSearchPlugin\*"; DestDir: "{app}\plugins\MascotSearchPlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
107+Source: "build\msvs\stage\Win32-Release\plugins\MascotPMFForLCMSPlugin\*"; DestDir: "{app}\plugins\MascotPMFForLCMSPlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
105108 Source: "build\msvs\stage\Win32-Release\plugins\XTandemSearchPlugin\*"; DestDir: "{app}\plugins\XTandemSearchPlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
109+Source: "build\msvs\opt\tandem\*"; DestDir: "{app}\opt\tandem"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
106110 Source: "build\msvs\stage\Win32-Release\plugins\MassBankToolsPlugin\*"; DestDir: "{app}\plugins\MassBankToolsPlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
107111 Source: "build\msvs\stage\Win32-Release\plugins\CompoundDbPlugin\*"; DestDir: "{app}\plugins\CompoundDbPlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
108112 Source: "build\msvs\stage\Win32-Release\plugins\TppPlugin\*"; DestDir: "{app}\plugins\TppPlugin"; Excludes: ".*"; Flags: recursesubdirs; Components: programfiles
@@ -278,23 +282,21 @@
278282 Result := Rslt;
279283 end;
280284
281-
282-function InstallCpp2008(url: String): Boolean;
283-var
284- Rslt: boolean;
285- CHECK_KEY: String;
286-
287- begin
288- Rslt := True;
289- CHECK_KEY := 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9A25302D-30C0-39D9-BD6F-21E6EC160475}';
290- if RegKeyExists(HKEY_LOCAL_MACHINE, CHECK_KEY) then
291- Rslt := False;
292- if Rslt then
293- begin
294- UrlDownloadToFile(0, PChar(url), PChar(ExpandConstant('{tmp}') + '\vc9-' + ExtractFileName(url)), 0, 0);
295- end;
296- Result := Rslt;
297-end;
285+ //function InstallCpp2008(url: String): Boolean;
286+//var // Rslt: boolean;
287+// CHECK_KEY: String;
288+//
289+// begin
290+// Rslt := True;
291+// CHECK_KEY := 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9A25302D-30C0-39D9-BD6F-21E6EC160475}';
292+// if RegKeyExists(HKEY_LOCAL_MACHINE, CHECK_KEY) then
293+// Rslt := False;
294+// if Rslt then
295+// begin
296+// UrlDownloadToFile(0, PChar(url), PChar(ExpandConstant('{tmp}') + '\vc9-' + ExtractFileName(url)), 0, 0);
297+// end;
298+// Result := Rslt;
299+//end;
298300
299301 function InstallFramework4(url: String): Boolean;
300302 var
@@ -490,6 +492,8 @@
490492
491493
492494 [Run]
493-Filename: "{tmp}\vcredist_x86.exe"; StatusMsg: "Installing Visual C++ 2010 runtime ..."; Check: InstallCpp('http://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe');
494-Filename: "{tmp}\vc9-vcredist_x86.exe"; StatusMsg: "Installing Visual C++ 2008 runtime ..."; Check: InstallCpp2008('http://download.microsoft.com/download/d/d/9/dd9a82d0-52ef-40db-8dab-795376989c03/vcredist_x86.exe');
495+;Filename: "{tmp}\vcredist_x86.exe"; StatusMsg: "Installing Visual C++ 2010 runtime ..."; Check: InstallCpp('http://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe');
496+Filename: "{tmp}\vcredist_x86.exe"; StatusMsg: "Installing Visual C++ 2010 runtime ..."; Check: InstallCpp('http://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe');
497+;Filename: "{tmp}\vc9-vcredist_x86.exe"; StatusMsg: "Installing Visual C++ 2008 runtime ..."; Check: InstallCpp2008('http://download.microsoft.com/download/d/d/9/dd9a82d0-52ef-40db-8dab-795376989c03/vcredist_x86.exe');
498+;Filename: "{tmp}\vc9-vcredist_x86.exe"; StatusMsg: "Installing Visual C++ 2008 runtime ..."; Check: InstallCpp2008('http://download.microsoft.com/download/1/b/2/1b2312a1-b2e5-479c-9103-d9616e6761d9/vcredist_x86.exe');
495499 Filename: "{tmp}\dotNetFx40_Full_x86_x64.exe"; StatusMsg: "Installing Framework4 runtime ..."; Check: InstallFramework4('http://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe');
diff -r 619a409b044a -r 2beb5ba3a640 doc/release-doc/License-BSD.txt
--- a/doc/release-doc/License-BSD.txt Sun Jun 07 21:52:12 2015 +0900
+++ b/doc/release-doc/License-BSD.txt Sun Jun 07 21:54:17 2015 +0900
@@ -1,4 +1,4 @@
1-Copyright (c) 2015, Masaki Murase
1+Copyright (c) 2015, Mass++ Users' Group
22 All rights reserved.
33
44 Redistribution and use in source and binary forms, with or without
@@ -21,4 +21,4 @@
2121 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
2222 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2323 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
24-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
24+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Show on old repository browser