gbuildize desktop

3 files changed, 41 insertions, 188 deletions

diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index 79686d30f46c..73be88f7705e 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -1,44 +1,3 @@
 dt      desktop :    TRANSLATIONS:translations sfx2 stoc BERKELEYDB:berkeleydb sysui BOOST:boost svx xmlhelp sal unoil officecfg offapi filter LIBXSLT:libxslt NULL
 dt	desktop									usr1	-	all	dt_mkout NULL
-dt	desktop\inc								nmake	-	all	dt_inc NULL
-dt	desktop\prj								get		-	all	dt_prj NULL
-dt	desktop\res								get		-	all	dt_res NULL
-dt	desktop\source\app						nmake	-	all	dt_app dt_migr dt_inc dt_dp_misc NULL
-dt	desktop\source\migration				nmake	-	all	dt_migr dt_inc NULL
-dt	desktop\source\migration\services		nmake	-	all	dt_services dt_inc dt_dp_misc NULL
-dt	desktop\source\offacc					nmake	-	all	dt_offac dt_inc NULL
-dt	desktop\source\splash					nmake	-	all	dt_spl dt_migr dt_inc NULL
-dt	desktop\win32\source					nmake	-	w	dt_wrapper dt_inc NULL
-dt	desktop\win32\source\setup				nmake	-	w	dt_setup dt_inc NULL
-dt	desktop\win32\source\officeloader		nmake	-	w	dt_officeloader dt_inc NULL
-dt	desktop\win32\source\guiloader			nmake	-	w	dt_guiloader dt_wrapper.w dt_inc NULL
-dt  desktop\win32\source\guistdio           nmake   -   w   dt_guistdio dt_inc NULL
-dt	desktop\win32\source\applauncher		nmake	-	w	dt_applauncher dt_inc NULL
-dt	desktop\win32\source\applauncher\ooo	nmake	-	w	dt_applauncher_ooo dt_applauncher.w dt_inc NULL
-dt	desktop\win32\source\QuickStart		nmake	-	w	dt_win32_quickstart NULL
-dt	desktop\win32\source\QuickStart\so	nmake	-	w	dt_win32_quickstart_so dt_win32_quickstart.w NULL
-dt	desktop\unx\source\officeloader		nmake	-	u	dt_officeloader_unx dt_inc NULL
-dt     desktop\unx\source                      nmake   -       u       dt_uwrapper dt_pagein.u dt_inc NULL
-dt	desktop\source\pagein					nmake	-	u	dt_pagein dt_inc NULL
-dt	desktop\source\pkgchk\unopkg			nmake	-	all	dt_unopkg dt_dp_misc dt_app dt_inc dt_guiloader.w NULL
-dt     desktop\unx\splash                      nmake   -       u       dt_usplash      dt_pagein.u dt_inc NULL
-dt	desktop\source\deployment				nmake	-	all	dt_deployment dt_dp_manager dt_dp_registry dt_dp_registry_package dt_dp_registry_executable dt_dp_registry_help dt_dp_registry_script dt_dp_registry_sfwk dt_dp_registry_component dt_dp_registry_configuration dt_dp_unopkg dt_inc dt_dp_misc NULL
-dt	desktop\source\deployment\misc				nmake	-	all	dt_dp_misc dt_inc NULL
-dt	desktop\source\deployment\unopkg			nmake	-	all	dt_dp_unopkg dt_inc NULL
-dt	desktop\source\deployment\gui				nmake	-	all	dt_dp_gui dt_dp_misc dt_inc NULL
-dt	desktop\source\deployment\manager			nmake	-	all	dt_dp_manager dt_inc NULL
-dt	desktop\source\deployment\registry			nmake	-	all	dt_dp_registry dt_inc NULL
-dt	desktop\source\deployment\registry\package		nmake	-	all	dt_dp_registry_package dt_inc NULL
-dt	desktop\source\deployment\registry\script		nmake	-	all	dt_dp_registry_script dt_inc NULL
-dt	desktop\source\deployment\registry\sfwk		nmake	-	all	dt_dp_registry_sfwk dt_inc NULL
-dt	desktop\source\deployment\registry\component		nmake	-	all	dt_dp_registry_component dt_inc NULL
-dt	desktop\source\deployment\registry\configuration	nmake	-	all	dt_dp_registry_configuration dt_inc NULL
-dt	desktop\source\deployment\registry\help			nmake	-	all	dt_dp_registry_help dt_inc NULL
-dt	desktop\source\deployment\registry\executable		nmake	-	all	dt_dp_registry_executable dt_inc NULL
-dt	desktop\scripts 						nmake	-	u	dt_scripts dt_inc NULL
-dt	desktop\util							nmake	-	all	dt_util dt_app dt_pagein.u dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_win32_quickstart_so.w dt_zipintro NULL
-dt	desktop\zipintro							nmake	-	all	dt_zipintro NULL
-dt desktop\qa\deployment_misc nmake - all sn_qa_deployment_misc dt_dp_misc dt_inc NULL
-dt desktop\test\deployment\active nmake - all dt_test_deployment_active NULL
-dt desktop\test\deployment\boxt nmake - all dt_test_deployment_boxt NULL
-dt desktop\test\deployment\passive nmake - all dt_test_deployment_passive NULL
+dt	desktop\prj						nmake	-	all	dt_prj NULL
diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index 15ce1e885f79..e69de29bb2d1 100644
--- a/desktop/prj/d.lst
+++ b/desktop/prj/d.lst
@@ -1,146 +0,0 @@
-mkdir: %COMMON_DEST%\bin\hid
-mkdir: %_DEST%\bin\so
-mkdir: %_DEST%\bin\c01
-mkdir: %_DEST%\bin\c05
-mkdir: %_DEST%\bin\c08
-mkdir: %_DEST%\bin\odf4ms
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
-..\%__SRC%\bin\soffice.bin %_DEST%\bin\soffice.bin
-..\%__SRC%\bin\officeloader.exe %_DEST%\bin\soffice.exe
-..\%__SRC%\bin\soffice %_DEST%\bin\soffice.bin
-..\%__SRC%\bin\soffice_mac %_DEST%\bin\soffice
-..\%__SRC%\bin\oosplash %_DEST%\bin\oosplash.bin
-..\%__SRC%\bin\so\soffice.bin %_DEST%\bin\so\soffice.bin
-..\%__SRC%\bin\so\officeloader.exe %_DEST%\bin\so\soffice.exe
-..\%__SRC%\bin\so\soffice %_DEST%\bin\so\soffice.bin
-..\%__SRC%\bin\so\soffice_mac %_DEST%\bin\so\soffice
-..\%__SRC%\bin\sofficea*.dll %_DEST%\bin\sofficea*.dll
-..\%__SRC%\lib\isofficeapp.lib %_DEST%\lib\isofficeapp.lib
-..\%__SRC%\lib\libsofficeapp.dylib %_DEST%\lib\libsofficeapp.dylib
-..\%__SRC%\lib\libsofficeapp.so %_DEST%\lib\libsofficeapp.so
-
-..\%__SRC%\bin\soffice_oo.exe %_DEST%\bin\soffice_oo.exe
-..\%__SRC%\bin\soffice_oo %_DEST%\bin\soffice_oo.bin
-..\%__SRC%\bin\so\soffice_so.exe %_DEST%\bin\so\soffice_so.exe
-..\%__SRC%\bin\so\soffice_so %_DEST%\bin\so\soffice_so.bin
-
-..\%__SRC%\bin\scalc.exe %_DEST%\bin\scalc.exe
-..\%__SRC%\bin\sdraw.exe %_DEST%\bin\sdraw.exe
-..\%__SRC%\bin\simpress.exe %_DEST%\bin\simpress.exe
-..\%__SRC%\bin\smath.exe %_DEST%\bin\smath.exe
-..\%__SRC%\bin\swriter.exe %_DEST%\bin\swriter.exe
-..\%__SRC%\bin\sbase.exe %_DEST%\bin\sbase.exe
-..\%__SRC%\bin\sweb.exe %_DEST%\bin\sweb.exe
-..\%__SRC%\bin\os2quickstart.exe %_DEST%\bin\quickstart.exe
-..\%__SRC%\bin\so\scalc.exe %_DEST%\bin\so\scalc.exe
-..\%__SRC%\bin\so\sdraw.exe %_DEST%\bin\so\sdraw.exe
-..\%__SRC%\bin\so\simpress.exe %_DEST%\bin\so\simpress.exe
-..\%__SRC%\bin\so\smath.exe %_DEST%\bin\so\smath.exe
-..\%__SRC%\bin\so\swriter.exe %_DEST%\bin\so\swriter.exe
-..\%__SRC%\bin\so\sbase.exe %_DEST%\bin\so\sbase.exe
-..\%__SRC%\bin\so\sweb.exe %_DEST%\bin\so\sweb.exe
-
-..\%__SRC%\bin\quickstart.exe %_DEST%\bin\quickstart.exe
-..\%__SRC%\bin\quickstart.exe %_DEST%\bin\install_quickstart.exe
-..\%__SRC%\bin\soquickstart.exe %_DEST%\bin\so\quickstart.exe
-..\%__SRC%\bin\soquickstart.exe %_DEST%\bin\so\install_quickstart.exe
-
-..\%__SRC%\misc\soffice.exe.manifest %_DEST%\bin\soffice.exe.manifest
-..\%__SRC%\misc\soffice.bin.manifest %_DEST%\bin\soffice.bin.manifest
-..\%__SRC%\bin\wrp*.dll %_DEST%\bin\wrp*.dll
-..\%__SRC%\bin\spl*.dll %_DEST%\bin\spl*.dll
-..\%__SRC%\obj\officeloader.obj %_DEST%\lib\officeloader.obj
-..\%__SRC%\obj\extendloaderenvironment.obj %_DEST%\lib\extendloaderenvironment.obj
-..\%__SRC%\obj\copyright_ascii_sun.obj %_DEST%\lib\copyright_ascii_sun.obj
-..\%__SRC%\obj\main.obj %_DEST%\lib\main.obj
-..\%__SRC%\lib\libwrp*.so %_DEST%\lib\libwrp*.so
-..\%__SRC%\lib\libwrp*.dylib %_DEST%\lib\libwrp*.dylib
-..\%__SRC%\lib\libspl*.so %_DEST%\lib\libspl*.so
-..\%__SRC%\lib\libspl*.dylib %_DEST%\lib\libspl*.dylib
-..\%__SRC%\bin\offacc*.dll %_DEST%\bin\offacc*.dll
-..\%__SRC%\lib\liboffacc*.so %_DEST%\lib\liboffacc*.so
-..\%__SRC%\lib\liboffacc*.dylib %_DEST%\lib\liboffacc*.dylib
-..\%__SRC%\bin\migratio*.dll %_DEST%\bin\migratio*.dll
-..\%__SRC%\lib\migratio*.uno.so %_DEST%\lib\migratio*.uno.so
-..\%__SRC%\lib\migratio*.uno.dylib %_DEST%\lib\migratio*.uno.dylib
-
-..\%__SRC%\bin\sweb %_DEST%\bin\sweb.bin
-
-..\%__SRC%\bin\loader2.ex? %_DEST%\bin\loader2.ex?
-
-..\%__SRC%\bin\depl*.dll %_DEST%\bin\depl*.dll
-..\%__SRC%\lib\deployment*.uno.so %_DEST%\lib\deployment*.uno.so
-..\%__SRC%\lib\deployment*.uno.dylib %_DEST%\lib\deployment*.uno.dylib
-..\%__SRC%\bin\deploymentmisc*.dll %_DEST%\bin\deploymentmisc*.dll
-..\%__SRC%\lib\libdeploymentmisc*.so %_DEST%\lib\libdeploymentmisc*.so
-..\%__SRC%\lib\libdeploymentmisc*.dylib %_DEST%\lib\libdeploymentmisc*.dylib
-..\%__SRC%\bin\guiloader.exe %_DEST%\bin\unopkg.exe
-..\%__SRC%\bin\so\guiloader.exe %_DEST%\bin\so\unopkg.exe
-..\%__SRC%\bin\unopkg %_DEST%\bin\unopkg.bin
-..\%__SRC%\bin\so\unopkg %_DEST%\bin\so\unopkg.bin
-..\%__SRC%\bin\unopkg.exe %_DEST%\bin\unopkg.bin
-..\%__SRC%\bin\so\unopkg.exe %_DEST%\bin\so\unopkg.bin
-..\%__SRC%\misc\unopkg.sh %_DEST%\bin\unopkg
-..\%__SRC%\bin\unopkga*.dll %_DEST%\bin\unopkga*.dll
-..\%__SRC%\lib\libunopkgapp.dylib %_DEST%\lib\libunopkgapp.dylib
-..\%__SRC%\lib\libunopkgapp.so %_DEST%\lib\libunopkgapp.so
-
-..\%__SRC%\bin\pagein %_DEST%\bin\pagein
-..\%__SRC%\misc\pagein-* %_DEST%\bin\pagein-*
-
-..\%__SRC%\bin\unoinfo.exe %_DEST%\bin\unoinfo.exe
-..\%__SRC%\misc\unoinfo.sh %_DEST%\bin\unoinfo
-
-..\%__SRC%\bin\*.res %_DEST%\bin\*.res
-
-..\%__SRC%\misc\soffice.sh %_DEST%\bin\soffice
-..\%__SRC%\misc\sbase.sh %_DEST%\bin\sbase
-..\%__SRC%\misc\scalc.sh %_DEST%\bin\scalc
-..\%__SRC%\misc\sdraw.sh %_DEST%\bin\sdraw
-..\%__SRC%\misc\simpress.sh %_DEST%\bin\simpress
-..\%__SRC%\misc\smaster.sh %_DEST%\bin\smaster
-..\%__SRC%\misc\smath.sh %_DEST%\bin\smath
-..\%__SRC%\misc\sweb.sh %_DEST%\bin\sweb
-..\%__SRC%\misc\swriter.sh %_DEST%\bin\swriter
-..\%__SRC%\misc\nswrapper.sh %_DEST%\bin\nswrapper
-..\%__SRC%\misc\mozwrapper.sh %_DEST%\bin\mozwrapper
-..\%__SRC%\misc\gdbtrace %_DEST%\bin\gdbtrace
-
-mkdir: %COMMON_DEST%\pck\brand
-mkdir: %COMMON_DEST%\pck\brand_dev
-
-..\%__SRC%\bin\intro.zip %COMMON_DEST%\pck\intro.zip
-..\%__SRC%\bin\brand\intro.zip %COMMON_DEST%\pck\brand\intro.zip
-..\%__SRC%\bin\brand_dev\intro.zip %COMMON_DEST%\pck\brand_dev\intro.zip
-..\%__SRC%\bin\shell\shell.zip %COMMON_DEST%\pck\shell.zip
-
-..\%__SRC%\bin\guiloader.exe %_DEST%\bin\testtool.exe
-
-..\%__SRC%\bin\guistdio.exe %_DEST%\bin\guistdio.com
-..\%__SRC%\bin\guistdio.exe %_DEST%\bin\crashrep.com
-..\%__SRC%\bin\unopkgio.exe %_DEST%\bin\unopkg.com
-
-..\scripts\ure-link %_DEST%\bin\ure-link
-..\scripts\basis-link %_DEST%\bin\basis-link
-..\scripts\basis-link %_DEST%\bin\c01\basis-link
-..\scripts\basis-link %_DEST%\bin\c05\basis-link
-..\scripts\basis-link %_DEST%\bin\c08\basis-link
-..\scripts\so-basis-link %_DEST%\bin\so\basis-link
-..\scripts\odf-basis-link %_DEST%\bin\odf4ms\basis-link
-
-mkdir: %_DEST%\xml\registry\spool
-mkdir: %_DEST%\xml\registry\spool\org
-mkdir: %_DEST%\xml\registry\spool\org\openoffice
-mkdir: %_DEST%\xml\registry\spool\org\openoffice\Office
-mkdir: %_DEST%\xml\registry\spool\org\openoffice\Office\Jobs
-
-..\%__SRC%\class\*.jar %_DEST%\bin\*.jar
-..\%__SRC%\misc\registry\spool\org\openoffice\Office\Jobs\*.xcu %_DEST%\xml\registry\spool\org\openoffice\Office\Jobs
-..\%__SRC%\misc\deployment.component %_DEST%\xml\deployment.component
-..\%__SRC%\misc\deploymentgui.component %_DEST%\xml\deploymentgui.component
-..\%__SRC%\misc\migrationoo2.component %_DEST%\xml\migrationoo2.component
-..\%__SRC%\misc\migrationoo3.component %_DEST%\xml\migrationoo3.component
-..\%__SRC%\misc\offacc.component %_DEST%\xml\offacc.component
-..\%__SRC%\misc\spl.component %_DEST%\xml\spl.component
-..\%__SRC%\misc\splash.component %_DEST%\xml\splash.component
diff --git a/desktop/prj/makefile.mk b/desktop/prj/makefile.mk
new file mode 100755
index 000000000000..ffd9fb276d8a
--- /dev/null
+++ b/desktop/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog