remove support of the 'with JRE' installer

5 files changed, 9 insertions, 205 deletions

diff --git a/scp2/source/ooo/file_jre_ooo.scp b/scp2/source/ooo/file_jre_ooo.scp
deleted file mode 100644
index 8800db4c6065..000000000000
--- a/scp2/source/ooo/file_jre_ooo.scp
+++ /dev/null
@@ -1,49 +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 "macros.inc"
-
-#ifdef WNT
-Directory gid_Dir_Jre
-    ParentID = PREDEFINED_PROGDIR;
-    HostName = "JRE";
-End
-#endif
-
-File gid_File_Exe_Java
-    BIN_FILE_BODY;
-  #ifdef WNT
-	InstallName = "jre-windows-i586.exe";
-	Styles = (DONT_PACK,JAVAFILE,SUBST_FILENAME);
-  #else
-	Styles = (DONT_PACK,JAVAFILE);
-  #endif
-	Dir = gid_Dir_Jre;
-	Name = "${WINDOWSJAVAFILENAME}";
-	Javaversion = "${WINDOWSJAVAREGISTRYENTRY}";
-	Subdir = "java";
-End
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index be79403524c8..96bcb5f15d5e 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -328,7 +328,6 @@ PARFILES=                          \
         module_lang_template.par   \
         module_helppack.par        \
         module_help_template.par   \
-        module_java.par            \
         module_systemint.par       \
         profile_ooo.par            \
         profileitem_ooo.par        \
@@ -341,7 +340,6 @@ PARFILES=                          \
 
 .IF "$(GUI)"=="WNT"
 PARFILES +=                        \
-        file_jre_ooo.par           \
         folder_ooo.par             \
         folderitem_ooo.par         \
         registryitem_ooo.par       \
@@ -356,7 +354,6 @@ ULFFILES=                          \
         module_ooo.ulf             \
         module_langpack.ulf        \
         module_helppack.ulf        \
-        module_java.ulf            \
         registryitem_ooo.ulf       \
         module_systemint.ulf
 
diff --git a/scp2/source/ooo/module_java.scp b/scp2/source/ooo/module_java.scp
deleted file mode 100644
index e93721ce3c5b..000000000000
--- a/scp2/source/ooo/module_java.scp
+++ /dev/null
@@ -1,100 +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 "macros.inc"
-
-// Java modules
-
-Module gid_Module_Optional_Java
-    ParentID = gid_Module_Optional;
-    Sortkey = "100";
-    MOD_NAME_DESC ( MODULE_OPTIONAL_JAVA );
-  #ifdef WNT
-    Styles = (JAVAMODULE);
-  #elif defined (SOLARIS)
-    Styles = (JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE);
-  #else
-    Styles = (JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE,DONTSHOWINUSERINSTALL);
-  #endif
-  #ifdef LINUX
-    #ifdef X86_64
-    PackageName = "${LINUXX64JAVAFILENAME}";
-    #else
-    PackageName = "${LINUXJAVAFILENAME}";
-    #endif
-  #else
-    PackageName = "";
-  #endif
-End
-
-#ifdef SOLARIS
-Module gid_Module_Optional_Java_Runtime
-    ParentID = gid_Module_Optional_Java;
-	Name = "gid_Module_Optional_Java_Runtime";
-	Description = "gid_Module_Optional_Java_Runtime";
-    Styles = (HIDDEN_ROOT,JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE);
-  #if defined (SOLARIS) && defined (SPARC)
-    PackageName = "${SOLSJAVARTPACKED}";
-  #elif defined (SOLARIS) && defined (INTEL)
-    PackageName = "${SOLIJAVARTPACKED}";
-  #else
-    PackageName = "";
-  #endif
-End
-#endif
-
-#ifdef SOLARIS
-Module gid_Module_Optional_Java_Config
-    ParentID = gid_Module_Optional_Java;
-	Name = "gid_Module_Optional_Java_Config";
-	Description = "gid_Module_Optional_Java_Config";
-    Styles = (HIDDEN_ROOT,JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE);
-  #if defined (SOLARIS) && defined (SPARC)
-    PackageName = "${SOLSJAVACFGPACKED}";
-  #elif defined (SOLARIS) && defined (INTEL)
-    PackageName = "${SOLIJAVACFGPACKED}";
-  #else
-    PackageName = "";
-  #endif
-End
-#endif
-
-#ifdef SOLARIS
-Module gid_Module_Optional_Java_Manual
-    ParentID = gid_Module_Optional_Java;
-	Name = "gid_Module_Optional_Java_Manual";
-	Description = "gid_Module_Optional_Java_Manual";
-    Styles = (HIDDEN_ROOT,JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE);
-  #if defined (SOLARIS) && defined (SPARC)
-    PackageName = "${SOLSJAVAMANPACKED}";
-  #elif defined (SOLARIS) && defined (INTEL)
-    PackageName = "${SOLIJAVAMANPACKED}";
-  #else
-    PackageName = "";
-  #endif
-End
-#endif
diff --git a/scp2/source/ooo/module_java.ulf b/scp2/source/ooo/module_java.ulf
deleted file mode 100644
index c3ccedc59f14..000000000000
--- a/scp2/source/ooo/module_java.ulf
+++ /dev/null
@@ -1,32 +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.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_OPTIONAL_JAVA]
-en-US = "Java Runtime Environment (%JAVAVERSION)"
-
-[STR_DESC_MODULE_OPTIONAL_JAVA]
-en-US = "Component for setting up the Java Environment"
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 86831d588bf6..9af2c3a66a4c 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -222,40 +222,28 @@ SCP1FILES += \
 .ENDIF
 
 # ------------------------------------------------------------------------
-# OpenOffice.org with JRE
-
-SCP2LINK_PRODUCT_TYPE=osl
-SCP2TARGET = setup_osljre
-SCP2FILES  = $(SCP1FILES) \
-             module_java.par
-
-.IF "$(GUI)"=="WNT"
-SCP2FILES += file_jre_ooo.par
-.ENDIF
-
-# ------------------------------------------------------------------------
 # URE
 
 .IF "$(OS)" != "MACOSX"
-SCP3LINK_PRODUCT_TYPE = osl
-SCP3TARGET = ure
-SCP3FILES = ure_standalone.par  \
+SCP2LINK_PRODUCT_TYPE = osl
+SCP2TARGET = ure
+SCP2FILES = ure_standalone.par  \
             ure.par
 .ENDIF
 
 # ------------------------------------------------------------------------
 # SDK
 
-SCP4LINK_PRODUCT_TYPE = osl
-SCP4TARGET = sdkoo
-SCP4FILES = sdkoo.par
+SCP3LINK_PRODUCT_TYPE = osl
+SCP3TARGET = sdkoo
+SCP3FILES = sdkoo.par
 
 # ------------------------------------------------------------------------
 # Test
 
-SCP5LINK_PRODUCT_TYPE = osl
-SCP5TARGET = test
-SCP5FILES = smoketest.par
+SCP4LINK_PRODUCT_TYPE = osl
+SCP4TARGET = test
+SCP4FILES = smoketest.par
 
 # --- target -------------------------------------------------------------
 .INCLUDE :  target.mk