diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2012-10-12 12:28:11 -0700 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-25 17:37:34 +0200 |
| commit | 2ffde7b17192f76f815ab451f08164519f69887e (patch) | |
| tree | 9ea5145c64e94170e1baf7b1a1e4adb92e772cf7 /expat/prj | |
| parent | 7f96cec269edabaf26f5e518d632cbfde95320ca (diff) | |
gbuildification of expat
Two different xmlparse libraries are created: ascii_expat_xmlparse and
expat_xmlparse. One without -DXML_UNICODE and one with. Source file are
duplicated and renamed with gb_UnpackedTarball_set_post_action function
to be able to add artifacts twice to gbuild machinery.
On windows 64 bit additional two librares are created: expat_xmlparse_x64 and
expat_xmltok_x64. That is due the problem with shell/shlxthandler (comment):
------------------------------------------------------
use UNICODE only because shell/shlxthandler
doesn't link against ascii_expat_xmlparse
------------------------------------------------------
Include files are delivered to $(OUTDIR)/inc/external/expat
now and not to $(OUTDIR)/inc/external any more.
set_include call is added in RepositoryExternal.mk.
To define dependency between StaticLibrary and ExternalProject
new function was introduced: gb_StaticLibrary_use_external_project.
Change-Id: I3b3aa40f39ef82c70f6f28790b582c83e48bdf76
Diffstat (limited to 'expat/prj')
| -rw-r--r-- | expat/prj/build.lst | 3 | ||||
| -rw-r--r-- | expat/prj/d.lst | 15 | ||||
| -rw-r--r-- | expat/prj/dmake | 0 |
3 files changed, 1 insertions, 17 deletions
diff --git a/expat/prj/build.lst b/expat/prj/build.lst index 9ae28720b763..af79e63e5b65 100644 --- a/expat/prj/build.lst +++ b/expat/prj/build.lst @@ -1,3 +1,2 @@ ep expat : soltools NULL -ep expat usr1 - all ep_mkout NULL -ep expat nmake - all ep_expat NULL +ep expat\prj nmake - all ep_expat NULL diff --git a/expat/prj/d.lst b/expat/prj/d.lst index 9b6aa344cf1d..e69de29bb2d1 100644 --- a/expat/prj/d.lst +++ b/expat/prj/d.lst @@ -1,15 +0,0 @@ -mkdir: %_DEST%\inc\external\expat -mkdir: %_DEST%\lib\x64 -..\%__SRC%\misc\build\expat-2.1.0\lib\expat.h %_DEST%\inc\external\expat.h -..\%__SRC%\misc\build\expat-2.1.0\lib\expat_external.h %_DEST%\inc\external\expat_external.h -..\%__SRC%\slb\expat_xmltok.lib %_DEST%\lib\expat_xmltok.lib -..\%__SRC%\slb\expat_xmlparse.lib %_DEST%\lib\expat_xmlparse.lib -..\%__SRC%\slb\ascii_expat_xmlparse.lib %_DEST%\lib\ascii_expat_xmlparse.lib -..\%__SRC%\lib\libexpat_xmltok.a %_DEST%\lib\libexpat_xmltok.a -..\%__SRC%\lib\libexpat_xmlparse.a %_DEST%\lib\libexpat_xmlparse.a -..\%__SRC%\lib\libascii_expat_xmlparse.a %_DEST%\lib\libascii_expat_xmlparse.a -..\%__SRC%\misc\_ooo_st_expat_xmltok.pdb %_DEST%\lib\_ooo_st_expat_xmltok.pdb -..\%__SRC%\misc\_ooo_st_expat_xmlparse.pdb %_DEST%\lib\_ooo_st_expat_xmlparse.pdb -..\%__SRC%\slb\x64\expat_xmltok.lib %_DEST%\lib\x64\expat_xmltok.lib -..\%__SRC%\slb\x64\expat_xmlparse.lib %_DEST%\lib\x64\expat_xmlparse.lib - diff --git a/expat/prj/dmake b/expat/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/expat/prj/dmake +++ /dev/null |