diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-21 17:18:13 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-24 13:59:58 +0200 |
| commit | b786a33cfdca2e8a4114ddef0340e0e0628dd09c (patch) | |
| tree | a0adbba80933544e1912adeb29a8e79797b7fc1c /scp2/source/sdkoo | |
| parent | 3535ceeac6f1b4277279082998663feb84d05487 (diff) | |
Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation.
Diffstat (limited to 'scp2/source/sdkoo')
| -rw-r--r-- | scp2/source/sdkoo/sdkoo.scp | 48 |
1 files changed, 14 insertions, 34 deletions
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index a15e4c399811..4b1f56999eb2 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -39,55 +39,35 @@ Installation gid_Installation_Sdk #endif End -#ifndef MACOSX +#if defined MACOSX -#ifdef WNT -Directory gid_Dir_Sdkoo_Root +Directory gid_Dir_Basis_Sdk ParentID = PREDEFINED_PROGDIR; - HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}"; - Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION); + DosName = "LibreOffice${OOOBASEVERSION}_SDK"; End -#endif -#ifndef WNT -Directory gid_Dir_Ooo_Openofficeorg_Sdk +#elif defined WNT + +Directory gid_Dir_Sdkoo_Root ParentID = PREDEFINED_PROGDIR; - #ifdef WNT - HostName = "${BASISROOTNAME}"; - #else - HostName = "."; - #endif + HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}"; + Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION); End -#endif -#ifndef WNT -Directory gid_Dir_Ooo_Basis_Sdk - ParentID = gid_Dir_Ooo_Openofficeorg_Sdk; - #ifdef WNT - HostName = "Basis ${OOOBASEVERSION}"; - #else - HostName = "basis${OOOBASEVERSION}"; - #endif - Styles = (BASISDIRECTORY); +Directory gid_Dir_Basis_Sdk + ParentID = gid_Dir_Sdkoo_Root; + DosName = "sdk"; End -#endif -#endif +#else Directory gid_Dir_Basis_Sdk -#if defined MACOSX ParentID = PREDEFINED_PROGDIR; - DosName = "LibreOffice${OOOBASEVERSION}_SDK"; -#else - #if defined WNT - ParentID = gid_Dir_Sdkoo_Root; - #else - ParentID = gid_Dir_Ooo_Basis_Sdk; - #endif DosName = "sdk"; -#endif End +#endif + Directory gid_Dir_Share_Sdk ParentID = gid_Dir_Basis_Sdk; DosName = "share"; |