gbuildize desktop

6 files changed, 41 insertions, 425 deletions

diff --git a/desktop/util/Makefile b/desktop/util/Makefile
new file mode 100644
index 000000000000..4dc649efad34
--- /dev/null
+++ b/desktop/util/Makefile
@@ -0,0 +1,40 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+include $(GBUILDDIR)/gbuild_simple.mk
+
+DESTDIR := $(WORKDIR)/CustomTarget/desktop/util
+
+$(DESTDIR)/linker.manifest : $(OUTDIR)/bin/soffice.exe
+	mkdir -p $(DESTDIR) && mt.exe -inputresource:$< -out:$@
+
+$(DESTDIR)/soffice.exe.manifest : $(DESTDIR)/linker.manifest template.manifest
+	mkdir -p $(DESTDIR) && mt.exe -manifest $^ -out:$@
+
+.DEFAULT_TARGET := all
+.PHONY : all
+all : $(DESTDIR)/soffice.exe.manifest
+
+# vim: set ts=4 sw=4 noet:
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
deleted file mode 100755
index 1c6fb2e0e46b..000000000000
--- a/desktop/util/makefile.mk
+++ /dev/null
@@ -1,233 +0,0 @@
-#*************************************************************************
-#
-# 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=..
-
-PRJNAME=desktop
-TARGET=soffice
-TARGETTYPE=GUI
-LIBTARGET=NO
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-UWINAPILIB =
-
-VERINFONAME=verinfo
-
-# --- Resourcen ----------------------------------------------------
-
-.IF "$(GUI)" == "WNT"
-RCFILES=verinfo.rc
-.ENDIF
-
-# --- Linken der Applikation ---------------------------------------
-
-.IF "$(OS)" == "MACOSX"
-LINKFLAGSAPPGUI!:=	$(LINKFLAGSAPPGUI:s/-bind_at_load//)
-.ENDIF # MACOSX
-
-RESLIB1NAME=		dkt
-RESLIB1IMAGES=		$(PRJ)$/res
-RESLIB1SRSFILES=	$(SRS)$/desktop.srs
-
-.IF "$(L10N_framework)"==""
-.IF "$(LINK_SO)"=="TRUE"
-APP1TARGET=so$/$(TARGET)
-APP1NOSAL=TRUE
-APP1RPATH=BRAND
-APP1OBJS=$(OBJ)$/copyright_ascii_sun.obj $(OBJ)$/main.obj
-APP1STDLIBS = $(SALLIB) $(SOFFICELIB)
-APP1DEPN= $(APP1RES) verinfo.rc
-
-.IF "$(GUI)" == "WNT"
-APP1RES=    $(RES)$/desktop.res
-APP1ICON=$(SOLARRESDIR)$/icons/so9_main_app.ico
-APP1VERINFO=verinfo.rc
-APP1LINKRES=$(MISC)$/$(TARGET)1.res
-APP1STACK=10000000
-
-.ENDIF # WNT
-
-.ENDIF # "$(LINK_SO)"=="TRUE"
-
-APP5TARGET=soffice
-APP5NOSAL=TRUE
-APP5RPATH=BRAND
-APP5OBJS=$(OBJ)$/copyright_ascii_ooo.obj $(OBJ)$/main.obj
-APP5STDLIBS = $(SALLIB) $(SOFFICELIB)
-.IF "$(OS)" == "LINUX"
-APP5STDLIBS+= -lXext -lX11
-.ENDIF # LINUX
-
-APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc
-APP5DEF=    $(MISCX)$/$(TARGET).def
-
-.IF "$(GUI)" == "WNT"
-APP5RES=    $(RES)$/oodesktop.res
-APP5ICON=$(SOLARRESDIR)$/icons/ooo3_main_app.ico
-APP5VERINFO=ooverinfo.rc
-APP5LINKRES=$(MISC)$/ooffice5.res
-APP5STACK=10000000
-.ENDIF # WNT
-
-.IF "$(GUI)" == "WNT"
-.IF "$(LINK_SO)"=="TRUE"
-APP6TARGET=so$/officeloader
-APP6RES=$(RES)$/soloader.res
-APP6NOSAL=TRUE
-APP6DEPN= $(APP1TARGETN) $(APP6RES) verinfo.rc
-APP6VERINFO=verinfo.rc
-APP6LINKRES=$(MISC)$/soffice6.res
-APP6ICON=$(SOLARRESDIR)$/icons/so9_main_app.ico
-APP6OBJS = \
-    $(OBJ)$/extendloaderenvironment.obj \
-    $(OBJ)$/officeloader.obj \
-    $(SOLARLIBDIR)$/pathutils-obj.obj
-STDLIB6=$(ADVAPI32LIB) $(SHELL32LIB) $(SHLWAPILIB)
-.ENDIF # "$(LINK_SO)"=="TRUE"
-
-APP7TARGET=officeloader
-APP7RES=$(RES)$/ooloader.res
-APP7NOSAL=TRUE
-APP7DEPN= $(APP1TARGETN) $(APP7RES) ooverinfo.rc
-APP7VERINFO=ooverinfo.rc
-APP7LINKRES=$(MISC)$/ooffice7.res
-APP7ICON=$(SOLARRESDIR)$/icons/ooo3_main_app.ico
-APP7OBJS = \
-    $(OBJ)$/extendloaderenvironment.obj \
-    $(OBJ)$/officeloader.obj \
-    $(SOLARLIBDIR)$/pathutils-obj.obj
-STDLIB7=$(ADVAPI32LIB) $(SHELL32LIB) $(SHLWAPILIB)
-.ELIF "$(OS)" == "MACOSX"
-APP6TARGET=officeloader
-APP6NOSAL=TRUE
-APP6RPATH=BRAND
-APP6OBJS=$(OBJ)$/copyright_ascii_ooo.obj $(OBJ)$/officeloader.obj
-APP6STDLIBS = $(SALLIB)
-APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc
-APP5DEF=    $(MISCX)$/$(TARGET).def
-.ENDIF # WNT
-
-.ENDIF
-
-# --- Targets -------------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(L10N_framework)"==""
-
-.IF "$(APP1TARGETN)"!=""
-$(APP1TARGETN) :  $(MISC)$/binso_created.flg
-.ENDIF			# "$(APP1TARGETN)"!=""
-
-.IF "$(APP5TARGETN)"!=""
-$(APP5TARGETN) :  $(MISC)$/binso_created.flg
-.ENDIF			# "$(APP6TARGETN)"!=""
-
-.IF "$(APP6TARGETN)"!=""
-$(APP6TARGETN) :  $(MISC)$/binso_created.flg
-.ENDIF			# "$(APP6TARGETN)"!=""
-
-.IF "$(GUI)" == "WNT"
-ALLTAR: $(MISC)$/$(TARGET).exe.manifest
-ALLTAR: $(MISC)$/$(TARGET).bin.manifest
-ALLTAR: $(BIN)$/$(TARGET).bin
-.IF "$(LINK_SO)"=="TRUE"
-ALLTAR: $(BIN)$/so$/$(TARGET).bin
-.ENDIF # "$(LINK_SO)"=="TRUE"
-.ENDIF # WNT
-
-$(BIN)$/soffice_oo$(EXECPOST) : $(APP5TARGETN)
-    $(COPY) $< $@
-
-.IF "$(LINK_SO)"=="TRUE"
-$(BIN)$/so$/soffice_so$(EXECPOST) : $(APP1TARGETN)
-    $(COPY) $< $@
-
-ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOST)
-.ENDIF # "$(LINK_SO)"=="TRUE"
-ALLTAR : $(BIN)$/soffice_oo$(EXECPOST)
-
-.IF "$(OS)" == "MACOSX"
-.IF "$(LINK_SO)"=="TRUE"
-$(BIN)$/so$/soffice_mac$(EXECPOST) : $(APP1TARGETN)
-    $(COPY) $< $@
-    
-ALLTAR : $(BIN)$/so$/soffice_mac$(EXECPOST)
-.ENDIF # "$(LINK_SO)"=="TRUE"
-
-$(BIN)$/soffice_mac$(EXECPOST) : $(APP5TARGETN)
-    $(COPY) $< $@
-
-ALLTAR : $(BIN)$/soffice_mac$(EXECPOST)
-
-.ENDIF # "$(OS)" == "MACOSX"
-
-.IF "$(GUI)" == "WNT"
-
-# create a manifest file with the same name as the
-# office executable file soffice.exe.manifest
-.IF "$(CCNUMVER)" <= "001399999999"
-$(MISC)$/$(TARGET).exe.manifest: template.manifest
-   $(COPY) $< $@
-.ELSE
-$(MISC)$/$(TARGET).exe.template.manifest: template.manifest
-   $(COPY) $< $@
-
-$(MISC)$/$(TARGET).exe.linker.manifest: $(BIN)$/$(TARGET)$(EXECPOST)
-   mt.exe -inputresource:$(BIN)$/$(TARGET)$(EXECPOST) -out:$@
-
-$(MISC)$/$(TARGET).exe.manifest: $(MISC)$/$(TARGET).exe.template.manifest $(MISC)$/$(TARGET).exe.linker.manifest
-   mt.exe -manifest $(MISC)$/$(TARGET).exe.linker.manifest $(MISC)$/$(TARGET).exe.template.manifest -out:$@
-.ENDIF
-
-# create a manifest file with the same name as the
-# office executable file soffice.bin.manifest
-.IF "$(CCNUMVER)" <= "001399999999"
-$(MISC)$/$(TARGET).bin.manifest: template.manifest
-   $(COPY) $< $@
-.ELSE
-$(MISC)$/$(TARGET).bin.manifest: $(MISC)$/$(TARGET).exe.manifest
-   $(COPY) $(MISC)$/$(TARGET).exe.manifest $@
-.ENDIF
-
-$(BIN)$/$(TARGET).bin: $(BIN)$/$(TARGET)$(EXECPOST)
-   $(COPY) $< $@
-
-$(BIN)$/so$/$(TARGET).bin: $(BIN)$/so$/$(TARGET)$(EXECPOST)
-   $(COPY) $< $@
-
-.ENDIF # WNT
-
-$(MISC)$/binso_created.flg :
-    @@-$(MKDIRHIER) $(BIN)$/so && $(TOUCH) $@
-
-.ENDIF
diff --git a/desktop/util/ooverinfo.rc b/desktop/util/officeloader.rc
index 53b20852c40d..3d37043c848b 100644
--- a/desktop/util/ooverinfo.rc
+++ b/desktop/util/officeloader.rc
@@ -70,6 +70,7 @@ VS_VERSION_INFO VERSIONINFO
 		}
 	}
 
