From: seraphy
Date: Sun, 6 Sep 2015 14:46:09 +0000 (+0900)
Subject: セットアップの追加、ヘルプの修正
X-Git-Tag: v1.2.0.2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=HEAD;p=seraphyscrtools%2FSeraphyScriptTools.git
セットアップの追加、ヘルプの修正
---
diff --git a/.gitignore b/.gitignore
index fc92797..3e1cf05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,8 @@
/Debug
/ipch
-/MBCSDebug
-/MBCSRelease
-/UnicodeDebug
-/UnicodeRelease
/x64
+/Win32
+/dist
SeraphyScriptTools.sdf
dlldata.c
SeraphyScriptTools.tlb
diff --git a/Help/objvector.htm b/Help/objvector.htm
index 72eee78..f2d9c84 100644
--- a/Help/objvector.htm
+++ b/Help/objvector.htm
@@ -39,6 +39,7 @@ function MM_swapImage() { //v3.0
![](obj.gif)
©®g£·éê³zñIuWFNgÅ·B
+¦ Version1.2.0.2È~Ai[³êélÍByValɧ³êéæ¤ÉÈèܵ½B(]ÍByRefÌlðA»ÌÜÜi[µÄ¢Üµ½B)
![](make.gif)
![](prop.gif)
CreateVector
@@ -67,6 +68,7 @@ function MM_swapImage() { //v3.0
![](met.gif)
ObjectMap Azzñ
+¦ Version1.2.0.2È~Ai[³êélÍByValɧ³êéæ¤ÉÈèܵ½B(]ÍByRefÌlðA»ÌÜÜi[µÄ¢Üµ½B)
![](make.gif)
![](obj.gif)
diff --git a/Help/top.htm b/Help/top.htm
index e75f54c..6daa0e5 100644
--- a/Help/top.htm
+++ b/Help/top.htm
@@ -11,8 +11,8 @@
![seraphyscripttoolswv](head.gif)
-
Version 1.0
- copyright(c) 2001/1/21
+ Version 1.2.0.2
+ copyright(c) 2015/9/6
seraphy
@@ -26,63 +26,41 @@
@t[ãÉxN^[OtBNXð`æµ½èóü·é±ÆªÅ«Ü·B
@æð\¦µ½èóü·é±ÆªÅ«Ü·
+
+¦ 2002NÉVer1.1ðöJµÄÈA·çXVµÄ¢Ü¹ñŵ½ªA2015NÉSeraphyScriptToolsÌx64/UnicodeÎðs¢Üµ½B
+¦ î{IÉÍC^[tFCXÉÏXÍÈ¢½ßVer1.1Ư¶g¢ûªÅ«Ü·B½¾µAVµ¢XPÈ~ÌEBhEX^CÉε½±ÆÉæèAæÊTCY̲®ªKvȪª éÂ\«ª èÜ·B
+
@
![®ì«](env.gif)
-@SeraphyScriptToolsÍAInternetExplorer5È~ÌXNvgGWðpðOñƵĢܷB
-@ܽAXNvgðÀs·é½ßÉÍWSHÌCXg[ªKvÅ·B
-@WSHÍA Windows98AWindows2000È~ÉÍWÅCXg[³êĢܷB
-@NT4.0âWin95ÌêÍ}CN\tgÌz[y[W©ç_E[hµÄ¾³¢B
+@SeraphyScriptToolsÍAWindowst®ÌXNvgGWðpðOñƵĢܷB
+
@ȺÌOSÅÌpðzèµÄ¢Ü·B
- - @Windows95iInernetExplore5È~ÆWSHªK{j
- - @WindowsNT4.0iSP4È~AIE5È~ÆWSHªK{j
- - @Windows98
- - @Windows2000
+ - Windows Vista SP2È~ (32/64rbg)
+
- Windows 7 SP1È~ (32/64rbg)
+
- Windows 8.1 (32/64rbg)
+
- Windows 10 (32/64rbg)
-@Win9xÅÍAêÉæÁÄÍDCOMÌCXg[ªKvƳêéêà èÜ·B
-@s § t
-@Internet Explorer5È~iXNvgGWÆDCOMÌCXg[ªÜÜêĢܷj
-2001N1»ÝAÅVÌXNvgGWͺLæè_E[hÅ«Ü·B
-http://www.microsoft.com/msdownload/vbscript/scripting.asp
+¦ ãLÍzèÅ èAãLÌ·×ÄÌ«ÅeXgµ½í¯ÅÍ èܹñB(JAeXgÍåÉWindows8 x64ÅsÁĢܷB)
@
![gpøð](lc.gif)
-@±Ì\tgEFAÍt[EFAƵAÇȽÅà§ÀȲp¢½¾¯Ü·B
-@½¾µAì ÍSeraphyÉ èA³fÅüÏ·é±ÆÍÈèܹñB
-@
-±Ì\tgEFAðpµ½A¢©ÈéÊÉ¢ÄàìÒ¨æÑÄzzÒAÐîÒÍêØÌÓCðíÈ¢àÌƵܷB
-@ ÜÅàpÒ©gÌÓCÌÍÍàɨ¢Ä²p¾³¢B
-@±±Å¢¤pÒÆÍASeraphyScriptToolsðp·éXNvgÌGh[U[ðÜÝÜ·B
-@SeraphyScriptToolsðGh[U[Aæ3ÒÉzz·éêÉÍAzzÒÍA±ÌgpøððྵȯêÎÈèܹñB
-@Äzz·éêÌ`ÔÉ¢ÄÍSeraphyScriptTools̯ê«ð¹ÈíÈ¢ÀèAfBAÌíÞâA[JCoÌíÞðâ¢Ü¹ñB
-@Æ©ÌCXg[ðpµÄ©Ü¢Ü¹ñB
-@CXg[ÉK{ÈÌÍSeraphyScriptTools{ÌÆwvt@CðÜÞÌ3ÂÅ·B
-@ÇÌtH_ÉRs[µÄà\¢Ü¹ñªAProgramFiles\seraphyware\scrtoltH_ð§µÜ·B
-
- - SeraphyScriptTools.DLL
- - SeraphyScriptTools.chm
- - SeraphyScriptTools.idx
-
-
@ȨAoOC³ÈÇÍIuWFNgÌã«ÆÈèÜ·ÌÅA«É¨¢ÄA©È縵à¯ê«ªÛ³êéÆÍÀçÈ¢±ÆðA 究߲¹³¾³¢BiIuWFNg\¢ªÙÈéVµ¢o[WÌ[XÍA±ÌÀèÅÍ èܹñBj
-@SeraphyÍo[WAbv̨mç¹âîñð¨mç¹·éA³¿Ì[OXgÉQÁµÄ¢Ü·B
-@[OXgÉQÁ·éÉÍxN^[ìÒy[W©çZtB[Ìy[WÉANZXµÄ¾³¢B
-@ܽAÅVîñÈÇðA±±©çæ¾·é±ÆªÅ«Ü·B
-@ȨAºLAhXÉÄAoNîñAv]A²Ó©ÈÇðe·é±ÆªÅ«Ü·B
- mailto:seraphyware@freeml.com
-
+CZXÍAApache License 2.0 ƵܷB
+¤pEñ¤pðâí¸NÅà©Rɲp¢½¾¯Ü·B
+{AvP[VÍ®SɳÛØÅ·B{AvP[Vðgpµ½A¢©ÈéÊÉ¢ÄàìÒ¨æÑÄzzÒÍÓCð¢Ü¹ñB
+ÅIpÒ©gÌÓCÌÍÍɨ¢Ä²p¾³¢B
+
+ȨA{vOÍCOMIuWFNgÆ¢¤«¿ÌsãACOMÌo[WÇðs¤Kvª èÜ·B
+àµAÆ©Éüϵ½o[Wð쬷éêÉÍACLSIDAPROGIDðÏXµA£ª¶µÈ¢æ¤ÉµÄ¾³¢B
+
![CXg[](is.gif)
-@CXg[Ít®µÄ¢Ü¹ñB
-@ð³ê½t@CðtH_²ÆCÓÌfBNgÉRs[µ½ ÆAregsvr32.exeðgÁÄASeraphyScriptTools.DLLÉ©Èo^³¹Ä¾³¢B
-@á)
-@regsvr32.exe "c:\progra~1\seraphy\scrtol\seraphyscripttools.dll"
-
-@½¾µo^³ê½êÉÍAuDllRegisterServer in xxxxx
-succeeded.vÆ¢¤bZ[Wª\¦³êÜ·B
-
-
-@o^ðÉεĢܷB
-@ACXg[Íregsvr32.exe -uÅo^ðµÄDLLðíµÄ¾³¢B
-
+Version1.2.0.2È~ÅÍInno SetupÉæéZbgAbvvOÉæéCXg[AACXg[ÆÈÁĢܷB
+64rbgOSÌêÍAx64Æx86Å̼ûª©®IÉCXg[³êÜ·B32rbgOSÌêÍx86ÅÌݪCXg[³êÜ·B
+ACXg[ÍRg[plÌvO©çíÅ«Ü·B
+
@
![XVð](hs.gif)
+2015/9/6 Version1.2.0.2@CXg[ÎACLSID·µÖ¦AtH__CAOÌq[vG[oOC³
+
2015/8/17 Version1.2.0.1@x64/x86¼ÎAMBCS/UNICODE¼ÎÅÌx[^[X
+
2002/10/9 Version1.1@y÷ÈoOC³
2001/1 Version1.0@öJ
2000/9@Version1.0x[^E[X
@
diff --git a/SeraphyScriptTools.h b/SeraphyScriptTools.h
index 30bc042..575b807 100644
--- a/SeraphyScriptTools.h
+++ b/SeraphyScriptTools.h
@@ -4,10 +4,10 @@
/* File created by MIDL compiler version 8.00.0603 */
-/* at Sun Sep 06 22:12:15 2015
+/* at Sun Sep 06 23:11:30 2015
*/
/* Compiler settings for SeraphyScriptTools.idl:
- Oicf, W1, Zp8, env=Win64 (32b run), target_arch=AMD64 8.00.0603
+ Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603
protocol : dce , ms_ext, c_ext, robust
error checks: allocation ref bounds_check enum stub_data
VC __declspec() decoration level:
diff --git a/SeraphyScriptTools.rc b/SeraphyScriptTools.rc
index a3006d8..d9f1066 100644
--- a/SeraphyScriptTools.rc
+++ b/SeraphyScriptTools.rc
@@ -93,8 +93,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,0,1
- PRODUCTVERSION 1,2,0,1
+ FILEVERSION 1,2,0,2
+ PRODUCTVERSION 1,2,0,2
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -110,12 +110,12 @@ BEGIN
BLOCK "041104b0"
BEGIN
VALUE "FileDescription", "SeraphyScriptTools Module"
- VALUE "FileVersion", "1.2.0.1"
+ VALUE "FileVersion", "1.2.0.2"
VALUE "InternalName", "SeraphyScriptTools"
VALUE "LegalCopyright", "Copyright seraphyware.jp 2000, 2015"
VALUE "OriginalFilename", "SeraphyScriptTools.DLL"
VALUE "ProductName", "SeraphyScriptTools Module"
- VALUE "ProductVersion", "1.2.0.1"
+ VALUE "ProductVersion", "1.2.0.2"
END
END
BLOCK "VarFileInfo"
diff --git a/SeraphyScriptTools.vcxproj b/SeraphyScriptTools.vcxproj
index af7c807..5e03641 100644
--- a/SeraphyScriptTools.vcxproj
+++ b/SeraphyScriptTools.vcxproj
@@ -122,9 +122,12 @@
false
+ $(Platform)\$(Configuration)\
+ $(SolutionDir)$(Platform)\$(Configuration)\
false
+ $(Platform)\$(Configuration)\
false
@@ -134,9 +137,12 @@
true
+ $(Platform)\$(Configuration)\
+ $(SolutionDir)$(Platform)\$(Configuration)\
true
+ $(Platform)\$(Configuration)\
true
@@ -204,6 +210,7 @@
Windows
false
SeraphyScriptTools.def
+ $(OutDir)$(TargetName)x64$(TargetExt)
.\ReleaseUMinDependency/SeraphyScriptTools.tlb
@@ -225,6 +232,7 @@
Windows
false
SeraphyScriptTools.def
+ $(OutDir)$(TargetName)x64$(TargetExt)
.\ReleaseUMinDependency/SeraphyScriptTools.tlb
@@ -292,6 +300,7 @@
true
Windows
SeraphyScriptTools.def
+ $(OutDir)$(TargetName)x64$(TargetExt)
.\DebugU/SeraphyScriptTools.tlb
@@ -314,6 +323,7 @@
true
Windows
SeraphyScriptTools.def
+ $(OutDir)$(TargetName)x64$(TargetExt)
.\DebugU/SeraphyScriptTools.tlb
diff --git a/SeraphyScriptToolsSetup.iss b/SeraphyScriptToolsSetup.iss
new file mode 100644
index 0000000..a489d1b
--- /dev/null
+++ b/SeraphyScriptToolsSetup.iss
@@ -0,0 +1,195 @@
+[Setup]
+; XVEÇÁCXg[̽ß̯ʼ
+; (¯ê¼Å êÎXVCXg[A»¤ÅȯêÎÇÁCXg[ÆÈé.)
+AppId = SeraphyScriptTools1.2
+
+; \¦¼
+AppName = SeraphyScriptTools
+; \¦o[W
+AppVersion = 1.2
+
+; oͼ
+OutputBaseFilename={#SetupSetting("AppName")}-{#SetupSetting("AppVersion")}_setup
+; oÍæfBNg
+OutputDir=dist
+
+; \¦·ézzÒ¼
+AppPublisher=seraphyware.jp
+; ì \¦
+AppCopyright=Copyright 2015 seraphy (seraphyware.jp)
+
+; ZbgAbvÌo[Wîñ
+VersionInfoCompany = seraphyware.jp
+VersionInfoCopyright = copyright 2001/1 - 2015/9 seraphy (seraphyware.jp)
+VersionInfoDescription = SeraphyScriptTools (DLL) Installer (x64/x86)
+VersionInfoVersion = 1.2.0.2
+
+; vOO[v
+DefaultGroupName = SeraphyScriptTools
+
+; vOO[vÌsì¬ðÂÆ·é
+AllowNoIcons=yes
+
+
+; íÉcommonÉüêéÌÅCXg[æðâ¢í¹È¢.
+DisableDirPage = yes
+
+
+; ftHgÌCXg[æÌwè
+; (CXg[æÍACXg[ªÛ¶³êéêÅà é)
+DefaultDirName={cf}\{#SetupSetting("AppName")}\{#SetupSetting("AppVersion")}
+
+
+; 64bitÍx64A[LeN`ðzè
+ArchitecturesInstallIn64BitMode = x64
+
+; ú{êEpêÌ¢¸êÅàÈ¢êÌݾêIðæÊðo·.
+ShowLanguageDialog = auto
+
+; ³k`®
+Compression=lzma2/max
+SolidCompression=yes
+
+
+[Languages]
+Name: "ja"; MessagesFile: "compiler:Languages/Japanese.isl";
+Name: "en"; MessagesFile: "compiler:Default.isl";
+
+[Types]
+Name: "Minimum"; Description: "{cm:MinInst}";
+Name: "Full"; Description: "{cm:FullInst}";
+Name: "Custom"; Description: "{cm:CustomInst}"; Flags: iscustom;
+
+[Components]
+Name: "CoreDLL"; Description: "Core DLL"; Types: Minimum Full Custom; Flags: fixed
+Name: "Help"; Description: "Help"; Types: Full Custom;
+Name: "Samples"; Description: "Samples"; Types: Full Custom;
+
+[Files]
+#define DLL_NAME_X64 "SeraphyScriptToolsx64.dll"
+#define DLL_NAME_X86 "SeraphyScriptTools.dll"
+
+; 64rbgÅdll
+Source: "x64\UnicodeRelease\{#DLL_NAME_X64}"; DestDir: "{code:GetTargetDir}"; Flags: regserver 64bit; MinVersion: 0,5.01sp3; Check: Is64BitInstallMode; Components: "CoreDLL";
+
+; 32rbgÅdll
+Source: "Win32\UnicodeRelease\{#DLL_NAME_X86}"; DestDir: "{code:GetTargetDirX86}"; Flags: regserver 32bit; MinVersion: 0,5.01sp3; Components: "CoreDLL";
+
+; wv
+Source: "Help/seraphyscripttools.chm"; DestDir: "{code:GetTargetDir}/Help"; Flags: isreadme; Components: "Help";
+
+; Tv
+Source: "TestScript/*"; DestDir: "{code:GetTargetDir}/Samples"; Components: "Samples";
+
+[Icons]
+; wv
+Name: "{group}\Help"; Filename: "{code:GetTargetDir}\Help\seraphyscripttools.chm"; WorkingDir: "{code:GetTargetDir}\Help\"; Components: "Help";
+
+; Tv
+Name: "{group}\Samples\form1.vbs"; Filename: "{code:GetTargetDir}\Samples\form1.vbs"; WorkingDir: "{code:GetTargetDir}\Samples\"; Components: "Samples";
+Name: "{group}\Samples\form2.vbs"; Filename: "{code:GetTargetDir}\Samples\form2.vbs"; WorkingDir: "{code:GetTargetDir}\Samples\"; Components: "Samples";
+Name: "{group}\Samples\form3.vbs"; Filename: "{code:GetTargetDir}\Samples\form3.vbs"; WorkingDir: "{code:GetTargetDir}\Samples\"; Components: "Samples";
+Name: "{group}\Samples\bitmap.vbs"; Filename: "{code:GetTargetDir}\Samples\bitmap.vbs"; WorkingDir: "{code:GetTargetDir}\Samples\"; Components: "Samples";
+Name: "{group}\Samples\draw1.vbs"; Filename: "{code:GetTargetDir}\Samples\draw1.vbs"; WorkingDir: "{code:GetTargetDir}\Samples\"; Components: "Samples";
+Name: "{group}\Samples\event1.vbs"; Filename: "{code:GetTargetDir}\Samples\event1.vbs"; WorkingDir: "{code:GetTargetDir}\Samples\"; Components: "Samples";
+Name: "{group}\Samples\tree_list.vbs"; Filename: "{code:GetTargetDir}\Samples\tree_list.vbs"; WorkingDir: "{code:GetTargetDir}\Samples\"; Components: "Samples";
+
+
+[CustomMessages]
+en.x86_x64=Install both x86 and x64 version.
+ja.x86_x64=x86ÅÆx64Å̼ûªCXg[³êÜ·.
+
+en.x86=Install x86 version.
+ja.x86=x86ŪCXg[³êÜ·.
+
+en.MinInst=Minimum
+ja.MinInst=Ŭ\¬
+
+en.FullInst=Full
+ja.FullInst=®S
+
+en.CustomInst=Custom
+ja.CustomInst=JX^
+
+
+[Code]
+
+// 64rbgÅÌCXg[æ
+// (32rbg[hÌêÍ32rbgÅƯ¶êðw·.)
+function GetTargetDir(value: String): String;
+var
+ vartmp: String;
+begin
+ if Is64BitInstallMode then begin
+ vartmp := '{cf64}';
+ end else begin
+ vartmp := '{cf}';
+ end;
+ Result := ExpandConstant(vartmp +'\{#SetupSetting("AppName")}\{#SetupSetting("AppVersion")}');
+end;
+
+// 32rbgÅÌCXg[æ
+function GetTargetDirX86(value: String): String;
+begin
+ Result := ExpandConstant('{cf32}\{#SetupSetting("AppName")}\{#SetupSetting("AppVersion")}');
+end;
+
+// CXg[æÌ\¦
+function UpdateReadyMemo(Space, NewLine, MemoUserInfoInfo, MemoDirInfo,
+ MemoTypeInfo, MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo: String): String;
+begin
+ // CXg[[h (x64/x86 or x86)
+ if Is64BitInstallMode then begin
+ Result := Result + ExpandConstant('{cm:x86_x64}') + NewLine;
+ end else begin
+ Result := Result + ExpandConstant('{cm:x86}') + NewLine;
+ end;
+
+ Result := Result + NewLine;
+
+ // CXg[æÌ\¦
+ Result := Result + 'Install directory:' + NewLine;
+ if Is64BitInstallMode then begin
+ // x64/x86²ÆÉ
+ Result := Result + Space + ExpandConstant('x64 = {code:GetTargetDir}') + NewLine;
+ Result := Result + Space + ExpandConstant('x86 = {code:GetTargetDirX86}') + NewLine;
+ end else begin
+ // x86ÌÝ
+ Result := Result + Space + ExpandConstant('{code:GetTargetDirX86}') + NewLine;
+ end;
+
+ // wvt@CÌCXg[æ
+ if IsComponentSelected('Help') then begin
+ Result := Result + NewLine;
+ Result := Result + 'Help directory:' + NewLine;
+ Result := Result + Space + ExpandConstant('{code:GetTargetDir}\Help') + NewLine;
+ end;
+
+ // TvÌCXg[æ
+ if IsComponentSelected('Samples') then begin
+ Result := Result + NewLine;
+ Result := Result + 'Samples directory:' + NewLine;
+ Result := Result + Space + ExpandConstant('{code:GetTargetDir}\Samples') + NewLine;
+ end;
+end;
+
+// y[WXLbvÌ»è
+function ShouldSkipPage(PageID: Integer): Boolean;
+begin
+ if PageID = wpSelectProgramGroup then begin
+ // Help, SamplesÆàÉIðµÄ¢È¢êÍX^[gj
[ð쬵ȢÌÅâ¢í¹sv
+ Result := not IsComponentSelected('Help') and not IsComponentSelected('Samples');
+ Exit;
+ end;
+ Result := False;
+end;
+
+// CXg[JnAI¹ÈÇÌXebvÅÄÑo³êé
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+ Log('CurStepChanged(' + IntToStr(Ord(CurStep)) + ') called');
+
+ if CurStep = ssPostInstall then begin
+ end;
+end;
+