Author: jim
Date: Thu Feb 14 14:28:07 2019
New Revision: 1853584
URL: http://svn.apache.org/viewvc?rev=1853584&view=rev
Log:
Merge r1853245 from trunk:
Port main/solenv to gbuild.
Patch by: me
Submitted by: damjan
Reviewed by: jim
Added:
openoffice/branches/AOO42X/main/solenv/Makefile
- copied unchanged from r1853245, openoffice/trunk/main/solenv/Makefile
openoffice/branches/AOO42X/main/solenv/Module_solenv.mk
- copied unchanged from r1853245,
openoffice/trunk/main/solenv/Module_solenv.mk
openoffice/branches/AOO42X/main/solenv/Package_version.mk
- copied unchanged from r1853245,
openoffice/trunk/main/solenv/Package_version.mk
openoffice/branches/AOO42X/main/solenv/Package_versionlist.mk
- copied unchanged from r1853245,
openoffice/trunk/main/solenv/Package_versionlist.mk
openoffice/branches/AOO42X/main/solenv/prj/makefile.mk
- copied unchanged from r1853245,
openoffice/trunk/main/solenv/prj/makefile.mk
Removed:
openoffice/branches/AOO42X/main/solenv/makefile.mk
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/Module_ooo.mk
openoffice/branches/AOO42X/main/solenv/prj/build.lst
openoffice/branches/AOO42X/main/solenv/prj/d.lst
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 14 14:28:07 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853319,1853443-1853444,1853504
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853319,1853443-1853444,1853504
Modified: openoffice/branches/AOO42X/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/Module_ooo.mk?rev=1853584&r1=1853583&r2=1853584&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/Module_ooo.mk (original)
+++ openoffice/branches/AOO42X/main/Module_ooo.mk Thu Feb 14 14:28:07 2019
@@ -88,6 +88,7 @@ $(eval $(call gb_Module_add_moduledirs,o
sd \
sfx2 \
slideshow \
+ solenv \
sot \
starmath \
store \
Modified: openoffice/branches/AOO42X/main/solenv/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/prj/build.lst?rev=1853584&r1=1853583&r2=1853584&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/prj/build.lst (original)
+++ openoffice/branches/AOO42X/main/solenv/prj/build.lst Thu Feb 14 14:28:07
2019
@@ -1,3 +1,2 @@
sn solenv : NULL
-sn solenv
usr1 - all sn_mkout NULL
-sn solenv
nmake - all sn_init NULL
+sn solenv/prj
nmake - all sn_prj NULL
Modified: openoffice/branches/AOO42X/main/solenv/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/prj/d.lst?rev=1853584&r1=1853583&r2=1853584&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/prj/d.lst (original)
+++ openoffice/branches/AOO42X/main/solenv/prj/d.lst Thu Feb 14 14:28:07 2019
@@ -1,4 +0,0 @@
-mkdir: %_DEST%\bin%_EXT%
-mkdir: %_DEST%\inc%_EXT%
-..\inc\version.lst %_DEST%\bin%_EXT%\version.lst
-..\%__SRC%\inc\versionlist.hrc %_DEST%\inc%_EXT%\versionlist.hrc
