Author: arist
Date: Wed Nov 14 22:35:24 2012
New Revision: 1409483
URL: http://svn.apache.org/viewvc?rev=1409483&view=rev
Log:
gnumake4_002_70beafb00557.patch
# HG changeset patch
# User mba
# Date 1298364838 -3600
# Node ID 70beafb0055764f572eca7d40c921ec05903055f
# Parent b716c81f9521ea084d9222fc8a7df1207ae91d87
CWS gnumake4: convert wizards to new build system
Modified:
incubator/ooo/branches/gbuild/main/Module_ooo.mk
incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
incubator/ooo/branches/gbuild/main/wizards/prj/build.lst
incubator/ooo/branches/gbuild/main/wizards/prj/d.lst
Modified: incubator/ooo/branches/gbuild/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Module_ooo.mk?rev=1409483&r1=1409482&r2=1409483&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Module_ooo.mk (original)
+++ incubator/ooo/branches/gbuild/main/Module_ooo.mk Wed Nov 14 22:35:24 2012
@@ -45,6 +45,7 @@ $(eval $(call gb_Module_add_moduledirs,o
unoxml \
vbahelper \
vcl \
+ wizards \
writerfilter \
xmloff \
))
Modified:
incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk?rev=1409483&r1=1409482&r2=1409483&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
(original)
+++ incubator/ooo/branches/gbuild/main/postprocess/packcomponents/makefile.mk
Wed Nov 14 22:35:24 2012
@@ -258,16 +258,16 @@ my_components += \
ScriptProviderForJava \
XMergeBridge \
XSLTValidate \
- agenda \
- fax \
- form \
+ component/wizards/com/sun/star/wizards/agenda/agenda \
+ component/wizards/com/sun/star/wizards/fax/fax \
+ component/wizards/com/sun/star/wizards/form/form \
hsqldb \
jdbc \
- letter \
- query \
- report \
- table \
- web
+ component/wizards/com/sun/star/wizards/letter/letter \
+ component/wizards/com/sun/star/wizards/query/query \
+ component/wizards/com/sun/star/wizards/report/report \
+ component/wizards/com/sun/star/wizards/table/table \
+ component/wizards/com/sun/star/wizards/web/web
.IF "$(ENABLE_BEANSHELL)" == "YES"
my_components += ScriptProviderForBeanShell
.END
Modified: incubator/ooo/branches/gbuild/main/wizards/prj/build.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/wizards/prj/build.lst?rev=1409483&r1=1409482&r2=1409483&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/wizards/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/wizards/prj/build.lst Wed Nov 14
22:35:24 2012
@@ -1,28 +1,2 @@
wz wizards : L10N:l10n rsc javaunohelper unoil LIBXSLT:libxslt NULL
-wz wizards\util nmake
- all wz_util NULL
-wz wizards\source\config nmake
- all wz_config NULL
-wz wizards\source\configshare nmake
- all wz_configshare NULL
-wz wizards\source\imagelists nmake
- all wz_imglists NULL
-wz wizards\source\euro nmake
- all wz_eurowiz NULL
-wz wizards\source\formwizard nmake
- all wz_reswiz NULL
-wz wizards\source\gimmicks nmake
- all wz_gimmickswz NULL
-wz wizards\source\importwizard nmake
- all wz_importwiz NULL
-wz wizards\source\schedule nmake
- all wz_schedulewiz NULL
-wz wizards\source\template nmake
- all wz_templatewiz NULL
-wz wizards\source\tools nmake
- all wz_toolswiz NULL
-wz wizards\source\depot nmake
- all wz_depot NULL
-wz wizards\source\tutorials nmake
- all wz_tutorials NULL
-wz wizards\source\standard nmake
- all wz_standard NULL
-wz wizards\com\sun\star\wizards nmake
- all wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\query nmake
- all wz_querywiz wz_formwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\report nmake
- all wz_reportwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\reportbuilder\layout nmake
- all wz_rptlayoutwiz wz_reportwiz NULL
-wz wizards\com\sun\star\wizards\reportbuilder nmake
- all wz_rptbldwiz wz_rptlayoutwiz NULL
-wz wizards\com\sun\star\wizards\table nmake
- all wz_tablewiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\form nmake
- all wz_formwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\letter nmake
- all wz_letterwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\fax nmake
- all wz_faxwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\agenda nmake
- all wz_agendawiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\web\data nmake
- all wz_webdata wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\web\export nmake
- all wz_webexport wz_webdata wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\web nmake
- all wz_webwiz wz_webexport NULL
+wz wizards\prj nmake
- all wz_prj NULL
Modified: incubator/ooo/branches/gbuild/main/wizards/prj/d.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/wizards/prj/d.lst?rev=1409483&r1=1409482&r2=1409483&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/wizards/prj/d.lst (original)
+++ incubator/ooo/branches/gbuild/main/wizards/prj/d.lst Wed Nov 14 22:35:24
2012
@@ -1,23 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\pck%_EXT%
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
- ..\%__SRC%\bin\wzi*.res %_DEST%\bin%_EXT%\wzi*.res
-..\%__SRC%\bin\dbw*.res %_DEST%\bin%_EXT%\dbw*.res
-..\%__SRC%\bin\tpl*.res %_DEST%\bin%_EXT%\tpl*.res
-..\%__SRC%\bin\imp*.res %_DEST%\bin%_EXT%\imp*.res
-..\%__SRC%\bin\wwz*.res %_DEST%\bin%_EXT%\wwz*.res
-..\%__SRC%\bin\eur*.res %_DEST%\bin%_EXT%\eur*.res
-..\%__SRC%\bin\cal*.res %_DEST%\bin%_EXT%\cal*.res
-..\%__SRC%\bin\com*.res %_DEST%\bin%_EXT%\com*.res
-REM ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-
-..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
-..\%__SRC%\misc\agenda.component %_DEST%\xml%_EXT%\agenda.component
-..\%__SRC%\misc\fax.component %_DEST%\xml%_EXT%\fax.component
-..\%__SRC%\misc\form.component %_DEST%\xml%_EXT%\form.component
-..\%__SRC%\misc\letter.component %_DEST%\xml%_EXT%\letter.component
-..\%__SRC%\misc\query.component %_DEST%\xml%_EXT%\query.component
-..\%__SRC%\misc\report.component %_DEST%\xml%_EXT%\report.component
-..\%__SRC%\misc\table.component %_DEST%\xml%_EXT%\table.component
-..\%__SRC%\misc\web.component %_DEST%\xml%_EXT%\web.component
