convert crashrep to gbuild and add to tail_build
Change-Id: I90cf6c2c5fb806855b7e4fec18c890f7bd2ff6b5
This commit is contained in:
Peter Foley
parent
62bf434229
commit
dbaa34c5db
@ -57,6 +57,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
|
||||
cppuhelper \
|
||||
$(call gb_Helper_optional,CPPUNIT,cppunit) \
|
||||
cpputools \
|
||||
$(call gb_Helper_optional,CRASHREP,crashrep) \
|
||||
$(call gb_Helper_optional,CT2N,ct2n) \
|
||||
cui \
|
||||
$(call gb_Helper_optional,CURL,curl) \
|
||||
|
||||
@ -36,6 +36,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
|
||||
cfgex \
|
||||
cpp \
|
||||
cppunit/cppunittester \
|
||||
$(call gb_Helper_optional,CRASHREP,crashrep) \
|
||||
g2g \
|
||||
gencoll_rule \
|
||||
genconv_dict \
|
||||
|
||||
@ -62,6 +62,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
|
||||
cppuhelper \
|
||||
$(call gb_Helper_optional,CPPUNIT,cppunit) \
|
||||
cpputools \
|
||||
$(call gb_Helper_optional,CRASHREP,crashrep) \
|
||||
$(call gb_Helper_optional,CT2N,ct2n) \
|
||||
cui \
|
||||
$(call gb_Helper_optional,CURL,curl) \
|
||||
|
||||
35
crashrep/CustomTarget_crashrep_res.mk
Normal file
35
crashrep/CustomTarget_crashrep_res.mk
Normal file
@ -0,0 +1,35 @@
|
||||
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
||||
#
|
||||
# This file is part of the LibreOffice project.
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
|
||||
$(eval $(call gb_CustomTarget_CustomTarget,crashrep/source/win32))
|
||||
|
||||
$(eval $(call gb_CustomTarget_register_targets,crashrep/source/win32, \
|
||||
crashrep_impl.rc \
|
||||
))
|
||||
|
||||
$(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep_impl.rc : \
|
||||
$(SRCDIR)/crashrep/source/win32/rcfooter.txt \
|
||||
$(SRCDIR)/crashrep/source/win32/rcheader.txt \
|
||||
$(SRCDIR)/crashrep/source/win32/rctemplate.txt \
|
||||
$(SRCDIR)/crashrep/source/win32/crashrep.ulf \
|
||||
$(call gb_Executable_get_runtime_dependencies,lngconvex)
|
||||
|
||||
#BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR)/unittest/install)
|
||||
$(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep_impl.rc :
|
||||
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LCX,1)
|
||||
$(call gb_Helper_abbreviate_dirs,\
|
||||
cd $(SRCDIR)/crashrep/source/win32 && \
|
||||
$(call gb_Executable_get_command,lngconvex) \
|
||||
-ulf crashrep.ulf \
|
||||
-rc $@ \
|
||||
-rct rctemplate.txt \
|
||||
-rch rcheader.txt \
|
||||
-rcf rcfooter.txt)
|
||||
|
||||
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
|
||||
65
crashrep/Executable_crashrep.mk
Normal file
65
crashrep/Executable_crashrep.mk
Normal file
@ -0,0 +1,65 @@
|
||||
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
||||
#
|
||||
# This file is part of the LibreOffice project.
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
|
||||
$(eval $(call gb_Executable_Executable,crashrep))
|
||||
|
||||
$(eval $(call gb_Executable_add_defs,crashrep,\
|
||||
-D_INPATH=\"$(INPATH)\" \
|
||||
))
|
||||
|
||||
ifeq ($(OS),WNT)
|
||||
|
||||
$(eval $(call gb_Executable_add_exception_objects,crashrep,\
|
||||
crashrep/source/win32/soreport \
|
||||
crashrep/source/win32/base64 \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_use_libraries,crashrep,\
|
||||
sal \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_use_system_win32_libs,crashrep,\
|
||||
gdi32 \
|
||||
comctl32 \
|
||||
comdlg32 \
|
||||
advapi32 \
|
||||
ws2_32 \
|
||||
shell32 \
|
||||
dbghelp \
|
||||
psapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_set_targettype_gui,crashrep,YES))
|
||||
|
||||
$(eval $(call gb_Executable_add_nativeres,crashrep,crashrep))
|
||||
|
||||
else
|
||||
|
||||
$(eval $(call gb_Executable_add_exception_objects,crashrep,\
|
||||
crashrep/source/unx/main \
|
||||
))
|
||||
|
||||
ifeq ($(filter FREEBSD NETBSD DRAGONFLY MACOSX,$(OS)),)
|
||||
$(eval $(call gb_Executable_add_libs,crashrep,\
|
||||
-ldl \
|
||||
-lnsl \
|
||||
))
|
||||
endif
|
||||
|
||||
ifeq ($(OS),SOLARIS)
|
||||
$(eval $(call gb_Executable_add_libs,crashrep,\
|
||||
-lsocket \
|
||||
))
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
14
crashrep/Makefile
Normal file
14
crashrep/Makefile
Normal file
@ -0,0 +1,14 @@
|
||||
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
||||
#
|
||||
# This file is part of the LibreOffice project.
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
|
||||
module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
|
||||
|
||||
include $(module_directory)/../solenv/gbuild/partial_build.mk
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
27
crashrep/Module_crashrep.mk
Normal file
27
crashrep/Module_crashrep.mk
Normal file
@ -0,0 +1,27 @@
|
||||
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
||||
#
|
||||
# This file is part of the LibreOffice project.
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
|
||||
$(eval $(call gb_Module_Module,crashrep))
|
||||
|
||||
ifeq ($(ENABLE_CRASHDUMP),TRUE)
|
||||
|
||||
ifeq ($(OS),WNT)
|
||||
$(eval $(call gb_Module_add_targets,crashrep,\
|
||||
CustomTarget_crashrep_res \
|
||||
Executable_crashrep \
|
||||
WinResTarget_crashrep \
|
||||
))
|
||||
else ifneq ($(PRODUCT),)
|
||||
$(eval $(call gb_Module_add_targets,crashrep,\
|
||||
Executable_crashrep \
|
||||
))
|
||||
endif
|
||||
endif
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
22
crashrep/WinResTarget_crashrep.mk
Normal file
22
crashrep/WinResTarget_crashrep.mk
Normal file
@ -0,0 +1,22 @@
|
||||
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
||||
#
|
||||
# This file is part of the LibreOffice project.
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
|
||||
$(eval $(call gb_WinResTarget_WinResTarget,crashrep))
|
||||
|
||||
$(eval $(call gb_WinResTarget_use_custom_headers,crashrep,\
|
||||
crashrep/source/win32 \
|
||||
))
|
||||
|
||||
$(eval $(call gb_WinResTarget_add_defs,crashrep,\
|
||||
-DVERVARIANT=$(BUILD) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_WinResTarget_set_rcfile,crashrep,crashrep/source/win32/crashrep))
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
@ -1,5 +1,2 @@
|
||||
cr crashrep : sal sysui shell NULL
|
||||
cr crashrep usr1 - all cr_mkout NULL
|
||||
cr crashrep\source\all nmake - all cr_sresource NULL
|
||||
cr crashrep\source\unx nmake - u cr_sunx NULL
|
||||
cr crashrep\source\win32 nmake - n cr_swin32 cr_sresource NULL
|
||||
cr crashrep\prj nmake - all cr_crashrep NULL
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
..\%__SRC%\bin\soreport.exe %_DEST%\bin\crashrep.exe
|
||||
..\%__SRC%\bin\soreport.exe.manifest %_DEST%\bin\crashrep.exe.manifest
|
||||
..\%__SRC%\bin\crashrep %_DEST%\bin\crashrep
|
||||
@ -1,40 +0,0 @@
|
||||
#
|
||||
# This file is part of the LibreOffice project.
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
# This file incorporates work covered by the following license notice:
|
||||
#
|
||||
# Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
# contributor license agreements. See the NOTICE file distributed
|
||||
# with this work for additional information regarding copyright
|
||||
# ownership. The ASF licenses this file to you under the Apache
|
||||
# License, Version 2.0 (the "License"); you may not use this file
|
||||
# except in compliance with the License. You may obtain a copy of
|
||||
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
#
|
||||
|
||||
PRJ=..$/..
|
||||
|
||||
PRJNAME=crashrep
|
||||
TARGET=crash_res
|
||||
|
||||
# --- Settings -----------------------------------------------------
|
||||
|
||||
.INCLUDE : settings.mk
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
|
||||
ULFFILES = \
|
||||
crashrep.ulf
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
||||
|
||||
.INCLUDE : target.mk
|
||||
|
||||
.IF "$(WITH_LANG)"!=""
|
||||
ALLTAR : $(foreach,i,$(ULFFILES) $(COMMONMISC)$/$(TARGET)$/$i)
|
||||
.ENDIF # "$(WITH_LANG)"!=""
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
#include <cstdio>
|
||||
#include <stdlib.h>
|
||||
#include <sys/utsname.h>
|
||||
#include <_version.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
|
||||
@ -1,66 +0,0 @@
|
||||
#
|
||||
# This file is part of the LibreOffice project.
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
# This file incorporates work covered by the following license notice:
|
||||
#
|
||||
# Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
# contributor license agreements. See the NOTICE file distributed
|
||||
# with this work for additional information regarding copyright
|
||||
# ownership. The ASF licenses this file to you under the Apache
|
||||
# License, Version 2.0 (the "License"); you may not use this file
|
||||
# except in compliance with the License. You may obtain a copy of
|
||||
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
#
|
||||
|
||||
PRJ=..$/..
|
||||
|
||||
PRJNAME=crashrep
|
||||
TARGET=crashrep
|
||||
TARGETTYPE=CUI
|
||||
|
||||
ENABLE_EXCEPTIONS=TRUE
|
||||
LIBTARGET=NO
|
||||
LIBSALCPPRT=$(0)
|
||||
|
||||
# --- Settings -----------------------------------------------------
|
||||
|
||||
.INCLUDE : settings.mk
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
|
||||
# Only build crash reporter if either a product build with debug info
|
||||
# or a non-pro build is done.
|
||||
|
||||
.IF "$(ENABLE_CRASHDUMP)" != "" || "$(PRODUCT)" == ""
|
||||
|
||||
SOLARLIB!:=$(SOLARLIB:s/jre/jnore/)
|
||||
|
||||
OBJFILES=\
|
||||
$(OBJ)$/main.obj
|
||||
|
||||
APP1NOSAL=TRUE
|
||||
APP1TARGET=$(TARGET)
|
||||
APP1OBJS=$(OBJFILES)
|
||||
APP1RPATH=OOO
|
||||
|
||||
.IF "$(OS)" != "FREEBSD" && "$(OS)" != "MACOSX" && "$(OS)"!="NETBSD" && \
|
||||
"$(OS)" != "DRAGONFLY"
|
||||
APP1STDLIBS+=-ldl -lnsl
|
||||
.ENDIF
|
||||
.IF "$(OS)" == "SOLARIS"
|
||||
APP1STDLIBS+=-lsocket
|
||||
.ENDIF
|
||||
|
||||
.ENDIF # "$(ENABLE_CRASHDUMP)" != "" || "$(PRODUCT)" == ""
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
||||
|
||||
.INCLUDE : target.mk
|
||||
|
||||
$(OBJ)$/main.obj: $(INCCOM)$/_version.h
|
||||
|
||||
# Building crash_report
|
||||
12
crashrep/source/win32/crashrep.rc
Executable file
12
crashrep/source/win32/crashrep.rc
Executable file
@ -0,0 +1,12 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/*
|
||||
* This file is part of the LibreOffice project.
|
||||
*
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
#include "crashrep_impl.rc"
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
@ -1,20 +1,3 @@
|
||||
/*
|
||||
* This file is part of the LibreOffice project.
|
||||
*
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*
|
||||
* This file incorporates work covered by the following license notice:
|
||||
*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed
|
||||
* with this work for additional information regarding copyright
|
||||
* ownership. The ASF licenses this file to you under the Apache
|
||||
* License, Version 2.0 (the "License"); you may not use this file
|
||||
* except in compliance with the License. You may obtain a copy of
|
||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
*/
|
||||
|
||||
[%WELCOME_CAPTION%]
|
||||
en-US = "%PRODUCTNAME% %PRODUCTVERSION% Error Report"
|
||||
@ -1,79 +0,0 @@
|
||||
#
|
||||
# This file is part of the LibreOffice project.
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
# This file incorporates work covered by the following license notice:
|
||||
#
|
||||
# Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
# contributor license agreements. See the NOTICE file distributed
|
||||
# with this work for additional information regarding copyright
|
||||
# ownership. The ASF licenses this file to you under the Apache
|
||||
# License, Version 2.0 (the "License"); you may not use this file
|
||||
# except in compliance with the License. You may obtain a copy of
|
||||
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
#
|
||||
|
||||
PRJ=..$/..
|
||||
|
||||
PRJNAME=crashrep
|
||||
TARGET=soreport
|
||||
LIBTARGET=NO
|
||||
ENABLE_EXCEPTIONS=TRUE
|
||||
TARGETTYPE=GUI
|
||||
|
||||
# --- Settings -----------------------------------------------------
|
||||
|
||||
.INCLUDE : settings.mk
|
||||
|
||||
# --- Resources ----------------------------------------------------
|
||||
|
||||
RCFILES=$(RES)$/$(TARGET).rc
|
||||
|
||||
# --- Files --------------------------------------------------------
|
||||
|
||||
OBJFILES=\
|
||||
$(OBJ)$/soreport.obj\
|
||||
$(OBJ)$/base64.obj
|
||||
|
||||
.IF "$(WITH_LANG)"!=""
|
||||
ULFDIR:=$(COMMONMISC)$/crash_res
|
||||
.ELSE # "$(WITH_LANG)"!=""
|
||||
ULFDIR:=..$/all
|
||||
.ENDIF # "$(WITH_LANG)"!=""
|
||||
LNGFILES=$(ULFDIR)$/crashrep.ulf
|
||||
|
||||
APP1OBJS=$(OBJFILES)
|
||||
|
||||
APP1NOSAL=TRUE
|
||||
|
||||
APP1TARGET=$(TARGET)
|
||||
APP1RPATH=OOO
|
||||
|
||||
STDLIB1=\
|
||||
$(SALLIB)\
|
||||
$(GDI32LIB)\
|
||||
$(COMCTL32LIB)\
|
||||
$(COMDLG32LIB)\
|
||||
$(ADVAPI32LIB)\
|
||||
$(WS2_32LIB)\
|
||||
$(SHELL32LIB)\
|
||||
$(DBGHELPLIB)\
|
||||
psapi.lib
|
||||
|
||||
APP1NOSVRES=$(RES)$/$(TARGET).res
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
||||
|
||||
.INCLUDE : target.mk
|
||||
|
||||
$(OBJ)$/soreport.obj: $(INCCOM)$/_version.h
|
||||
|
||||
# Generate the native Windows resource file
|
||||
# using lngconvex.exe
|
||||
|
||||
$(RCFILES) : $(LNGFILES) makefile.mk rcfooter.txt rcheader.txt rctemplate.txt ctrylnglist.txt
|
||||
$(LNGCONVEX) -ulf $(ULFDIR)$/crashrep.ulf -rc $(RES)$/$(TARGET).rc -rct rctemplate.txt -rch rcheader.txt -rcf rcfooter.txt
|
||||
|
||||
@ -66,8 +66,6 @@
|
||||
#include <malloc.h>
|
||||
#include <process.h>
|
||||
|
||||
#include <_version.h>
|
||||
|
||||
#include "resource.h"
|
||||
#include "base64.h"
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
po postprocess :: CRASHREP:crashrep HELP:helpcontent2 ODK:odk MYSQLC:mysqlc DESKTOP:setup_native sysui tail_build NULL
|
||||
po postprocess :: HELP:helpcontent2 ODK:odk MYSQLC:mysqlc DESKTOP:setup_native sysui tail_build NULL
|
||||
po postprocess\prj nmake - all po_prj NULL
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user