+1 ICON PPS(RES_APP_ICON) "\0"
 2 ICON "icons/oasis-text.ico"
 3 ICON "icons/oasis-text-template.ico"
 4 ICON "icons/oasis-spreadsheet.ico"
diff --git a/desktop/util/ooverinfo2.rc b/desktop/util/ooverinfo2.rc
deleted file mode 100755
index caacb294122d..000000000000
--- a/desktop/util/ooverinfo2.rc
+++ /dev/null
@@ -1,76 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- *************************************************************************/
-
-#include "version.hrc"
-
-// -----------------------------------------------------------------------
-
-// -----------------------------------------------------------------------
-//                  language/character set specification table
-// -----------------------------------------------------------------------
-
-
-ICON 2 "icons/oasis-text.ico"
-ICON 3 "icons/oasis-text-template.ico"
-ICON 4 "icons/oasis-spreadsheet.ico"
-ICON 5 "icons/oasis-spreadsheet-template.ico"
-ICON 6 "icons/oasis-drawing.ico"
-ICON 7 "icons/oasis-drawing-template.ico"
-ICON 8 "icons/oasis-presentation.ico"
-ICON 9 "icons/oasis-presentation-template.ico"
-ICON 10 "icons/oasis-presentation-template.ico"
-// ICON 11 "icons/oasis-master-document.ico"
-// ICON 12 "icons/oasis-web-template.ico"
-ICON 13 "icons/oasis-empty-document.ico"
-ICON 14 "icons/oasis-database.ico"
-ICON 15 "icons/oasis-formula.ico"
-ICON 16 "icons/oasis-web-template.ico"
-ICON 17 "icons/empty-document.ico"
-ICON 18 "icons/empty-document.ico"
-ICON 19 "icons/ooo-open.ico"
-ICON 20 "icons/empty-document.ico"
-ICON 21 "icons/ooo-writer-app.ico"
-ICON 22 "icons/ooo-calc-app.ico"
-ICON 23 "icons/ooo-draw-app.ico"
-ICON 24 "icons/ooo-impress-app.ico"
-ICON 25 "icons/ooo-math-app.ico"
-ICON 26 "icons/ooo-base-app.ico"
-ICON 27 "icons/oasis-empty-document.ico"
-ICON 28 "icons/text.ico"
-ICON 29 "icons/text-template.ico"
-ICON 30 "icons/spreadsheet.ico"
-ICON 31 "icons/spreadsheet-template.ico"
-ICON 32 "icons/drawing.ico"
-ICON 33 "icons/drawing-template.ico"
-ICON 34 "icons/presentation.ico"
-ICON 35 "icons/presentation-template.ico"
-ICON 36 "icons/master-document.ico"
-ICON 37 "icons/empty-document.ico"
-ICON 38 "icons/database.ico"
-ICON 39 "icons/formula.ico"
-ICON 40 "icons/oxt-extension.ico"
-
diff --git a/desktop/util/soffice.ico b/desktop/util/soffice.ico
deleted file mode 100644
index 88ccf5e5a6a0..000000000000
--- a/desktop/util/soffice.ico
+++ /dev/null
diff --git a/desktop/util/verinfo.rc b/desktop/util/verinfo.rc
deleted file mode 100644
index 4c01f6b6b237..000000000000
--- a/desktop/util/verinfo.rc
+++ /dev/null
@@ -1,116 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- *************************************************************************/
-
-#define VER_FIRSTYEAR	2007
-
-#include <windows.h>
-#include "version_so.hrc"
-
-// -----------------------------------------------------------------------
-// 				version information
-// -----------------------------------------------------------------------
-
-VS_VERSION_INFO versioninfo
-#ifndef SUBVERSION
-	FILEVERSION    VERSION, 0, VERVARIANT, VER_COUNT
-	PRODUCTVERSION VERSION, 0, VERVARIANT, VER_COUNT
-#else
-	FILEVERSION    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-	PRODUCTVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-#endif
-	FILEFLAGSMASK 0x3F
-	FILEFLAGS
-#if defined(DEBUG)
-	VS_FF_DEBUG |
-#endif
-#ifdef VER_PREL
-	VS_FF_PRERELEASE |
-#endif
-	0
-	FILEOS VOS_NT_WINDOWS32
-	FILETYPE VFT_APP
-	{
-		BLOCK "StringFileInfo"
-		{
-			BLOCK "040904E4"
-			{
-				// International StringTable
-                VALUE "CompanyName", 		"The Document Foundation\0"
-				VALUE "FileDescription",	"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-				VALUE "FileVersion",		PPS(VER_LEVEL) "\0"
-				VALUE "ProductVersion",		PPS(VER_LEVEL) "\0"
-				VALUE "OriginalFilename",	"SOFFICE.EXE\0"
-				VALUE "InternalName", 		"SOFFICE\0"
-				VALUE "LegalCopyright", 	S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
-			}
-		}
-
-		BLOCK "VarFileInfo"
-		{
-			VALUE "Translation", 0x0409, 1252
-		}
-	}
-
-2 ICON "icons/oasis-text.ico"
-3 ICON "icons/oasis-text-template.ico"
-4 ICON "icons/oasis-spreadsheet.ico"
-5 ICON "icons/oasis-spreadsheet-template.ico"
-6 ICON "icons/oasis-drawing.ico"
-7 ICON "icons/oasis-drawing-template.ico"
-8 ICON "icons/oasis-presentation.ico"
-9 ICON "icons/oasis-presentation-template.ico"
-10 ICON "icons/oasis-presentation-template.ico"
-11 ICON "icons/oasis-master-document.ico"
-12 ICON "icons/oasis-web-template.ico"
-13 ICON "icons/oasis-empty-document.ico"
-14 ICON "icons/oasis-database.ico"
-15 ICON "icons/oasis-formula.ico"
-16 ICON "icons/oasis-web-template.ico"
-17 ICON "icons/empty-document.ico"
-18 ICON "icons/empty-document.ico"
-19 ICON "icons/so9_main_app.ico"
-20 ICON "icons/empty-document.ico"
-21 ICON "icons/so9_writer_app.ico"
-22 ICON "icons/so9_calc_app.ico"
-23 ICON "icons/so9_draw_app.ico"
-24 ICON "icons/so9_impress_app.ico"
-25 ICON "icons/so9_math_app.ico"
-26 ICON "icons/so9_base_app.ico"
-27 ICON "icons/oasis-empty-document.ico"
-28 ICON "icons/text.ico"
-29 ICON "icons/text-template.ico"
-30 ICON "icons/spreadsheet.ico"
-31 ICON "icons/spreadsheet-template.ico"
-32 ICON "icons/drawing.ico"
-33 ICON "icons/drawing-template.ico"
-34 ICON "icons/presentation.ico"
-35 ICON "icons/presentation-template.ico"
-36 ICON "icons/master-document.ico"
-37 ICON "icons/empty-document.ico"
-38 ICON "icons/database.ico"
-39 ICON "icons/formula.ico"
-40 ICON "icons/oxt-extension.ico"