From fb97224c94a3e8d42b97a92a301253a4245bf931 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 30 May 2012 14:51:20 +0200 Subject: deliver all used mozilla headers into one dir This is to avoid problems with too long command lines on Windows. Change-Id: Ifc99bedd37aea7619e002145d4acbb7ec2a14246 --- RepositoryExternal.mk | 23 ++-------------------- moz/prj/d.lst | 53 ++++++++++++++++++--------------------------------- 2 files changed, 21 insertions(+), 55 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 67869be72f18..9edbb290b9ca 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1326,27 +1326,8 @@ $(call gb_LinkTarget_add_defs,$(1),\ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - $(foreach subdir,\ - addrbook \ - chrome \ - content \ - embed_base \ - intl \ - locale \ - mime \ - mork \ - mozldap \ - msgbase \ - necko \ - nspr \ - pref \ - profile \ - rdf \ - string \ - uconv \ - xpcom \ - xpcom_obsolete \ - ,-I$(OUTDIR_FOR_BUILD)/inc/mozilla/$(subdir)) \ + -I$(OUTDIR_FOR_BUILD)/inc/mozilla/moz \ + -I$(OUTDIR_FOR_BUILD)/inc/mozilla/nspr \ ) $(call gb_LinkTarget_use_libraries,$(1),\ diff --git a/moz/prj/d.lst b/moz/prj/d.lst index 1835ea726158..caceae6af3f3 100644 --- a/moz/prj/d.lst +++ b/moz/prj/d.lst @@ -1,24 +1,22 @@ mkdir: %_DEST%\inc\mozilla mkdir: %COMMON_DEST%\inc\mozilla +mkdir: %_DEST%\inc\mozilla\moz + mkdir: %_DEST%\inc\mozilla\absync mkdir: %_DEST%\inc\mozilla\accessibility mkdir: %_DEST%\inc\mozilla\AcctIdl -mkdir: %_DEST%\inc\mozilla\addrbook mkdir: %_DEST%\inc\mozilla\appcomps mkdir: %_DEST%\inc\mozilla\appshell mkdir: %_DEST%\inc\mozilla\appstartup mkdir: %_DEST%\inc\mozilla\bookmarks mkdir: %_DEST%\inc\mozilla\caps mkdir: %_DEST%\inc\mozilla\chardet -mkdir: %_DEST%\inc\mozilla\chrome -mkdir: %_DEST%\inc\mozilla\content mkdir: %_DEST%\inc\mozilla\content_xsl mkdir: %_DEST%\inc\mozilla\content_xul mkdir: %_DEST%\inc\mozilla\cookie mkdir: %_DEST%\inc\mozilla\docshell mkdir: %_DEST%\inc\mozilla\dom mkdir: %_DEST%\inc\mozilla\editor -mkdir: %_DEST%\inc\mozilla\embed_base mkdir: %_DEST%\inc\mozilla\expat mkdir: %_DEST%\inc\mozilla\exthandler mkdir: %_DEST%\inc\mozilla\find @@ -32,7 +30,6 @@ mkdir: %_DEST%\inc\mozilla\htmlparser mkdir: %_DEST%\inc\mozilla\imgicon mkdir: %_DEST%\inc\mozilla\imglib2 mkdir: %_DEST%\inc\mozilla\import -mkdir: %_DEST%\inc\mozilla\intl mkdir: %_DEST%\inc\mozilla\intlcmpt mkdir: %_DEST%\inc\mozilla\jar mkdir: %_DEST%\inc\mozilla\java @@ -45,19 +42,15 @@ mkdir: %_DEST%\inc\mozilla\layout_xul mkdir: %_DEST%\inc\mozilla\ldap mkdir: %_DEST%\inc\mozilla\ldap\ldap mkdir: %_DEST%\inc\mozilla\ldap-nspr -mkdir: %_DEST%\inc\mozilla\locale mkdir: %_DEST%\inc\mozilla\lwbrk mkdir: %_DEST%\inc\mozilla\mailnews -mkdir: %_DEST%\inc\mozilla\mime mkdir: %_DEST%\inc\mozilla\mimeemitter mkdir: %_DEST%\inc\mozilla\mimetype mkdir: %_DEST%\inc\mozilla\mng mkdir: %_DEST%\inc\mozilla\mork mkdir: %_DEST%\inc\mozilla\mozbrwsr -mkdir: %_DEST%\inc\mozilla\mozldap mkdir: %_DEST%\inc\mozilla\mozreg mkdir: %_DEST%\inc\mozilla\mpfilelocprovider -mkdir: %_DEST%\inc\mozilla\msgbase mkdir: %_DEST%\inc\mozilla\msgbaseutil mkdir: %_DEST%\inc\mozilla\msgcompo mkdir: %_DEST%\inc\mozilla\msgdb @@ -65,7 +58,6 @@ mkdir: %_DEST%\inc\mozilla\msgimap mkdir: %_DEST%\inc\mozilla\msglocal mkdir: %_DEST%\inc\mozilla\msgnews mkdir: %_DEST%\inc\mozilla\msgsearch -mkdir: %_DEST%\inc\mozilla\necko mkdir: %_DEST%\inc\mozilla\necko2 mkdir: %_DEST%\inc\mozilla\nkcache mkdir: %_DEST%\inc\mozilla\nspr @@ -77,10 +69,7 @@ mkdir: %_DEST%\inc\mozilla\oji mkdir: %_DEST%\inc\mozilla\obsolete mkdir: %_DEST%\inc\mozilla\plugin mkdir: %_DEST%\inc\mozilla\png -mkdir: %_DEST%\inc\mozilla\pref mkdir: %_DEST%\inc\mozilla\prefmigr -mkdir: %_DEST%\inc\mozilla\profile -mkdir: %_DEST%\inc\mozilla\rdf mkdir: %_DEST%\inc\mozilla\rdfutil mkdir: %_DEST%\inc\mozilla\regviewer mkdir: %_DEST%\inc\mozilla\related @@ -89,12 +78,10 @@ mkdir: %_DEST%\inc\mozilla\setuprsc mkdir: %_DEST%\inc\mozilla\shistory mkdir: %_DEST%\inc\mozilla\sidebar mkdir: %_DEST%\inc\mozilla\signonviewer -mkdir: %_DEST%\inc\mozilla\string mkdir: %_DEST%\inc\mozilla\timer mkdir: %_DEST%\inc\mozilla\transformiix mkdir: %_DEST%\inc\mozilla\txmgr mkdir: %_DEST%\inc\mozilla\txtsvc -mkdir: %_DEST%\inc\mozilla\uconv mkdir: %_DEST%\inc\mozilla\unicharutil mkdir: %_DEST%\inc\mozilla\uninstall mkdir: %_DEST%\inc\mozilla\uriloader @@ -110,34 +97,32 @@ mkdir: %_DEST%\inc\mozilla\widget mkdir: %_DEST%\inc\mozilla\windowwatcher mkdir: %_DEST%\inc\mozilla\xml-rpc mkdir: %_DEST%\inc\mozilla\xmlextras -mkdir: %_DEST%\inc\mozilla\xpcom mkdir: %_DEST%\inc\mozilla\xpconnect mkdir: %_DEST%\inc\mozilla\xpicleanup mkdir: %_DEST%\inc\mozilla\xpinstall mkdir: %_DEST%\inc\mozilla\xpnet mkdir: %_DEST%\inc\mozilla\zlib -mkdir: %_DEST%\inc\mozilla\xpcom_obsolete ..\%__SRC%\inc\*.h %_DEST%\inc\mozilla ..\%__SRC%\inc\absync\* %_DEST%\inc\mozilla\absync ..\%__SRC%\inc\accessibility\* %_DEST%\inc\mozilla\accessibility ..\%__SRC%\inc\AcctIdl\* %_DEST%\inc\mozilla\AcctIdl -..\%__SRC%\inc\addrbook\* %_DEST%\inc\mozilla\addrbook +..\%__SRC%\inc\addrbook\* %_DEST%\inc\mozilla\moz ..\%__SRC%\inc\appcomps\* %_DEST%\inc\mozilla\appcomps ..\%__SRC%\inc\appshell\* %_DEST%\inc\mozilla\appshell ..\%__SRC%\inc\appstartup\* %_DEST%\inc\mozilla\appstartup ..\%__SRC%\inc\bookmarks\* %_DEST%\inc\mozilla\bookmarks ..\%__SRC%\inc\caps\* %_DEST%\inc\mozilla\caps ..\%__SRC%\inc\chardet\* %_DEST%\inc\mozilla\chardet -..\%__SRC%\inc\chrome\* %_DEST%\inc\mozilla\chrome -..\%__SRC%\inc\content\* %_DEST%\inc\mozilla\content +..\%__SRC%\inc\chrome\* %_DEST%\inc\mozilla\moz +..\%__SRC%\inc\content\* %_DEST%\inc\mozilla\moz ..\%__SRC%\inc\content_xsl\* %_DEST%\inc\mozilla\content_xsl ..\%__SRC%\inc\content_xul\* %_DEST%\inc\mozilla\content_xul ..\%__SRC%\inc\cookie\* %_DEST%\inc\mozilla\cookie ..\%__SRC%\inc\docshell\* %_DEST%\inc\mozilla\docshell ..\%__SRC%\inc\dom\* %_DEST%\inc\mozilla\dom ..\%__SRC%\inc\editor\* %_DEST%\inc\mozilla\editor -..\%__SRC%\inc\embed_base\* %_DEST%\inc\mozilla\embed_base +..\%__SRC%\inc\embed_base\* %_DEST%\inc\mozilla\moz ..\%__SRC%\inc\expat\* %_DEST%\inc\mozilla\expat ..\%__SRC%\inc\exthandler\* %_DEST%\inc\mozilla\exthandler ..\%__SRC%\inc\find\* %_DEST%\inc\mozilla\find @@ -151,7 +136,7 @@ mkdir: %_DEST%\inc\mozilla\xpcom_obsolete ..\%__SRC%\inc\imgicon\* %_DEST%\inc\mozilla\imgicon ..\%__SRC%\inc\imglib2\* %_DEST%\inc\mozilla\imglib2 ..\%__SRC%\inc\import\* %_DEST%\inc\mozilla\import -..\%__SRC%\inc\intl\* %_DEST%\inc\mozilla\intl +..\%__SRC%\inc\intl\* %_DEST%\inc\mozilla\moz ..\%__SRC%\inc\intlcmpt\* %_DEST%\inc\mozilla\intlcmpt ..\%__SRC%\inc\jar\* %_DEST%\inc\mozilla\jar ..\%__SRC%\inc\java\* %_DEST%\inc\mozilla\java @@ -164,19 +149,19 @@ mkdir: %_DEST%\inc\mozilla\xpcom_obsolete ..\%__SRC%\inc\ldap\* %_DEST%\inc\mozilla\ldap ..\%__SRC%\inc\ldap\ldap\* %_DEST%\inc\mozilla\ldap\ldap ..\%__SRC%\inc\ldap-nspr\* %_DEST%\inc\mozilla\ldap-nspr -..\%__SRC%\inc\locale\* %_DEST%\inc\mozilla\locale +..\%__SRC%\inc\locale\* %_DEST%\inc\mozilla\moz ..\%__SRC%\inc\lwbrk\* %_DEST%\inc\mozilla\lwbrk ..\%__SRC%\inc\mailnews\* %_DEST%\inc\mozilla\mailnews -..\%__SRC%\inc\mime\* %_DEST%\inc\mozilla\mime +..\%__SRC%\inc\mime\* %_DEST%\inc\mozilla\moz ..\%__SRC%\inc\mimeemitter\* %_DEST%\inc\mozilla\mimeemitter ..\%__SRC%\inc\mimetype\* %_DEST%\inc\mozilla\mimetype ..\%__SRC%\inc\mng\* %_DEST%\inc\mozilla\mng ..\%__SRC%\inc\mork\* %_DEST%\inc\mozilla\mork ..\%__SRC%\inc\mozbrwsr\* %_DEST%\inc\mozilla\mozbrwsr -..\%__SRC%\inc\mozldap\* %_DEST%\inc\mozilla\mozldap +..\%__SRC%\inc\mozldap\* %_DEST%\inc\mozilla\moz ..\%__SRC%\inc\mozreg\* %_DEST%\inc\mozilla\mozreg ..\%__SRC%\inc\mpfilelocprovider\* %_DEST%\inc\mozilla\mpfilelocprovider -..\%__SRC%\inc\msgbase\* %_DEST%\inc\mozilla\msgbase +..\%__SRC%\inc\msgbase\* %_DEST%\inc\mozilla\moz ..\%__SRC%\inc\msgbaseutil\* %_DEST%\inc\mozilla\msgbaseutil ..\%__SRC%\inc\msgcompo\* %_DEST%\inc\mozilla\msgcompo ..\%__SRC%\inc\msgdb\* %_DEST%\inc\mozilla\msgdb @@ -184,7 +169,7 @@ mkdir: %_DEST%\inc\mozilla\xpcom_obsolete ..\%__SRC%\inc\msglocal\* %_DEST%\inc\mozilla\msglocal ..\%__SRC%\inc\msgnews\* %_DEST%\inc\mozilla\msgnews ..\%__SRC%\inc\msgsearch\* %_DEST%\inc\mozilla\msgsearch -..\%__SRC%\inc\necko\* %_DEST%\inc\mozilla\necko +..\%__SRC%\inc\necko\* %_DEST%\inc\mozilla\moz ..\%__SRC%\inc\necko2\* %_DEST%\inc\mozilla\necko2 ..\%__SRC%\inc\nkcache\* %_DEST%\inc\mozilla\nkcache ..\%__SRC%\inc\nspr\* %_DEST%\inc\mozilla\nspr @@ -196,10 +181,10 @@ mkdir: %_DEST%\inc\mozilla\xpcom_obsolete ..\%__SRC%\inc\obsolete\* %_DEST%\inc\mozilla\obsolete ..\%__SRC%\inc\plugin\* %_DEST%\inc\mozilla\plugin ..\%__SRC%\inc\png\* %_DEST%\inc\mozilla\png -..\%__SRC%\inc\pref\* %_DEST%\inc\mozilla\pref +..\%__SRC%\inc\pref\* %_DEST%\inc\mozilla\moz ..\%__SRC%\inc\prefmigr\* %_DEST%\inc\mozilla\prefmigr -..\%__SRC%\inc\profile\* %_DEST%\inc\mozilla\profile -..\%__SRC%\inc\rdf\* %_DEST%\inc\mozilla\rdf +..\%__SRC%\inc\profile\* %_DEST%\inc\mozilla\moz +..\%__SRC%\inc\rdf\* %_DEST%\inc\mozilla\moz ..\%__SRC%\inc\rdfutil\* %_DEST%\inc\mozilla\rdfutil ..\%__SRC%\inc\regviewer\* %_DEST%\inc\mozilla\regviewer ..\%__SRC%\inc\related\* %_DEST%\inc\mozilla\related @@ -208,12 +193,12 @@ mkdir: %_DEST%\inc\mozilla\xpcom_obsolete ..\%__SRC%\inc\shistory\* %_DEST%\inc\mozilla\shistory ..\%__SRC%\inc\sidebar\* %_DEST%\inc\mozilla\sidebar ..\%__SRC%\inc\signonviewer\* %_DEST%\inc\mozilla\signonviewer -..\%__SRC%\inc\string\* %_DEST%\inc\mozilla\string +..\%__SRC%\inc\string\* %_DEST%\inc\mozilla\moz ..\%__SRC%\inc\timer\* %_DEST%\inc\mozilla\timer ..\%__SRC%\inc\transformiix\* %_DEST%\inc\mozilla\transformiix ..\%__SRC%\inc\txmgr\* %_DEST%\inc\mozilla\txmgr ..\%__SRC%\inc\txtsvc\* %_DEST%\inc\mozilla\txtsvc -..\%__SRC%\inc\uconv\* %_DEST%\inc\mozilla\uconv +..\%__SRC%\inc\uconv\* %_DEST%\inc\mozilla\moz ..\%__SRC%\inc\unicharutil\* %_DEST%\inc\mozilla\unicharutil ..\%__SRC%\inc\uninstall\* %_DEST%\inc\mozilla\uninstall ..\%__SRC%\inc\uriloader\* %_DEST%\inc\mozilla\uriloader @@ -229,13 +214,13 @@ mkdir: %_DEST%\inc\mozilla\xpcom_obsolete ..\%__SRC%\inc\windowwatcher\* %_DEST%\inc\mozilla\windowwatcher ..\%__SRC%\inc\xml-rpc\* %_DEST%\inc\mozilla\xml-rpc ..\%__SRC%\inc\xmlextras\* %_DEST%\inc\mozilla\xmlextras -..\%__SRC%\inc\xpcom\* %_DEST%\inc\mozilla\xpcom +..\%__SRC%\inc\xpcom\* %_DEST%\inc\mozilla\moz ..\%__SRC%\inc\xpconnect\* %_DEST%\inc\mozilla\xpconnect ..\%__SRC%\inc\xpicleanup\* %_DEST%\inc\mozilla\xpicleanup ..\%__SRC%\inc\xpinstall\* %_DEST%\inc\mozilla\xpinstall ..\%__SRC%\inc\xpnet\* %_DEST%\inc\mozilla\xpnet ..\%__SRC%\inc\zlib\* %_DEST%\inc\mozilla\zlib -..\%__SRC%\inc\xpcom_obsolete\* %_DEST%\inc\mozilla\xpcom_obsolete +..\%__SRC%\inc\xpcom_obsolete\* %_DEST%\inc\mozilla\moz ..\%__SRC%\lib\libldap50.* %_DEST%\lib ..\%__SRC%\lib\libmozjs.* %_DEST%\lib -- cgit