add sdext to tail_build

2db25c27 · David Tardon · 52903da6 · 2db25c27 · 2db25c27 · 2db25c27
Kaydet (Commit) 2db25c27 authored Şub 20, 2012 tarafından David Tardon
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 1 deletion

Module_tail_build.mk Module_tail_build.mk +1 -0

build.lst postprocess/prj/build.lst +1 -1

build.lst.orig postprocess/prj/build.lst.orig +12 -0

No files found.
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
    sccomp \
    scripting \
    sd \
+    sdext \
    sfx2 \
    slideshow \
    smoketest \

--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
-po      postprocess     ::      BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport tail_build NULL
+po      postprocess     ::      BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport tail_build NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL

--- a/postprocess/prj/build.lst.orig
+++ b/postprocess/prj/build.lst.orig
+<<<<<<< HEAD
+po      postprocess     ::      BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport tail_build NULL
+=======
+po      postprocess     ::      BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport smoketest tail_build NULL
+>>>>>>> feature/gbuild_sdext
+po	postprocess			    	usr1	-	all	po_mkout NULL
+po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
+po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
+po      postprocess\packregistry        nmake   -       all     po_packregistry NULL
+po      postprocess\packcomponents      nmake   -       all     po_packcomponents NULL
+po	postprocess\rebase	    	nmake	-	w	po_rebase NULL
+po	postprocess\signing	    	nmake	-	w,sign	po_signing po_rebase.w NULL