Skip to content

Commit

Permalink
Move standard libraries into own build files so then can be included …
Browse files Browse the repository at this point in the history
…directly in a haxe build
  • Loading branch information
hughsando committed Aug 13, 2015
1 parent 357a933 commit c1ba093
Show file tree
Hide file tree
Showing 10 changed files with 303 additions and 164 deletions.
7 changes: 2 additions & 5 deletions build-tool/BuildCommon.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<xml>
<section unless="haxe_target_included">
<set name="haxe_target_included" value="1" />
<set name="build_common_included" value="1" />
<include name="toolchain/haxe-target.xml" />
</section>
<pragma once="true" />
<include name="toolchain/haxe-target.xml" />
</xml>


144 changes: 6 additions & 138 deletions project/Build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,146 +2,14 @@

<include name="${HXCPP}/build-tool/BuildCommon.xml"/>

<set nme="dynamic_link" value="1" unless="static_link" />

<files id="std" >
<depend name="${HXCPP}/include/hx/Macros.h"/>
<depend name="${HXCPP}/include/hx/CFFI.h"/>

<file name="Sys.cpp"/>
<file name="Xml.cpp"/>
<file name="Process.cpp"/>
<file name="Random.cpp"/>
<file name="Socket.cpp" />
<file name="String.cpp"/>
<file name="File.cpp"/>
<file name="Init.cpp"/>
<file name="Misc.cpp"/>
<file name="Interface.cpp" unless="static_link" />

</files>



<target id="std" output="${LIBPREFIX}std${LIB_DBG}${LIBEXTRA}" tool="linker" toolid="${STD_MODULE_LINK}">
<builddir name="libs/std" />
<files id="std"/>
<lib name="ws2_32.lib" if="windows" unless="static_link" />
<lib name="-lsocket" if="blackberry" unless="static_link" />
<outdir name="../../../${DESTDIR}/${BINDIR}"/>
</target>

<set name="PCRE_DIR" value="../../thirdparty/pcre-7.8" />

<files id="regexp" >
<depend name="${HXCPP}/include/hx/Macros.h"/>
<depend name="${HXCPP}/include/hx/CFFI.h"/>
<import name="libs/std/Build.xml" />
<import name="libs/zlib/Build.xml" />
<import name="libs/regexp/Build.xml" />
<import name="libs/mysql/Build.xml" />
<import name="libs/sqlite/Build.xml" />

<compilerflag value="-DPCRE_STATIC"/>
<compilerflag value="-DSUPPORT_UTF8"/>
<compilerflag value="-I${PCRE_DIR}"/>

<file name="RegExp.cpp"/>

<file name="${PCRE_DIR}/pcre_get.c"/>
<file name="${PCRE_DIR}/pcre_study.c"/>
<file name="${PCRE_DIR}/pcre_chartables.c"/>
<file name="${PCRE_DIR}/pcre_globals.c"/>
<file name="${PCRE_DIR}/pcre_tables.c"/>
<file name="${PCRE_DIR}/pcre_compile.c"/>
<file name="${PCRE_DIR}/pcre_info.c"/>
<file name="${PCRE_DIR}/pcre_try_flipped.c"/>
<file name="${PCRE_DIR}/pcre_config.c"/>
<file name="${PCRE_DIR}/pcre_maketables.c"/>
<file name="${PCRE_DIR}/pcre_ucd.c"/>
<file name="${PCRE_DIR}/pcre_dfa_exec.c"/>
<file name="${PCRE_DIR}/pcre_newline.c"/>
<file name="${PCRE_DIR}/pcre_valid_utf8.c"/>
<file name="${PCRE_DIR}/pcre_exec.c"/>
<file name="${PCRE_DIR}/pcre_ord2utf8.c"/>
<file name="${PCRE_DIR}/pcre_version.c"/>
<file name="${PCRE_DIR}/pcre_fullinfo.c"/>
<file name="${PCRE_DIR}/pcre_refcount.c"/>
<file name="${PCRE_DIR}/pcre_xclass.c"/>

