Changeset 472 in dev

Timestamp:

Mar 31, 2008, 12:33:24 PM (16 years ago)

Author:

dai_9181

Message:

デプロイ時にcore.lib/cored.libのビルドもできるようにした。

Location:

trunk/ab5.0

Files:

• abdev/BasicCompiler32/stdafx.h (modified) (1 diff)
• abdev/BasicCompiler64/stdafx.h (modified) (1 diff)
• abdev/BasicCompiler_Common/BasicCompiler.cpp (modified) (3 diffs)
• abdev/BasicCompiler_Common/MakeExe.cpp (modified) (5 diffs)
• abdev/BasicCompiler_Common/include/Compiler.h (modified) (3 diffs)
• abdev/BasicCompiler_Common/include/Messenger.h (modified) (1 diff)
• abdev/BasicCompiler_Common/include/Program.h (modified) (1 diff)
• abdev/BasicCompiler_Common/src/Messenger.cpp (modified) (1 diff)
• abdev/BasicCompiler_Common/src/Program.cpp (modified) (4 diffs)
• build.xml (modified) (2 diffs)
• deploy_copy_files.bat (added)
• deploy_full.bat (moved) (moved from trunk/ab5.0/deploy.bat )
• deploy_x86_only.bat (added)
• jenga/include/common/String.h (modified) (1 diff)
• jenga/src/common/String.cpp (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler32/stdafx.h

@@ -16 +16 @@
 #include <shlobj.h>
 #include <process.h>
+#include <fcntl.h>
+#include <io.h>
 
 //boost libraries

trunk/ab5.0/abdev/BasicCompiler64/stdafx.h

@@ -16 +16 @@
 #include <shlobj.h>
 #include <process.h>
+#include <fcntl.h>
+#include <io.h>
 
 //boost libraries

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

@@ -574 +574 @@
 }
 
-#include <fcntl.h>
-#include <io.h>
-
 int main()
 {
@@ -753 +750 @@
             MainThread(0);
 
-            ExitProcess( 0 );
+            trace("Complete ActiveBasic Compiler!");
+
+            ExitProcess( program.GetExitCode() );
             return 0;
         }
@@ -798 +797 @@
     trace("Complete ActiveBasic Compiler!");
 
-    ExitProcess( 0 );
+    ExitProcess( program.GetExitCode() );
 
     return 0;

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

@@ -181 +181 @@
                 else
                 {
-                    compiler.messenger.Output( ((string)"\"" + path.GetFullPath() + "\" ファイルが壊れています。").c_str() );
+                    compiler.errorMessenger.Output( 203, path.GetFullPath() );
                     isSuccessfulLoadStaticLinkLibrary = false;
                 }
@@ -187 +187 @@
             else
             {
-                compiler.messenger.Output( ((string)"\"" + path.GetFullPath() + "\" ファイルが存在しません。").c_str() );
+                compiler.errorMessenger.Output( 202, path.GetFullPath() );
                 isSuccessfulLoadStaticLinkLibrary = false;
             }
@@ -204 +204 @@
                 else
                 {
-                    compiler.messenger.Output( ((string)"\"" + path.GetFullPath() + "\" ファイルが壊れています。").c_str() );
+                    compiler.errorMessenger.Output( 203, path.GetFullPath() );
                     isSuccessfulLoadStaticLinkLibrary = false;
                 }
@@ -210 +210 @@
             else
             {
-                compiler.messenger.Output( ((string)"\"" + path.GetFullPath() + "\" ファイルが存在しません。").c_str() );
+                compiler.errorMessenger.Output( 202, path.GetFullPath() );
                 isSuccessfulLoadStaticLinkLibrary = false;
             }
@@ -280 +280 @@
     SetDlgItemText(hMainDlg,IDOK,STRING_CLOSE);
 
+    // エラーがない場合はビルド成功とする
+    if( !compiler.errorMessenger.HasError() )
+    {
+        // ビルド成功
+        compiler.BuildSuccessful();
+    }
+
 #ifdef _DEBUG
     // デバッグモードのときはダイアログが隠れている

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

@@ -25 +25 @@
 
 private:
+    // ビルド成功のフラグ
+    bool isBuildSuccessful;
+
     // モジュール名
     std::string moduleName;
@@ -47 +50 @@
 
     Compiler()
-        : pObjectModule( new ObjectModule )
+        : isBuildSuccessful( false )
+        , pObjectModule( new ObjectModule )
         , pNowObjectModule( pObjectModule )
         , targetModuleType( Exe )
@@ -71 +75 @@
     void StaticLink( ObjectModules &staticLibraries );
 
+    // ビルド成功のフラグ
+    bool IsBuildSuccessful() const
+    {
+        return isBuildSuccessful;
+    }
+    void BuildSuccessful()
+    {
+        isBuildSuccessful = true;
+    }
+
     // モジュール名
     void SetModuleName( const std::string &moduleName )

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

@@ -63 +63 @@
 public:
     void Output( const ErrorInfo &errorInfo );
-    void Output( int errorCode, const std::string &keyword, int sourceIndex );
-    void Output( int errorCode, const char *keyword, int sourceIndex );
+    void Output( int errorCode, const std::string &keyword, int sourceIndex = -1 );
+    void Output( int errorCode, const char *keyword, int sourceIndex = -1 );
     void OutputFatalError();
 

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

@@ -86 +86 @@
         this->includeDir = includeDir;
     }
