diff options
| author | sb <sb@openoffice.org> | 2010-04-12 14:22:30 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-04-12 14:22:30 +0200 |
| commit | 7c943be551f25578844d93067268461a2c74e420 (patch) | |
| tree | 052d10c3146f3c427d55c2d23396730b107c8f48 | |
| parent | 1b192bd38a3695cc2965ece438d47d6f74958289 (diff) | |
| parent | a40ff089584ca2e4e9f1d1eccb5b7dc7f1952435 (diff) | |
sb121: merged in DEV300_m76
| -rwxr-xr-x | crashrep/prj/d.lst | 3 | ||||
| -rwxr-xr-x | crashrep/source/unx/crash_report.sh | 48 | ||||
| -rwxr-xr-x | crashrep/source/unx/makefile.mk | 4 |
3 files changed, 2 insertions, 53 deletions
diff --git a/crashrep/prj/d.lst b/crashrep/prj/d.lst index c7f78c8ca0c7..a53aacc4659c 100755 --- a/crashrep/prj/d.lst +++ b/crashrep/prj/d.lst @@ -1,4 +1,3 @@ ..\%__SRC%\bin\soreport.exe %_DEST%\bin%_EXT%\crashrep.exe ..\%__SRC%\bin\soreport.exe.manifest %_DEST%\bin%_EXT%\crashrep.exe.manifest -..\%__SRC%\bin\crash_report.bin %_DEST%\bin%_EXT%\crash_report.bin -..\%__SRC%\misc\crash_report.sh %_DEST%\bin%_EXT%\crash_report +..\%__SRC%\bin\crashrep %_DEST%\bin%_EXT%\crashrep diff --git a/crashrep/source/unx/crash_report.sh b/crashrep/source/unx/crash_report.sh deleted file mode 100755 index 62c4bde5d578..000000000000 --- a/crashrep/source/unx/crash_report.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -#************************************************************************* -# -# 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. -# -#************************************************************************* - -#set -x - -# resolve installation directory -sd_cwd="`pwd`" -if [ -h "$0" ] ; then - sd_basename=`basename "$0"` - sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"` - cd "`dirname "$0"`" - cd "`dirname "$sd_script"`" -else - cd "`dirname "$0"`" -fi - -sd_prog="`pwd`" -cd .. -sd_binary=`basename "$0"`".bin" -cd "$sd_cwd" -"$sd_prog/$sd_binary" "$@" - - diff --git a/crashrep/source/unx/makefile.mk b/crashrep/source/unx/makefile.mk index fb0465d329fc..8383f682443c 100755 --- a/crashrep/source/unx/makefile.mk +++ b/crashrep/source/unx/makefile.mk @@ -28,7 +28,7 @@ PRJ=..$/.. PRJNAME=crashrep -TARGET=crash_report.bin +TARGET=crashrep TARGETTYPE=CUI ENABLE_EXCEPTIONS=TRUE @@ -63,8 +63,6 @@ APP1STDLIBS+=-ldl -lnsl APP1STDLIBS+=-lsocket .ENDIF -UNIXTEXT = $(MISC)/crash_report.sh - .ENDIF # "$(ENABLE_CRASHDUMP)" != "" || "$(PRODUCT)" == "" # --- Targets ------------------------------------------------------ |