diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-19 00:06:24 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-22 11:08:31 +0200 |
| commit | 5e300e9030d8d0730223b1eea1627953524cb58c (patch) | |
| tree | 561bc85514f044fc05dee7c9dfce3617516c2c77 /scp2 | |
| parent | def1a59d18b8cb1bf351ae83f2f11acbe41a8229 (diff) | |
odk: remove Package_bin, instead auto-install executables
This is somewhat annoying since it requires re-introducing stupid
directories in scp2, but if the executables should be put in INSTDIR
directly then the Package_bin needs to go.
Change-Id: I893694c7f9d4cb5b9ef8ec4a3d30e08536223740
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstall.mk | 1 | ||||
| -rwxr-xr-x | scp2/inc/macros.inc | 8 | ||||
| -rw-r--r-- | scp2/source/sdkoo/sdkoo.scp | 30 |
3 files changed, 31 insertions, 8 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 415279347e07..8550649379e9 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -20,6 +20,7 @@ $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE)) +$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE)) diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 3b8740a8909d..2f605a9b611d 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -513,6 +513,14 @@ End Styles = (PACKED); \ End +#define SDK_EXECUTABLE(id,name) \ + File id \ + BIN_FILE_BODY; \ + Dir = gid_Dir_Sdkoo_Bin; \ + Name = name; \ + Styles = (PACKED); \ + End + #define GALLERY_NAME(id) \ #define GALLERY_FILELIST(id) \ diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index 9b1751983160..06fef8e4964b 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -18,6 +18,8 @@ #include "macros.inc" +#include "AutoInstall/sdk" + Installation gid_Installation_Sdk ProductName = "${PRODUCTNAME}"; ProductVersion = "${PRODUCTVERSION}"; @@ -29,7 +31,7 @@ Installation gid_Installation_Sdk #endif End -#if defined WNT +#ifdef WNT Directory gid_Dir_Sdkoo_Root ParentID = PREDEFINED_PROGDIR; @@ -39,10 +41,29 @@ End #endif +Directory gid_Dir_Sdkoo_Sdk +#ifdef WNT + ParentID = gid_Dir_Sdkoo_Root; +#else + ParentID = PREDEFINED_PROGDIR; +#endif +#ifdef MACOSX + DosName = "LibreOffice${PRODUCTVERSION}_SDK"; +#else + DosName = "sdk"; +#endif +End + +Directory gid_Dir_Sdkoo_Bin + ParentID = gid_Dir_Sdkoo_Sdk; + DosName = "bin"; +End + Module gid_Module_Root_SDK Name = "sdkoo"; Description = "sdkoo"; PackageInfo = "packinfo_sdkoo.txt"; + Files = (auto_sdk_ALL); End File gid_File_Pakage_odk_share_readme @@ -52,13 +73,6 @@ File gid_File_Pakage_odk_share_readme Styles = (FILELIST,USE_INTERNAL_RIGHTS); End -File gid_File_Package_odk_bin - TXT_FILE_BODY; - Dir = FILELIST_SDK_DIR; - Name = "odk_bin.filelist"; - Styles = (FILELIST,USE_INTERNAL_RIGHTS); -End - #if defined(WNT) File gid_File_Package_odk_cli TXT_FILE_BODY; |