</files>



<target id="regexp" output="${LIBPREFIX}regexp${LIB_DBG}${LIBEXTRA}" tool="linker" toolid="${STD_MODULE_LINK}">
<files id="regexp"/>
<builddir name="libs/regexp" />
<outdir name="../../../${DESTDIR}/${BINDIR}"/>
</target>

<set name="ZLIB_DIR" value="../../thirdparty/zlib-1.2.3"/>

<files id="zlib" >
<depend name="${HXCPP}/include/hx/Macros.h"/>
<depend name="${HXCPP}/include/hx/CFFI.h"/>

<compilerflag value="-I${ZLIB_DIR}"/>

<file name="ZLib.cpp"/>

<file name="${ZLIB_DIR}/adler32.c"/>
<file name="${ZLIB_DIR}/crc32.c"/>
<file name="${ZLIB_DIR}/infback.c"/>
<file name="${ZLIB_DIR}/inflate.c"/>
<file name="${ZLIB_DIR}/uncompr.c"/>
<file name="${ZLIB_DIR}/compress.c"/>
<file name="${ZLIB_DIR}/deflate.c"/>
<file name="${ZLIB_DIR}/gzio.c"/>
<file name="${ZLIB_DIR}/inffast.c"/>
<file name="${ZLIB_DIR}/inftrees.c"/>
<file name="${ZLIB_DIR}/trees.c"/>
<file name="${ZLIB_DIR}/zutil.c"/>
</files>




<target id="zlib" output="${LIBPREFIX}zlib${LIB_DBG}${LIBEXTRA}" tool="linker" toolid="${STD_MODULE_LINK}">
<files id="zlib"/>
<outdir name="../../../${DESTDIR}/${BINDIR}"/>
<builddir name="libs/zlib"/>
</target>


<files id="mysql" >
<depend name="${HXCPP}/include/hx/Macros.h"/>
<depend name="${HXCPP}/include/hx/CFFI.h"/>

<file name="mysql.cpp"/>
<file name="my_proto/my_api.cpp"/>
<file name="my_proto/my_proto.cpp"/>
<file name="../common/socket.cpp"/>
<file name="../common/sha1.cpp"/>
</files>


<target id="mysql" output="${LIBPREFIX}mysql5${LIB_DBG}${LIBEXTRA}" tool="linker" toolid="${STD_MODULE_LINK}">
<files id="mysql"/>
<builddir name="libs/mysql"/>
<lib name="ws2_32.lib" if="windows" unless="static_link" />
<outdir name="../../../${DESTDIR}/${BINDIR}"/>
</target>



<files id="sqlite" >
<depend name="${HXCPP}/include/hx/Macros.h"/>
<depend name="${HXCPP}/include/hx/CFFI.h"/>
<file name="sqlite3.c"/>
<file name="sqlite.cpp"/>
</files>


<target id="sqlite" output="${LIBPREFIX}sqlite${LIB_DBG}${LIBEXTRA}" tool="linker" toolid="${STD_MODULE_LINK}">
<files id="sqlite"/>
<builddir name="libs/sqlite"/>
<outdir name="../../../${DESTDIR}/${BINDIR}"/>
<lib name="-lpthread" if="linux" unless="static_link" />
</target>



Expand Down
36 changes: 36 additions & 0 deletions project/libs/mysql/Build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<xml>

<include name="${HXCPP}/build-tool/BuildCommon.xml"/>



<files id="mysql" >
<depend name="${HXCPP}/include/hx/Macros.h"/>
<depend name="${HXCPP}/include/hx/CFFI.h"/>

<depend name="${this_dir}/Build.xml" dateOnly="true" />
<compilerflag value="-DSTATIC_LINK" unless="static_link||dynamic_link" />


