#110104# Own crash_report shel startup script

4 files changed, 78 insertions, 8 deletions

diff --git a/crashrep/prj/build.lst b/crashrep/prj/build.lst
index c8aab41617c0..12e6428f0952 100755
--- a/crashrep/prj/build.lst
+++ b/crashrep/prj/build.lst
@@ -1,5 +1,6 @@
 cr	crashrep	:	sal sysui gtk tools NULL
 cr	crashrep				usr1	-	all	cr_mkout NULL
+cr	crashrep\scripts			nmake	-	all	cr_suscript NULL
 cr	crashrep\source\unx\res		nmake	-	u	cr_sures NULL
 cr	crashrep\source\unx		nmake	-	u	cr_sunx cr_sures.u NULL
 cr	crashrep\source\win32		nmake	-	n	cr_swin32 NULL
diff --git a/crashrep/prj/d.lst b/crashrep/prj/d.lst
index a12a7418da11..8eb1d34d9b50 100755
--- a/crashrep/prj/d.lst
+++ b/crashrep/prj/d.lst
@@ -21,7 +21,7 @@ mkdir: %_DEST%\bin%_EXT%\96
 ..\%__SRC%\bin\soreport.exe.manifest %_DEST%\bin%_EXT%\crashrep.exe.manifest
 %_DEST%\bin%_EXT%\guistdio.com %_DEST%\bin%_EXT%\crashrep.com
 ..\%__SRC%\bin\crash_report.bin %_DEST%\bin%_EXT%\crash_report.bin
-..\scripts\crash_report.sh %_DEST%\bin%_EXT%\crash_report
+..\%__SRC%\misc\crash_report.sh %_DEST%\bin%_EXT%\crash_report
 ..\%__SRC%\bin\crash_dump.res.01 %_DEST%\bin%_EXT%\01\crash_dump.res
 ..\%__SRC%\bin\crash_dump.res.03 %_DEST%\bin%_EXT%\03\crash_dump.res
 ..\%__SRC%\bin\crash_dump.res.07 %_DEST%\bin%_EXT%\07\crash_dump.res
diff --git a/crashrep/scripts/makefile.mk b/crashrep/scripts/makefile.mk
new file mode 100755
index 000000000000..0bc9c32e8761
--- /dev/null
+++ b/crashrep/scripts/makefile.mk
@@ -0,0 +1,74 @@
+#*************************************************************************
+#
+#   $RCSfile: makefile.mk,v $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library 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 for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (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.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
+
+PRJ=..
+
+PRJNAME=crashrep
+TARGET=scripts
+
+# --- Settings -----------------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+# --- Targets -------------------------------------------------------------
+
+UNIXTEXT= \
+    $(MISC)$/crash_report.sh
+
+.INCLUDE :  target.mk
+
diff --git a/crashrep/source/win32/makefile.mk b/crashrep/source/win32/makefile.mk
index c18aef4c450d..905a2b4141af 100755
--- a/crashrep/source/win32/makefile.mk
+++ b/crashrep/source/win32/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: hro $ $Date: 2003-06-06 11:22:04 $
+#   last change: $Author: hro $ $Date: 2003-06-11 19:24:53 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -80,7 +80,6 @@ RCFILES=$(TARGET).rc
 
 OBJFILES=\
     $(OBJ)$/soreport.obj\
-    $(OBJ)$/mapi.obj\
     $(OBJ)$/base64.obj
     
 LNGFILES=..$/all$/crashrep.lng
@@ -101,8 +100,6 @@ STDLIB1=\
 
 APP1NOSVRES=$(RES)$/$(TARGET).res
 
-ALLTAR: $(BIN)$/$(TARGET).exe.manifest
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
@@ -113,5 +110,3 @@ ALLTAR: $(BIN)$/$(TARGET).exe.manifest
 $(RCFILES) : $(LNGFILES) makefile.mk rcfooter.txt rcheader.txt rctemplate.txt ctrylnglist.txt
     +lngconvex.exe -lng ..\all\crashrep.lng -rc $(TARGET).rc -c  ctrylnglist.txt  -rct rctemplate.txt -rch rcheader.txt -rcf rcfooter.txt
     
-$(BIN)$/$(TARGET).exe.manifest: soreport.manifest
-    +$(COPY) $< $@