+
+    int GetExitCode() const;
 };
 

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

@@ -256 +256 @@
     if(errorCode==200) sprintf(msg,"\"%s\" 未解決です (リンク エラー)。",tempKeyWord);
     if(errorCode==201) sprintf(msg,"\"%s\" の読み込みに失敗。",tempKeyWord);
+    if(errorCode==202) sprintf(msg,"\"%s\" は存在しません。",tempKeyWord);
+    if(errorCode==203) sprintf(msg,"\"%s\" は存在しますが、読み込めません（古いバージョンのコンパイラでビルドされた可能性があります）。",tempKeyWord);
 
     //原因不明

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

@@ -26 +26 @@
     {
         // 先頭に無名コマンドがきた場合、ソースファイル名として認識する
-        Program::SetSourceFilePath( cmdLines[cmdLineIndex].GetParameter() );
+        std::string tempParam = cmdLines[cmdLineIndex].GetParameter();
+        Program::SetSourceFilePath( Jenga::Common::StringReplace( tempParam, "/", "\\" ) );
 
         cmdLineIndex ++;
@@ -40 +41 @@
         {
             // 二番目にも無名コマンドがきた場合、ソースファイル名として認識する
-            SetOutputFilePath( cmdLines[cmdLineIndex].GetParameter() );
+            std::string tempParam = cmdLines[cmdLineIndex].GetParameter();
+            SetOutputFilePath( Jenga::Common::StringReplace( tempParam, "/", "\\" ) );
 
             cmdLineIndex ++;
@@ -102 +104 @@
         {
             //インクルード ディレクトリ
-            includeDir = cmdLine.GetParameter();
+            includeDir = cmdLines[cmdLineIndex].GetParameter();
+
+            // '/' があった場合は '\\' に置換
+            Jenga::Common::StringReplace( includeDir, "/", "\\" );
         }
         else
@@ -119 +124 @@
     return true;
 }
+
+int Program::GetExitCode() const
+{
+    if( !compiler.IsBuildSuccessful() )
+    {
+        // ビルドに失敗
+        return 1;
+    }
+
+    // ビルドに成功
+    return 0;
+}

trunk/ab5.0/build.xml

@@ -1 @@
-<project name="ActiveBasic" default="deploy">
+<project name="ActiveBasic" default="deploy_all">
 
-    <target name="deploy">
+    <!-- å
+±é€šãƒ—ロパティ -->
+    <property name="abc32" value="./ablib/bin/BasicCompiler32.exe"/>
+    <property name="abc64" value="./ablib/bin/BasicCompiler64.exe"/>
+
+    <target name="deploy_all">
+        <antcall target="make_x86_core_lib" />
+        <antcall target="make_x86_cored_lib" />
+        <antcall target="make_x64_core_lib" />
+        <antcall target="make_x64_cored_lib" />
+        <antcall target="copy_files" />
+    </target>
+
+    <target name="deploy_x86_only">
+        <antcall target="make_x86_core_lib" />
+        <antcall target="make_x86_cored_lib" />
+        <antcall target="copy_files" />
+    </target>
+
+    <target name="copy_files">
         <property name="rootdir" value="./dest" />
         <property name="application" value="${rootdir}/ActiveBasic" />
@@ -31 +50 @@
     </target>
 
+    <target name="make_x86_core_lib">
+        <exec executable="${abc32}" failonerror="true">
+            <arg value="../Include/basic.sbp" />
+            <arg value="../lib/core.lib" />
+            <arg value="/static_library" />
+            <arg value="/include_dir:..\Include\" />
+        </exec>
+    </target>
+
+    <target name="make_x86_cored_lib">
+        <exec executable="${abc32}" failonerror="true">
+            <arg value="../Include/basic.sbp" />
+            <arg value="../lib/cored.lib" />
+            <arg value="/static_library" />
+            <arg value="/debug" />
+            <arg value="/include_dir:..\Include\" />
+        </exec>
+    </target>
+
+    <target name="make_x64_core_lib">
+        <exec executable="${abc64}" failonerror="true">
+            <arg value="../Include/basic.sbp" />
+            <arg value="../lib/x64/core.lib" />
+            <arg value="/static_library" />
+            <arg value="/include_dir:..\Include\" />
+        </exec>
+    </target>
+
+    <target name="make_x64_cored_lib">
+        <exec executable="${abc64}" failonerror="true">
+            <arg value="../Include/basic.sbp" />
+            <arg value="../lib/x64/cored.lib" />
+            <arg value="/static_library" />
+            <arg value="/debug" />
+            <arg value="/include_dir:..\Include\" />
+        </exec>
+    </target>
+
 </project>

trunk/ab5.0/jenga/include/common/String.h

@@ -11 +11 @@
 bool IsExistString( const Jenga::Common::Strings &strings, const std::string &findStr );
 
+std::string& StringReplace( std::string& str, const std::string sb, const std::string sa );
+
 }
 }

trunk/ab5.0/jenga/src/common/String.cpp

@@ -14 +14 @@
     return false;
 }
+
+std::string& Jenga::Common::StringReplace( std::string& str, const std::string sb, const std::string sa )
+{
+    std::string::size_type n, nb = 0;
+    
+    while ((n = str.find(sb,nb)) != std::string::npos)
+    {
+        str.replace(n,sb.size(),sa);
+        nb = n + sa.size();
+    }
+    
+    return str;
+}