バタ58からマージ

[gikonavigoeson/gikonavi.git] / readme / gikoSetup.iss

diff --git a/readme/gikoSetup.iss b/readme/gikoSetup.iss
index 623ebf2..f271227 100644 (file)
--- a/readme/gikoSetup.iss
+++ b/readme/gikoSetup.iss
@@ -13,8 +13,8 @@ SourceDir=G:\Release
 OutputDir=G:\InnoSetup\Output
 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
 ; \83M\83R\83i\83r\82Ì\83o\81[\83W\83\87\83\93\82É\82 \82í\82¹\82Ä\82­\82¾\82³\82¢
-VersionInfoVersion=1.56.0.713
-OutputBaseFilename=gikoNavi_1.56.0.713_setup
+VersionInfoVersion=1.58.1.764
+OutputBaseFilename=gikoNavi_b58_setup
 
 
 [Tasks]
@@ -22,19 +22,19 @@ Name: "startmenuicon"; Description: "
 Name: "desktopicon"; Description: "\83f\83X\83N\83g\83b\83v\82É\83V\83\87\81[\83g\83J\83b\83g\82ð\8dì\90¬"; GroupDescription: "\83V\83\87\81[\83g\83J\83b\83g"; Flags:
 
 [Dirs]
-Name: "{app}\Log" ; Permissions: everyone-full
-Name: "{app}\Sound" ; Permissions: everyone-full
-Name: "{app}\config\Board" ; Permissions: everyone-full
-Name: "{app}\config\BoardPlugin" ; Permissions: everyone-full
-Name: "{app}\config\NGwords" ; Permissions: everyone-full
+Name: "{app}\Log"
+Name: "{app}\Sound"
+Name: "{app}\config\Board"
+Name: "{app}\config\BoardPlugin"
+Name: "{app}\config\NGwords"
 
 
 [Files]
-Source: * ; Destdir: {app} ;Excludes: "gikoNavi.exe" ; Permissions: everyone-full
+Source: * ; Destdir: {app} ;Excludes: "gikoNavi.exe" ;
 Source: "gikoNavi.exe" ; Destdir: {app} ;Permissions: everyone-full; Flags: ignoreversion
-Source: "Sound\*" ; Destdir: {app}\Sound ;Flags: createallsubdirs recursesubdirs ; Permissions: everyone-full
-Source: "config\*" ; Destdir: {app}\config ;Excludes: "*.dll";Flags: createallsubdirs recursesubdirs ; Permissions: everyone-full
-Source: "config\BoardPlugin\*.dll" ; Destdir: {app}\config\BoardPlugin ;Flags: ignoreversion; Permissions: everyone-full
+Source: "Sound\*" ; Destdir: {app}\Sound ;Flags: createallsubdirs recursesubdirs ;
+Source: "config\*" ; Destdir: {app}\config ;Excludes: "*.dll";Flags: createallsubdirs recursesubdirs ;
+Source: "config\BoardPlugin\*.dll" ; Destdir: {app}\config\BoardPlugin ;Flags: ignoreversion;
 
 [Icons]
 Name: "{group}\Readme"; Filename: "{app}\readme.txt"; Tasks: startmenuicon
@@ -56,9 +56,6 @@ Name: japanese; MessagesFile: compiler:Languages\Japanese.isl
 
 [Code]
 procedure CurStepChanged(CurStep: TSetupStep);
-var
-  path :String;
-  p : Integer;
 begin
   case CurStep of
     ssInstall:
@@ -66,7 +63,8 @@ begin
         if (RegKeyExists(HKEY_LOCAL_MACHINE,
             'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\gikoNavi')) then
           begin
-            if MsgBox('\88È\91O\82Ì\83o\81[\83W\83\87\83\93\82Ì\83A\83\93\83C\83\93\83X\83g\81[\83\8b\8fî\95ñ\82ð\8dí\8f\9c\82µ\82Ä\82æ\82ë\82µ\82¢\82Å\82µ\82å\82¤\82©\81H',
+            if MsgBox('\88È\91O\82Ì\83o\81[\83W\83\87\83\93\82Ì\83A\83\93\83C\83\93\83X\83g\81[\83\8b\8fî\95ñ\82ð\8dí\8f\9c\82µ\82Ä\82æ\82ë\82µ\82¢\82Å\82µ\82å\82¤\82©\81H'
+              + #10#13 + '(\83o\83^56\88È\91O\82©\82ç\82Ì\83A\83b\83v\83f\81[\83g\82Ì\8fê\8d\87\81u\82Í\82¢\81v\90\84\8f§)',
                mbConfirmation, MB_YESNO) = IDYES then
               begin
                   if not RegDeleteKeyIncludingSubkeys(HKEY_LOCAL_MACHINE,
@@ -92,7 +90,7 @@ begin
         begin
           DelTree(path, True, True, True);
         end;
-        
+
         path := ExpandConstant('{app}') + '\config';
         if MsgBox(path + '\83t\83H\83\8b\83_\88È\89º\82ð\8a®\91S\82É\8fÁ\8b\8e\82µ\82Ä\82æ\82ë\82µ\82¢\82Å\82µ\82å\82¤\82©\81H', mbConfirmation, MB_YESNO) = IDYES then
         begin