<file name="mysql.cpp"/>
<file name="my_proto/my_api.cpp"/>
<file name="my_proto/my_proto.cpp"/>
<file name="../common/socket.cpp"/>
<file name="../common/sha1.cpp"/>
</files>

<target id="haxe">
<files id="mysql"/>
<lib name="ws2_32.lib" if="windows" unless="static_link" />
</target>

<target id="mysql" output="${LIBPREFIX}mysql5${LIB_DBG}${LIBEXTRA}" tool="linker" toolid="${STD_MODULE_LINK}">
<files id="mysql"/>
<lib name="ws2_32.lib" if="windows" unless="static_link" />
<outdir name="../../../${DESTDIR}/${BINDIR}"/>
</target>




</xml>
56 changes: 56 additions & 0 deletions project/libs/regexp/Build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<xml>

<include name="${HXCPP}/build-tool/BuildCommon.xml"/>


<set name="PCRE_DIR" value="../../thirdparty/pcre-7.8" />

<files id="regexp" >
<depend name="${HXCPP}/include/hx/Macros.h"/>
<depend name="${HXCPP}/include/hx/CFFI.h"/>
<cache value="true" />
<depend name="${this_dir}/Build.xml" dateOnly="true" />
<compilerflag value="-DSTATIC_LINK" unless="static_link||dynamic_link" />

<compilerflag value="-DPCRE_STATIC"/>
<compilerflag value="-DSUPPORT_UTF8"/>
<compilerflag value="-I${PCRE_DIR}"/>

<file name="RegExp.cpp"/>

<file name="${PCRE_DIR}/pcre_get.c"/>
<file name="${PCRE_DIR}/pcre_study.c"/>
<file name="${PCRE_DIR}/pcre_chartables.c"/>
<file name="${PCRE_DIR}/pcre_globals.c"/>
<file name="${PCRE_DIR}/pcre_tables.c"/>
<file name="${PCRE_DIR}/pcre_compile.c"/>
<file name="${PCRE_DIR}/pcre_info.c"/>
<file name="${PCRE_DIR}/pcre_try_flipped.c"/>
<file name="${PCRE_DIR}/pcre_config.c"/>
<file name="${PCRE_DIR}/pcre_maketables.c"/>
<file name="${PCRE_DIR}/pcre_ucd.c"/>
<file name="${PCRE_DIR}/pcre_dfa_exec.c"/>
<file name="${PCRE_DIR}/pcre_newline.c"/>
<file name="${PCRE_DIR}/pcre_valid_utf8.c"/>
<file name="${PCRE_DIR}/pcre_exec.c"/>
<file name="${PCRE_DIR}/pcre_ord2utf8.c"/>
<file name="${PCRE_DIR}/pcre_version.c"/>
<file name="${PCRE_DIR}/pcre_fullinfo.c"/>
<file name="${PCRE_DIR}/pcre_refcount.c"/>
<file name="${PCRE_DIR}/pcre_xclass.c"/>

</files>


<target id="haxe">
<files id="regexp" />
</target>



<target id="regexp" output="${LIBPREFIX}regexp${LIB_DBG}${LIBEXTRA}" tool="linker" toolid="${STD_MODULE_LINK}">
<files id="regexp"/>
<outdir name="../../../${DESTDIR}/${BINDIR}"/>
</target>

</xml>
32 changes: 32 additions & 0 deletions project/libs/sqlite/Build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<xml>

<include name="${HXCPP}/build-tool/BuildCommon.xml"/>


<files id="sqlite" >
<depend name="${HXCPP}/include/hx/Macros.h"/>
<depend name="${HXCPP}/include/hx/CFFI.h"/>
<depend name="${this_dir}/Build.xml" dateOnly="true" />
<compilerflag value="-DSTATIC_LINK" unless="static_link||dynamic_link" />

<file name="sqlite3.c"/>
<file name="sqlite.cpp"/>
</files>



