diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-17 17:24:41 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:09:01 +0200 |
commit | b45d2e7d144fb5fba8d38a85e3777287fd602e04 (patch) | |
tree | e47bc7e63ee82f644f69dc076e273ce8795d3500 | |
parent | installer: fix handling of symbolic links in filelists so EPM is happy (diff) | |
download | core-b45d2e7d144fb5fba8d38a85e3777287fd602e04.tar.gz core-b45d2e7d144fb5fba8d38a85e3777287fd602e04.zip |
ure: install files with filelists
This commit adds gb_Package_add_symbolic_link.
Change-Id: I58511ede3da402464e60a4c45549c15c9c5dd1a5
-rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 8 | ||||
-rw-r--r-- | instsetoo_native/Package_setup.mk | 2 | ||||
-rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
-rw-r--r-- | scp2/source/ooo/ure.scp | 65 | ||||
-rw-r--r-- | scp2/source/ooo/ure_into_ooo.scp | 60 | ||||
-rw-r--r-- | solenv/gbuild/Package.mk | 12 | ||||
-rw-r--r-- | ure/Module_ure.mk | 5 | ||||
-rw-r--r-- | ure/Package_distribution.mk | 20 | ||||
-rw-r--r-- | ure/Package_install.mk | 16 | ||||
-rwxr-xr-x[-rw-r--r--] | ure/source/startup.sh | 0 |
10 files changed, 65 insertions, 124 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index a669fd594e15..9db16987612b 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -12,7 +12,6 @@ $(eval $(call gb_CustomTarget_CustomTarget,instsetoo_native/setup)) $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\ ooenv \ $(if $(filter TRUE,$(DISABLE_PYTHON)),,pythonloader.unorc) \ - ure-link \ versionrc \ )) @@ -43,13 +42,6 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/pythonloader.unorc : ) \ ) > $@ -$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ure-link : - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LN ,1) - rm -f $@ && \ - mkdir -p $(dir $@)/ure && \ - cd $(dir $@) && \ - ln -s ure ure-link - $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/versionrc : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ( \ diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk index b2a2c9908773..03590e2a2249 100644 --- a/instsetoo_native/Package_setup.mk +++ b/instsetoo_native/Package_setup.mk @@ -17,6 +17,4 @@ $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(gb_PROGRAMDIRNAME),\ versionrc \ )) -$(eval $(call gb_Package_add_file,instsetoo_native_setup,ure-link,ure-link)) - # vim: set noet sw=4 ts=4: 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 diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index 2a1fd5380926..606bca3501df 100644 --- a/solenv/gbuild/Package.mk +++ b/solenv/gbuild/Package.mk @@ -135,6 +135,18 @@ gb_Package_OUTDIR_$(1) := $(2) endef +define gb_Package_add_symbolic_link +$(call gb_Package__check,$(1)) +$(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_symbolic_link requires 3 arguments)) +$(call gb_Package_get_target,$(1)) : $$(gb_Package_OUTDIR_$(1))/$(2) +$$(gb_Package_OUTDIR_$(1))/$(2) : $$(dir $$(gb_Package_OUTDIR_$(1))/$(2)).dir + rm -f $$@ && ln -s $(3) $$@ + +$(call gb_Package_get_target,$(1)) : FILES += $$(gb_Package_OUTDIR_$(1))/$(2) +$(call gb_Package_get_clean_target,$(1)) : FILES += $$(gb_Package_OUTDIR_$(1))/$(2) + +endef + define gb_Package_add_file $(call gb_Package__check,$(1)) $(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_file requires 3 arguments)) diff --git a/ure/Module_ure.mk b/ure/Module_ure.mk index 2a48f32734eb..88cbc71b31f2 100644 --- a/ure/Module_ure.mk +++ b/ure/Module_ure.mk @@ -10,9 +10,8 @@ $(eval $(call gb_Module_Module,ure)) $(eval $(call gb_Module_add_targets,ure,\ - Package_distribution \ - $(if $(gb_RUNNABLE_INSTDIR),Package_install) \ - Rdb_ure \ + Package_install \ + Rdb_ure \ )) # vim:set noet sw=4 ts=4: diff --git a/ure/Package_distribution.mk b/ure/Package_distribution.mk deleted file mode 100644 index dd65277427eb..000000000000 --- a/ure/Package_distribution.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_Package_Package,ure_distribution,$(SRCDIR)/ure/source)) - -$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/README,README)) -$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/THIRDPARTYLICENSEREADME.html,THIRDPARTYLICENSEREADME.html)) -$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/jvmfwk3.ini,jvmfwk3.ini)) -$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/jvmfwk3rc,jvmfwk3rc)) -$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/startup.sh,startup.sh)) -$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/uno.ini,uno.ini)) -$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/unorc,unorc)) - -# vim:set noet sw=4 ts=4: diff --git a/ure/Package_install.mk b/ure/Package_install.mk index de48dd4c9dba..af4454d13c50 100644 --- a/ure/Package_install.mk +++ b/ure/Package_install.mk @@ -11,8 +11,20 @@ $(eval $(call gb_Package_Package,ure_install,$(SRCDIR)/ure/source)) $(eval $(call gb_Package_set_outdir,ure_install,$(INSTDIR))) +ifneq (WNT,$(OS)) $(eval $(call gb_Package_add_file,ure_install,ure/bin/startup.sh,startup.sh)) -$(eval $(call gb_Package_add_file,ure_install,ure/lib/$(call gb_Helper_get_rcfile,jvmfwk3),jvmfwk3rc)) -$(eval $(call gb_Package_add_file,ure_install,ure/lib/$(call gb_Helper_get_rcfile,uno),unorc)) +$(eval $(call gb_Package_add_symbolic_link,ure_install,ure/bin/uno,startup.sh)) +endif + +ifeq (MACOSX,$(OS)) +$(eval $(call gb_Package_add_symbolic_link,ure_install,ure-link/bin/urelibs,../lib)) +else ifneq (WNT,$(OS)) +$(eval $(call gb_Package_add_symbolic_link,ure_install,ure-link,ure)) +endif + +$(eval $(call gb_Package_add_files,ure_install,$(LIBO_URE_LIB_FOLDER),\ + $(call gb_Helper_get_rcfile,jvmfwk3) \ + $(call gb_Helper_get_rcfile,uno) \ +)) # vim:set noet sw=4 ts=4: diff --git a/ure/source/startup.sh b/ure/source/startup.sh index eae7173acf7e..eae7173acf7e 100644..100755 --- a/ure/source/startup.sh +++ b/ure/source/startup.sh |