ure: install files with filelists

This commit adds gb_Package_add_symbolic_link.

Change-Id: I58511ede3da402464e60a4c45549c15c9c5dd1a5

3 files changed, 37 insertions, 89 deletions

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 51a5066cc66b..e3682fd0f9d2 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -174,7 +174,6 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
     scp2/source/ooo/profileitem_ooo \
     scp2/source/ooo/scpaction_ooo \
     scp2/source/ooo/shortcut_ooo \
-    scp2/source/ooo/ure_into_ooo \
     $(if $(filter WNTGCC,$(OS)$(COM)),\
 		scp2/source/ooo/mingw_dlls \
 	) \
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 3430b77198bd..96c7aa97bb28 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -20,6 +20,31 @@
 
 #include "AutoInstall/ure"
 
+#ifndef MACOSX
+Directory gid_Dir_Common_Ure
+  #ifdef WNT
+    ParentID = gid_Dir_Brand_Root;
+  #else
+    ParentID = PREDEFINED_PROGDIR;
+  #endif
+  #ifdef WNT
+    HostName = "URE";
+  #else
+    HostName = "ure";
+  #endif
+    Styles = (UREDIRECTORY);
+End
+#endif
+
+#if defined MACOSX
+#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+Directory gid_Dir_UreLink
+    ParentID = gid_Dir_Bundle_Contents;
+    DosName = "ure-link";
+End
+#endif
+#endif
+
 #if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 
 Directory gid_Dir_Ure_Bin
@@ -67,26 +92,12 @@ End
 
 #endif // !ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 
-// Public Executables:
-
-#if !defined WNT && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-Shortcut gid_Shortcut_Exe_Uno
-    FileID = gid_File_Exe_StartupSh;
-    Dir = gid_Dir_Ure_Bin;
-    Name = EXENAME(uno);
-    Styles = (RELATIVE);
-End
-#endif
-
-// Private Executables:
-
-#if !defined WNT && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-File gid_File_Exe_StartupSh
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Ure_Bin;
-    Name = "/ure/startup.sh";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "C86E816A-4EAE-47E9-BD1F-3E23C80F4EAE";
+#if defined WNT
+File gid_File_UreLink
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Brand_Root;
+    Name = "ure-link";
+    Styles = (PACKED);
 End
 #endif
 
@@ -263,11 +274,11 @@ ProfileItem gid_Profileitem_Dl_Uno_Uno_Services
 #endif
 End
 
-File gid_File_Dl_Profile_Jvmfwk3rc
+File gid_File_ure_install
     TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = PROFILENAME(/ure/jvmfwk3);
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Dir = FILELIST_DIR;
+    Name = ure_install.filelist;
+    Styles = (FILELIST, PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "1124A984-F905-47DC-ACEF-EDEC037F9B38";
 End
 
@@ -629,7 +640,6 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_ThirdpartylicensereadmeHtml_Ure,
             gid_File_Readme_Ure,
             gid_File_License_Ure,
-            gid_File_Exe_StartupSh,
             gid_File_Dl_Cli_Uno,
             gid_File_Dl_Cli_Ure_Assembly,
             gid_File_Dl_Policy_Cli_Ure_Assembly,
@@ -659,7 +669,7 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Dl_Profile_Uno,
             gid_Unixlink_File_Dl_Rmcxt,
             gid_File_Dl_JrepropertiesClass,
-            gid_File_Dl_Profile_Jvmfwk3rc,
+            gid_File_ure_install,
             gid_File_Dl_Jpipe,
             gid_File_Dl_Jpipx,
             gid_File_Dl_Libxml2,
@@ -678,8 +688,7 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Misc_TypesRdb,
             gid_File_Misc_ServicesRdb,
             gid_File_Misc_JavavendorsXml);
-    Unixlinks = (gid_Unixlink_Ure_Bin_Urelibs,
-                 gid_Unixlink_Dl_JavaUno,
+    Unixlinks = (gid_Unixlink_Dl_JavaUno,
                  gid_Unixlink_File_Dl_Sal,
                  gid_Unixlink_File_Dl_Salhelper,
                  gid_Unixlink_File_Dl_Cppu,
diff --git a/scp2/source/ooo/ure_into_ooo.scp b/scp2/source/ooo/ure_into_ooo.scp
deleted file mode 100644
index 70c48d9599d9..000000000000
--- a/scp2/source/ooo/ure_into_ooo.scp
+++ /dev/null
@@ -1,60 +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 .
- */
-
-#include "macros.inc"
-
-#ifndef MACOSX
-Directory gid_Dir_Common_Ure
-  #ifdef WNT
-    ParentID = gid_Dir_Brand_Root;
-  #else
-    ParentID = PREDEFINED_PROGDIR;
-  #endif
-  #ifdef WNT
-    HostName = "URE";
-  #else
-    HostName = "ure";
-  #endif
-    Styles = (UREDIRECTORY);
-End
-#endif
-
-#if defined WNT
-File gid_File_UreLink
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Brand_Root;
-    Name = "ure-link";
-    Styles = (PACKED);
-End
-#elif defined MACOSX
-#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-Directory gid_Dir_UreLink
-    ParentID = gid_Dir_Bundle_Contents;
-    DosName = "ure-link";
-End
-#endif
-#else
-Unixlink gid_Unixlink_UreLink
-    BIN_FILE_BODY;
-    Styles = ();
-    // Styles = (LAYERLINK);
-    Name = "ure-link";
-    Dir = gid_Dir_Brand_Root;
-    Target = "ure";
-End
-#endif