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

Timestamp:

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

Author:

dai_9181

Message:

構成管理を大幅に改良。

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.cpp (modified) (5 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() ) );
         }