Changeset 477 in dev for trunk/ab5.0/abdev/BasicCompiler_Common

Timestamp:

Apr 6, 2008, 8:07:40 PM (16 years ago)

Author:

dai_9181

Message:

構成管理を大幅に改良。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• BasicCompiler.cpp (modified) (5 diffs)
• common.h (modified) (1 diff)
• include/Configuration.h (added)
• include/Program.h (modified) (1 diff)
• src/BoostSerializationSupport.cpp (modified) (1 diff)
• src/Delegate.cpp (modified) (1 diff)
• src/Program.cpp (modified) (1 diff)
• src/Source.cpp (modified) (3 diffs)

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

@@ -93 +93 @@
 void ts(const char *msg,const char *title){
     MessageBox(0,FormatEscapeSequenceStringToDefaultString(msg).c_str(),title,0);
+}
+void ts(const std::string msg)
+{
+    ts(msg.c_str());
 }
 
@@ -192 +196 @@
     }
 
-    i3=(int)baseDirPath.size();i4=0;
+    std::string tempBaseDirPath = baseDirPath;
+    if( tempBaseDirPath[tempBaseDirPath.size()-1] != '\\' )
+    {
+        tempBaseDirPath += "\\";
+    }
+
+    i3=(int)tempBaseDirPath.size();i4=0;
     while(i4<i2){
         for(i3--;;i3--){
-            if(baseDirPath[i3-1]=='\\'){
+            if(tempBaseDirPath[i3-1]=='\\'){
                 i4++;
                 break;
@@ -201 +211 @@
         }
     }
-    memcpy(temporary,baseDirPath.c_str(),i3);
+    memcpy(temporary,tempBaseDirPath.c_str(),i3);
     temporary[i3]=0;
     lstrcat(temporary,path+i);
@@ -601 +611 @@
     pobj_nv->load();
 
+    program.Configurate();
+
     if( !program.AnalysisCommandLines() )
     {
@@ -664 +676 @@
         if( program.GetIncludeDir().size() == 0 )
         {
-            program.SetIncludeDir( Jenga::Common::Path::MakeFullPath( ".\\Include\\", baseDirPath ) );
+            program.SetIncludeDir( Jenga::Common::Path::MakeFullPath( ".\\Include", ActiveBasic::Common::Environment::GetAbdevRootPath() ) );
         }
         else
         {
             // インクルードディレクトリを絶対パスに変更
-            program.SetIncludeDir( Jenga::Common::Path::MakeFullPath( program.GetIncludeDir(), baseDirPath ) );
+            program.SetIncludeDir( Jenga::Common::Path::MakeFullPath( program.GetIncludeDir(), ActiveBasic::Common::Environment::GetAbdevRootPath() ) );
         }
 

trunk/ab5.0/abdev/BasicCompiler_Common/common.h

@@ -216 +216 @@
 void ts(const char *msg);
 void ts(const char *msg,const char *title);
+void ts(const std::string msg);
 void epi_check();
 void GetRelationalPath(char *path,char *dir);

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

@@ -28 +28 @@
     {
     }
+
+    void Configurate();
 
     bool AnalysisCommandLines();

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

@@ -485 +485 @@
 
 #include <logger.h>
+#include <Configuration.h>
 
 template class Jenga::Common::BoostSerializationSupport<LoggerSetting>;
+template class Jenga::Common::BoostSerializationSupport<Configuration>;

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

@@ -163 +163 @@
     destSource = "";
 
-    SourceTemplate sourceTemplate( "\\SubOperation\\templates\\delegate_class.tab" );
+    SourceTemplate sourceTemplate( ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\templates\\delegate_class.tab" );
 
     this->Iterator_Reset();

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

@@ -10 +10 @@
 
 Program program;
+
+void Program::Configurate()
+{
+    Configuration configuration;
+    const std::string filePath = Jenga::Common::Environment::GetAppDir() + "\\config.xml";
+    if( Jenga::Common::Path( filePath ).IsExistFile() )
+    {
+        configuration.ReadXml( filePath );
+    }
+    else
+    {
+        configuration.WriteXml( filePath );
+    }
+
+    ActiveBasic::Common::Environment::SetAbdevRootPath( configuration.GetAbdevRootRelativePath() );
+}
 
 bool Program::AnalysisCommandLines()

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

@@ -614 +614 @@
 
                     if(sw1){
-                        sprintf(temp2,"%s%s", program.GetIncludeDir().c_str(), temporary );
+                        sprintf(temp2,"%s\\%s", program.GetIncludeDir().c_str(), temporary );
                         lstrcpy(temporary,temp2);
                     }
@@ -624 +624 @@
             else if(memcmp(buffer+i+1,"prompt",6)==0){
                 i2=i+7;
-                sprintf(temporary,"%sbasic\\prompt.sbp", program.GetIncludeDir().c_str() );
+                sprintf(temporary,"%s\\basic\\prompt.sbp", program.GetIncludeDir().c_str() );
             }
             else if(memcmp(buffer+i+1,"N88BASIC",8)==0){
                 i2=i+9;
-                sprintf(temporary,"%sbasic\\prompt.sbp", program.GetIncludeDir().c_str() );
+                sprintf(temporary,"%s\\basic\\prompt.sbp", program.GetIncludeDir().c_str() );
             }
             else if(memcmp(buffer+i+1,"console",7)==0){
@@ -636 +636 @@
 
                 i2=i+8;
-                sprintf(temporary,"%sbasic\\dos_console.sbp", program.GetIncludeDir().c_str() );
+                sprintf(temporary,"%s\\basic\\dos_console.sbp", program.GetIncludeDir().c_str() );
             }
             else continue;