<target id="haxe">
<files id="sqlite"/>
<lib name="-lpthread" if="linux" unless="static_link" />
</target>

<target id="sqlite" output="${LIBPREFIX}sqlite${LIB_DBG}${LIBEXTRA}" tool="linker" toolid="${STD_MODULE_LINK}">
<files id="sqlite"/>
<lib name="-lpthread" if="linux" unless="static_link" />
<outdir name="../../../${DESTDIR}/${BINDIR}"/>
</target>



</xml>

41 changes: 41 additions & 0 deletions project/libs/std/Build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<xml>

<include name="${HXCPP}/build-tool/BuildCommon.xml"/>

<files id="std" >
<depend name="${HXCPP}/include/hx/Macros.h"/>
<depend name="${HXCPP}/include/hx/CFFI.h"/>
<depend name="${this_dir}/Build.xml" dateOnly="true" />
<compilerflag value="-DSTATIC_LINK" unless="static_link||dynamic_link" />

<cache value="1"/>

<file name="Sys.cpp"/>
<file name="Xml.cpp"/>
<file name="Process.cpp"/>
<file name="Random.cpp"/>
<file name="Socket.cpp" />
<file name="String.cpp"/>
<file name="File.cpp"/>
<file name="Init.cpp"/>
<file name="Misc.cpp"/>
<file name="Interface.cpp" if="dynamic_link" />

</files>


<target id="haxe">
<files id="std"/>
<lib name="ws2_32.lib" if="windows" unless="static_link" />
<lib name="-lsocket" if="blackberry" unless="static_link" />
</target>


<target id="std" output="${LIBPREFIX}std${LIB_DBG}${LIBEXTRA}" tool="linker" toolid="${STD_MODULE_LINK}">
<files id="std"/>
<lib name="ws2_32.lib" if="windows" unless="static_link" />
<lib name="-lsocket" if="blackberry" unless="static_link" />
<outdir name="../../../${DESTDIR}/${BINDIR}"/>
</target>

</xml>
41 changes: 41 additions & 0 deletions project/libs/zlib/Build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<xml>

<include name="${HXCPP}/build-tool/BuildCommon.xml"/>

<set name="ZLIB_DIR" value="${this_dir}/../../thirdparty/zlib-1.2.3"/>

<files id="hxcpp-zlib" >
<depend name="${HXCPP}/include/hx/Macros.h"/>
<depend name="${HXCPP}/include/hx/CFFI.h"/>
<depend name="${this_dir}/Build.xml" dateOnly="true" />
<compilerflag value="-DSTATIC_LINK" unless="static_link||dynamic_link" />

<compilerflag value="-I${ZLIB_DIR}"/>

<file name="ZLib.cpp"/>

<file name="${ZLIB_DIR}/adler32.c"/>
<file name="${ZLIB_DIR}/crc32.c"/>
<file name="${ZLIB_DIR}/infback.c"/>
<file name="${ZLIB_DIR}/inflate.c"/>
<file name="${ZLIB_DIR}/uncompr.c"/>
<file name="${ZLIB_DIR}/compress.c"/>
<file name="${ZLIB_DIR}/deflate.c"/>
<file name="${ZLIB_DIR}/gzio.c"/>
<file name="${ZLIB_DIR}/inffast.c"/>
<file name="${ZLIB_DIR}/inftrees.c"/>
<file name="${ZLIB_DIR}/trees.c"/>
<file name="${ZLIB_DIR}/zutil.c"/>
</files>

<target id="haxe">
<files id="hxcpp-zlib" />
</target>


<target id="zlib" output="${LIBPREFIX}zlib${LIB_DBG}${LIBEXTRA}" tool="linker" toolid="${STD_MODULE_LINK}">
<files id="hxcpp-zlib"/>
<outdir name="../../../${DESTDIR}/${BINDIR}"/>
</target>

</xml>
Loading

0 comments on commit c1ba093

Please sign in to comment.