From c2861f6088027581d98ba3720fe58c9c17d30fd0 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Apr 2010 23:00:12 +0200 Subject: CWS gnumake2: move delivered header files in from svtools/inc to svtools/inc/svtools; remove ununsed files; remove svp.res --- svtools/source/java/makefile.mk | 4 -- svtools/source/java/patchjavaerror.src | 96 ---------------------------------- 2 files changed, 100 deletions(-) delete mode 100644 svtools/source/java/patchjavaerror.src (limited to 'svtools/source/java') diff --git a/svtools/source/java/makefile.mk b/svtools/source/java/makefile.mk index 9d9679644685..e8e85db2185d 100644 --- a/svtools/source/java/makefile.mk +++ b/svtools/source/java/makefile.mk @@ -45,10 +45,6 @@ ENABLE_EXCEPTIONS=TRUE SRS1NAME= javaerror SRC1FILES= javaerror.src -SRS2NAME= patchjavaerror -SRC2FILES= patchjavaerror.src - - SLOFILES= \ $(SLO)$/javainteractionhandler.obj \ $(SLO)$/javacontext.obj diff --git a/svtools/source/java/patchjavaerror.src b/svtools/source/java/patchjavaerror.src deleted file mode 100644 index 2d2ad06a9592..000000000000 --- a/svtools/source/java/patchjavaerror.src +++ /dev/null @@ -1,96 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: patchjavaerror.src,v $ - * $Revision: 1.7 $ - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include - -WarningBox WARNINGBOX_JAVANOTFOUND -{ - Buttons = WB_OK ; - DefButton = WB_DEF_OK ; - Message[ en-US ] ="%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME."; -}; - -WarningBox WARNINGBOX_INVALIDJAVASETTINGS -{ - Buttons = WB_OK ; - DefButton = WB_DEF_OK ; - Message[ en-US ] ="The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Java, select the Java runtime environment you want to have used by %PRODUCTNAME."; -}; - -QueryBox QBX_JAVADISABLED -{ - Buttons = WB_YES_NO_CANCEL ; - DefButton = WB_DEF_YES ; - Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. However, use of a JRE has been disabled. Do you want to enable the use of a JRE now?"; -}; - -ErrorBox ERRORBOX_JVMCREATIONFAILED -{ - Buttons = WB_OK; - DefButton = WB_DEF_OK ; - Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Java."; -}; - -ErrorBox ERRORBOX_RESTARTREQUIRED -{ - Buttons = WB_OK; - DefButton = WB_DEF_OK ; - Message[ en-US ] = "For the selected Java runtime environment to work properly, %PRODUCTNAME must be restarted. Please restart %PRODUCTNAME now."; -}; - - - -String STR_WARNING_JAVANOTFOUND -{ - Text[ en-US ] = "JRE Required" ; -}; - -String STR_WARNING_INVALIDJAVASETTINGS -{ - Text[ en-US ] = "Select JRE"; -}; - -String STR_ERROR_RESTARTREQUIRED -{ - Text[ en-US ] = "Restart Required"; -}; - -String STR_QUESTION_JAVADISABLED -{ - Text[ en-US ] = "Enable JRE" ; -}; - - -String STR_ERROR_JVMCREATIONFAILED -{ - Text[ en-US ] = "JRE is Defective" ; -}; - - -- cgit From c8e2c920be9958a3f211a983d2c88bac6ea351c3 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 19 Nov 2010 21:45:41 +0100 Subject: gnumake2: removing old dmake file in migrated modules --- svtools/source/java/makefile.mk | 50 ----------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 svtools/source/java/makefile.mk (limited to 'svtools/source/java') diff --git a/svtools/source/java/makefile.mk b/svtools/source/java/makefile.mk deleted file mode 100644 index 0c6ccedcc311..000000000000 --- a/svtools/source/java/makefile.mk +++ /dev/null @@ -1,50 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svtools -TARGET=java -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/svt.pmk - -# --- Files -------------------------------------------------------- - -SRS1NAME= javaerror -SRC1FILES= javaerror.src - -SLOFILES= \ - $(SLO)$/javainteractionhandler.obj \ - $(SLO)$/javacontext.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk -- cgit