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

Timestamp:

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

Author:

dai_9181

Message:

構成管理を大幅に改良。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common/src

Files:

• BoostSerializationSupport.cpp (modified) (1 diff)
• Delegate.cpp (modified) (1 diff)
• Program.cpp (modified) (1 diff)
• Source.cpp (modified) (3 diffs)

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;