Changeset 719 in dev for trunk

Timestamp:

Aug 13, 2008, 11:01:29 PM (16 years ago)

Author:

dai

Message:

• ab_breakpoint.tmpをテンポラリディレクトリに生成するようにした。
• pgm.tmpをユーザ空間に生成するようにした。
• GetUserAppDir/GetIdeUserAppDir/GetAbcUserAppDirの各メソッドを用意。用途別に呼び出し側の制御を分けた。

Location:

trunk/ab5.0/abdev

Files:

• BasicCompiler_Common/BasicCompiler.cpp (modified) (2 diffs)
• BasicCompiler_Common/NonVolatile.cpp (modified) (3 diffs)
• BasicCompiler_Common/include/Program.h (modified) (1 diff)
• BasicCompiler_Common/src/BreakPoint.cpp (modified) (1 diff)
• BasicCompiler_Common/src/Messenger.cpp (modified) (1 diff)
• BasicCompiler_Common/src/Program.cpp (modified) (2 diffs)
• ab_common/include/Environment.h (modified) (1 diff)
• ab_common/src/Environment.cpp (modified) (1 diff)
• abdev/Debugger.cpp (modified) (1 diff)
• abdev/NonVolatile.cpp (modified) (3 diffs)
• abdev/include/Program.h (modified) (1 diff)
• abdev/src/MainFrame.cpp (modified) (2 diffs)
• abdev/src/Program.cpp (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.cpp

@@ -240 +240 @@
 
             hFile=CreateFile(
-                ( ActiveBasic::Common::Environment::GetAbdevRootPath() + "\\pgm.tmp" ).c_str(),
+                ( ActiveBasic::Common::Environment::GetUserAppDir() + "\\pgm.tmp" ).c_str(),
                 GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_TEMPORARY,NULL);
             WriteFile(hFile,FileName,lstrlen(FileName),&dw,NULL);
@@ -696 +696 @@
         DWORD dwAccessBytes;
         hFile=CreateFile(
-            ( ActiveBasic::Common::Environment::GetAbdevRootPath() + "\\pgm.tmp" ).c_str(),
+            ( ActiveBasic::Common::Environment::GetUserAppDir() + "\\pgm.tmp" ).c_str(),
             GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
         if(hFile!=INVALID_HANDLE_VALUE){

trunk/ab5.0/abdev/BasicCompiler_Common/NonVolatile.cpp

@@ -105 +105 @@
 
     //開く
-    buffer=ReadBuffer_NonErrMsg( Program::GetUserAppDir() + "\\compiler.ini" );
+    buffer=ReadBuffer_NonErrMsg( Program::GetAbcUserAppDir() + "\\compiler.ini" );
     if(!buffer){
         //レジストリを読み込む
@@ -248 +248 @@
 
     // ユーザ情報保存用のディレクトリを作成
-    Jenga::Common::Directory dir( Program::GetUserAppDir(), true );
+    Jenga::Common::Directory dir( Program::GetAbcUserAppDir(), true );
 
 
@@ -276 +276 @@
     //保存
     WriteBuffer(
-        Program::GetUserAppDir() + "\\compiler.ini",
+        Program::GetAbcUserAppDir() + "\\compiler.ini",
         buffer,lstrlen(buffer));
 

trunk/ab5.0/abdev/BasicCompiler_Common/include/Program.h

@@ -32 +32 @@
 
     // ユーザデータ格納用のディレクトリを取得
-    static const std::string GetUserAppDir();
+    static const std::string GetAbcUserAppDir();
 
     const std::string &GetSourceFilePath() const

trunk/ab5.0/abdev/BasicCompiler_Common/src/BreakPoint.cpp

@@ -119 +119 @@
     buffer=(char *)HeapAlloc(hHeap,0,65535);
 
-    std::string filepath = ActiveBasic::Common::Environment::GetAbdevRootPath() + "\\ab_breakpoint.tmp";
+    char temporary[MAX_PATH];
+    GetTempPath(MAX_PATH,temporary);
+    if(temporary[lstrlen(temporary)-1]!='\\') lstrcat(temporary,"\\");
+    lstrcat(temporary,"ab_breakpoint.tmp");
+
     HANDLE hFile=CreateFile(
-        filepath.c_str(),
+        temporary,
         GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
     if(hFile!=INVALID_HANDLE_VALUE)

trunk/ab5.0/abdev/BasicCompiler_Common/src/Messenger.cpp

@@ -481 +481 @@
 
             hFile=CreateFile(
-                ( ActiveBasic::Common::Environment::GetAbdevRootPath() + "\\pgm.tmp" ).c_str(),
+                ( ActiveBasic::Common::Environment::GetUserAppDir() + "\\pgm.tmp" ).c_str(),
                 GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_TEMPORARY,NULL);
             WriteFile(hFile,FileName,lstrlen(FileName),&dw,NULL);

trunk/ab5.0/abdev/BasicCompiler_Common/src/Program.cpp

@@ -1 +1 @@
 #include "stdafx.h"
 
-Jenga::Common::Logger Program::logger( Jenga::Common::Environment::GetAppDir() + "\\logger.log", true );
+Jenga::Common::Logger Program::logger( Program::GetAbcUserAppDir() + "\\logger.log", true );
 
 Program program;
@@ -139 +139 @@
 }
 
-const std::string Program::GetUserAppDir()
+const std::string Program::GetAbcUserAppDir()
 {
-    return Jenga::Common::Environment::GetUserAppDir() + "\\ActiveBasic\\abc";
+    return ActiveBasic::Common::Environment::GetUserAppDir() + "\\abc";
 }
 

trunk/ab5.0/abdev/ab_common/include/Environment.h

@@ -33 +33 @@
     static const std::string GetAbdevRootPath();
 
+    static const std::string GetUserAppDir();
+
     static const std::string GetAbdevSystemDirPath()
     {

trunk/ab5.0/abdev/ab_common/src/Environment.cpp

@@ -18 +18 @@
     return rootPath;
 }
+
+const std::string Environment::GetUserAppDir()
+{
+    return Jenga::Common::Environment::GetUserAppDir() + "\\ActiveBasic";
+}
+
 const std::string Environment::GetCompilerExePath( Platform::EnumType platform )
 {

trunk/ab5.0/abdev/abdev/Debugger.cpp

@@ -490 +490 @@
     lstrcat(temporary,"ab_breakpoint.tmp");
 
-    //未完成
-    sprintf(temporary,"%sab_breakpoint.tmp",pj_editor_Dir);
-
     ATL::CHandle hFile(CreateFile(temporary,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_TEMPORARY,NULL));
     if(hFile==INVALID_HANDLE_VALUE){

trunk/ab5.0/abdev/abdev/NonVolatile.cpp

@@ -235 +235 @@
     char temporary[MAX_PATH];
 
-    std::string userAppDir = ActiveBasic::IDE::Program::GetUserAppDir();
+    std::string userAppDir = ActiveBasic::IDE::Program::GetIdeUserAppDir();
 
 
@@ -669 +669 @@
     
     // ユーザ情報保存用のディレクトリを作成
-    Jenga::Common::Directory dir( ActiveBasic::IDE::Program::GetUserAppDir(), true );
+    Jenga::Common::Directory dir( ActiveBasic::IDE::Program::GetIdeUserAppDir(), true );
 
 
@@ -806 +806 @@
 
 
-    std::string userAppDir = ActiveBasic::IDE::Program::GetUserAppDir();
+    std::string userAppDir = ActiveBasic::IDE::Program::GetIdeUserAppDir();
 
     //保存

trunk/ab5.0/abdev/abdev/include/Program.h

@@ -17 +17 @@
 
     // ユーザデータ格納用のディレクトリを取得
-    static const std::string GetUserAppDir();
+    static const std::string GetIdeUserAppDir();
 
     static void Main();

trunk/ab5.0/abdev/abdev/src/MainFrame.cpp

@@ -550 +550 @@
     DWORD AccBytes;
     {
-        sprintf(temporary,"%spgm.tmp",pj_editor_Dir);
+        sprintf(temporary,"%s\\pgm.tmp",ActiveBasic::Common::Environment::GetUserAppDir().c_str());
         ATL::CHandle fh(CreateFile(temporary,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL));
         if(fh==INVALID_HANDLE_VALUE){
@@ -1135 +1135 @@
         //デバッグ用のコマンドライン及び実行可能ファイル（DLLのみ）
         sprintf(temporary,"%s\r\n%s",projectInfo.szExePath,projectInfo.szCmdLine);
-        sprintf(temp2,"%spgm.tmp",pj_editor_Dir);
+        sprintf(temp2,"%s\\pgm.tmp",ActiveBasic::Common::Environment::GetUserAppDir().c_str());
         {
             ATL::CHandle hFile(CreateFile(temp2,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_TEMPORARY,NULL));

trunk/ab5.0/abdev/abdev/src/Program.cpp

@@ -27 +27 @@
 }
 
-const std::string Program::GetUserAppDir()
+const std::string Program::GetIdeUserAppDir()
 {
-    return Jenga::Common::Environment::GetUserAppDir() + "\\ActiveBasic\\ide";
+    return ActiveBasic::Common::Environment::GetUserAppDir() + "\\ide";
 }