diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-01 14:06:50 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-04-05 23:35:45 +0000 |
| commit | 3e8016ddc576dafaa93505d5673c8013f3ed2d09 (patch) | |
| tree | 6ed10962afdf5d43c3d0a00892299414cf138896 /scp2 | |
| parent | a593069ff9f64dd94e8210b0cff03b65fe059b40 (diff) | |
use filelist install method for udkapi and offapi
... so we can drop ZipUnoApi again.
Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa
Reviewed-on: https://gerrit.libreoffice.org/3152
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'scp2')
| -rwxr-xr-x | scp2/inc/macros.inc | 6 | ||||
| -rw-r--r-- | scp2/source/sdkoo/sdkoo.scp | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index dd4432c3966c..6236c7cc08a6 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -427,8 +427,14 @@ End #if defined MACOSX #define FILELIST_DIR gid_Dir_Bundle_Contents +#define FILELIST_SDK_DIR PREDEFINED_PROGDIR #else #define FILELIST_DIR gid_Dir_Brand_Root +#if defined WNT +#define FILELIST_SDK_DIR gid_Dir_Sdkoo_Root +#else +#define FILELIST_SDK_DIR PREDEFINED_PROGDIR +#endif #endif #include <langmacros.inc> diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index 5bd19087fc56..70ea8fe0c85f 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -133,16 +133,16 @@ End File gid_File_Zip_OdkIdl_udkapi TXT_FILE_BODY; - Dir = gid_Dir_Basis_Sdk; - Name = "udkapi.zip"; - Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); + Dir = FILELIST_SDK_DIR; + Name = "udkapi_idl.filelist"; + Styles = (FILELIST,USE_INTERNAL_RIGHTS); End File gid_File_Zip_OdkIdl_offapi TXT_FILE_BODY; - Dir = gid_Dir_Basis_Sdk; - Name = "offapi.zip"; - Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); + Dir = FILELIST_SDK_DIR; + Name = "offapi_idl.filelist"; + Styles = (FILELIST,USE_INTERNAL_RIGHTS); End File gid_File_Zip_Odkheaders_sal_generated |