Changeset 487 in dev for trunk


Ignore:
Timestamp:
Apr 7, 2008, 8:52:15 PM (17 years ago)
Author:
dai_9181
Message:

構成管理変更後、デプロイが通らなくなっていたので修正。

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/ab5.0/build.xml

    r472 r487  
    33    <!-- å
    44±é€šãƒ—ロパティ -->
    5     <property name="abc32" value="./ablib/bin/BasicCompiler32.exe"/>
    6     <property name="abc64" value="./ablib/bin/BasicCompiler64.exe"/>
     5    <property name="abc32" value="./abdev/build/release/bin/x86/abc.exe"/>
     6    <property name="abc64" value="./abdev/build/release/bin/x64/abc.exe"/>
    77
    88    <target name="deploy_all">
    … …  
    2222    <target name="copy_files">
    2323        <property name="rootdir" value="./dest" />
    24         <property name="application" value="${rootdir}/ActiveBasic" />
    25         <property name="ablib_incllude_dir" value="${application}/Include" />
    26         <property name="ablib_lib_dir" value="${application}/lib" />
     24        <property name="application" value="${rootdir}/ab5.0" />
    2725
    2826        <!-- 本体をコピー -->
    … …  
    3028        <mkdir dir="${application}" />
    3129        <copy todir="${application}">
    32             <fileset dir="./ablib/bin">
     30            <fileset dir="./abdev/build/release">
    3331                <exclude name="**/UserSetting" />
    3432                <exclude name="**/UserSetting/**" />
     33                <exclude name="**/*.log" />
    3534                <exclude name="*.log" />
     35                <exclude name="*.tmp" />
    3636            </fileset>
    37         </copy>
    38 
    39         <!-- Includeフォルダをコピー -->
    40         <mkdir dir="${ablib_incllude_dir}" />
    41         <copy todir="${ablib_incllude_dir}">
    42             <fileset dir="./ablib/Include" />
    43         </copy>
    44 
    45         <!-- libフォルダをコピー -->
    46         <mkdir dir="${ablib_lib_dir}" />
    47         <copy todir="${ablib_lib_dir}">
    48             <fileset dir="./ablib/lib" />
    4937        </copy>
    5038    </target>
    … …  
    5240    <target name="make_x86_core_lib">
    5341        <exec executable="${abc32}" failonerror="true">
    54             <arg value="../Include/basic.sbp" />
    55             <arg value="../lib/core.lib" />
     42            <arg value="./abdev/build/release/ablib/src/basic.sbp" />
     43            <arg value="./abdev/build/release/ablib/lib/core.lib" />
    5644            <arg value="/static_library" />
    57             <arg value="/include_dir:..\Include\" />
     45            <arg value="/include_dir:./abdev/build/release/ablib/src" />
    5846        </exec>
    5947    </target>
    … …  
    6149    <target name="make_x86_cored_lib">
    6250        <exec executable="${abc32}" failonerror="true">
    63             <arg value="../Include/basic.sbp" />
    64             <arg value="../lib/cored.lib" />
     51            <arg value="./abdev/build/release/ablib/src/basic.sbp" />
     52            <arg value="./abdev/build/release/ablib/lib/cored.lib" />
    6553            <arg value="/static_library" />
    6654            <arg value="/debug" />
    67             <arg value="/include_dir:..\Include\" />
     55            <arg value="/include_dir:./abdev/build/release/ablib/src" />
    6856        </exec>
    6957    </target>
    … …  
    7159    <target name="make_x64_core_lib">
    7260        <exec executable="${abc64}" failonerror="true">
    73             <arg value="../Include/basic.sbp" />
    74             <arg value="../lib/x64/core.lib" />
     61            <arg value="./abdev/build/release/ablib/src/basic.sbp" />
     62            <arg value="./abdev/build/release/ablib/lib/x64/core.lib" />
    7563            <arg value="/static_library" />
    76             <arg value="/include_dir:..\Include\" />
     64            <arg value="/include_dir:./abdev/build/release/ablib/src" />
    7765        </exec>
    7866    </target>
    … …  
    8068    <target name="make_x64_cored_lib">
    8169        <exec executable="${abc64}" failonerror="true">
    82             <arg value="../Include/basic.sbp" />
    83             <arg value="../lib/x64/cored.lib" />
     70            <arg value="./abdev/build/release/ablib/src/basic.sbp" />
     71            <arg value="./abdev/build/release/ablib/lib/x64/cored.lib" />
    8472            <arg value="/static_library" />
    8573            <arg value="/debug" />
    86             <arg value="/include_dir:..\Include\" />
     74            <arg value="/include_dir:./abdev/build/release/ablib/src" />
    8775        </exec>
    8876    </target>
Note: See TracChangeset for help on using the changeset viewer.