Skip to content

C
core
Kaydet (Commit) 0fd69181 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

AIX tweaks

üst 6d5154ef
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 1 deletion
scp2/inc/macros.inc
Dosyayı görüntüle @ 0fd69181
......@@ -562,6 +562,7 @@ End
#define SCP2_URE_DL_BARE(n) n ".dll"
#define SCP2_URE_DL_VER(n, v) n v ".dll"
#define SCP2_URE_DL_COMID_VER(n, v) n v STRING(COMID) ".dll"
#define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll"
#define SCP2_URE_DL_UNO_VER(n, v) n v ".dll"
#define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
#define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
......@@ -577,6 +578,8 @@ End
#define SCP2_URE_DL_VER(n, v) "lib" n STRING(UNXSUFFIX) "." v
#define SCP2_URE_DL_COMID_VER(n, v) \
"lib" n STRING(COMID) STRING(UNXSUFFIX) "." v
#define SCP2_URE_DL_COMID_NORMAL(n) \
"lib" n STRING(COMID) STRING(UNXSUFFIX)
#define SCP2_URE_DL_UNO_VER(n, v) "libuno_" n STRING(UNXSUFFIX) "." v
#define SCP2_URE_DL_UNO_NORMAL(n) "libuno_" n STRING(UNXSUFFIX)
#define SCP2_URE_DL_UNO_COMID_VER(n, v) \
......
scp2/source/ooo/shortcut_ooo.scp
Dosyayı görüntüle @ 0fd69181
......@@ -33,28 +33,44 @@
Shortcut gid_Shortcut_Lib_Icudata
FileID = gid_File_Lib_Icudata;
Dir = SCP2_OOO_BIN_DIR;
#ifndef AIX
Name = STRING(CONCAT5(libicudata,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
#else
Name = "libicudata.so";
#endif
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
Shortcut gid_Shortcut_Lib_Icui18n
FileID = gid_File_Lib_Icui18n;
Dir = SCP2_OOO_BIN_DIR;
#ifndef AIX
Name = STRING(CONCAT5(libicui18n,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
#else
Name = "libicui18n.so";
#endif
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
Shortcut gid_Shortcut_Lib_Icule
FileID = gid_File_Lib_Icule;
Dir = SCP2_OOO_BIN_DIR;
#ifndef AIX
Name = STRING(CONCAT5(libicule,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
#else
Name = "libicule.so";
#endif
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
Shortcut gid_Shortcut_Lib_Icuuc
FileID = gid_File_Lib_Icuuc;
Dir = SCP2_OOO_BIN_DIR;
#ifndef AIX
Name = STRING(CONCAT5(libicuuc,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
#else
Name = "libicuuc.so";
#endif
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
......
scp2/source/ooo/ure.scp
Dosyayı görüntüle @ 0fd69181
......@@ -246,6 +246,16 @@ File gid_File_Dl_Cppu
// CompID = "36C01AC6-BB0A-4181-A8B8-50B793ADEDB7";
End
#ifdef AIX
Unixlink gid_Unixlink_File_Dl_Cppu
BIN_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_UNO_NORMAL("cppu");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
Target = SCP2_URE_DL_UNO_VER("cppu", "3");
End
#endif
File gid_File_Dl_Cppuhelper
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
......@@ -254,6 +264,16 @@ File gid_File_Dl_Cppuhelper
// CompID = "D2A191E6-2023-41F5-9032-B98C50C37964";
End
#ifdef AIX
Unixlink gid_Unixlink_File_Dl_Cppuhelper
BIN_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_UNO_COMID_NORMAL("cppuhelper");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
Target = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
End
#endif
File gid_File_Dl_PurpEnvHelper
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
......@@ -262,6 +282,16 @@ File gid_File_Dl_PurpEnvHelper
// CompID = "C80146A8-A14C-44D1-AB9F-D9D8BF22277E";
End
#ifdef AIX
Unixlink gid_Unixlink_File_Dl_PurpEnvHelper
BIN_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
Target = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
End
#endif
File gid_File_Dl_Sal
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
......@@ -270,6 +300,16 @@ File gid_File_Dl_Sal
// CompID = "B1EF3AB6-611E-4027-958A-736583EB82E6";
End
#ifdef AIX
Unixlink gid_Unixlink_File_Dl_Sal
BIN_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_UNO_NORMAL("sal");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
Target = SCP2_URE_DL_UNO_VER("sal", "3");
End
#endif
File gid_File_Dl_Salhelper
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
......@@ -278,6 +318,16 @@ File gid_File_Dl_Salhelper
// CompID = "879B80E0-F6E1-4931-8EE6-7CF867CB6AA5";
End
#ifdef AIX
Unixlink gid_Unixlink_File_Dl_Salhelper
BIN_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_UNO_COMID_NORMAL("salhelper");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
Target = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
End
#endif
// Private Dynamic Libraries:
File gid_File_Dl_Profile_Uno
......@@ -296,6 +346,16 @@ File gid_File_Dl_Reg
// CompID = "D5313B1F-D09F-401F-B180-891F70D489ED";
End
#ifdef AIX
Unixlink gid_Unixlink_File_Dl_Reg
BIN_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_NORMAL("reg");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
Target = SCP2_URE_DL_VER("reg", "3");
End
#endif
File gid_File_Dl_Rmcxt
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
......@@ -304,6 +364,17 @@ File gid_File_Dl_Rmcxt
// CompID = "E0C091E3-7C18-4C32-B9CF-4D95AC243801";
End
#ifdef AIX
Unixlink gid_Unixlink_File_Dl_Rmcxt
BIN_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_NORMAL("rmcxt");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
Target = SCP2_URE_DL_VER("rmcxt", "3");
End
#endif
File gid_File_Dl_Store
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
......@@ -312,6 +383,16 @@ File gid_File_Dl_Store
// CompID = "A5477BD7-89A3-44AF-8B42-9E28D55C8066";
End
#ifdef AIX
Unixlink gid_Unixlink_File_Dl_Store
BIN_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_NORMAL("store");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
Target = SCP2_URE_DL_VER("store", "3");
End
#endif
File gid_File_Dl_Jvmaccess
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
......@@ -320,6 +401,16 @@ File gid_File_Dl_Jvmaccess
// CompID = "F3D6F794-DA6F-4522-B3A7-C15593C1A577";
End
#ifdef AIX
Unixlink gid_Unixlink_File_Dl_Jvmaccess
BIN_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_COMID_NORMAL("jvmaccess");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
Target = SCP2_URE_DL_COMID_VER("jvmaccess", "3");
End
#endif
File gid_File_Dl_Jvmfwk
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
......@@ -328,6 +419,16 @@ File gid_File_Dl_Jvmfwk
// CompID = "4E128F82-FA30-4077-88DC-F745C3330093";
End
#ifdef AIX
Unixlink gid_Unixlink_File_Dl_Jvmfwk
BIN_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_NORMAL("jvmfwk");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
Target = SCP2_URE_DL_VER("jvmfwk", "3");
End
#endif
#if defined SOLAR_JAVA
File gid_File_Dl_Sunjavaplugin
TXT_FILE_BODY;
......@@ -850,6 +951,16 @@ File gid_File_Dl_Libxml2
End
#endif
#ifdef AIX
Unixlink gid_Unixlink_File_Dl_Libxml2
BIN_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_NORMAL("xml2");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
Target = SCP2_URE_DL_VER("xml2", "2");
End
#endif
#if !defined USE_SYSTEM_STL || \
(defined USE_SYSTEM_STL && defined _C52 && defined IS_LP64)
File gid_File_Dl_Stlport
......@@ -896,7 +1007,11 @@ End
File gid_File_Dl_GccS
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
#ifdef AIX
Name = "libgcc_s.a";
#else
Name = SCP2_URE_DL_VER("gcc_s", STRING(SHORTSTDC3));
#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "C601D04B-2194-4F1B-BB09-7B4930D6E1DB";
End
......@@ -907,7 +1022,11 @@ End
File gid_File_Dl_Stdcpp
Dir = SCP2_URE_DL_DIR;
TXT_FILE_BODY;
#ifdef AIX
Name = "libstdc++.a";
#else
Name = SCP2_URE_DL_VER("stdc++", STRING(SHORTSTDCPP3));
#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "89740D6A-38EE-41AF-A6A2-A8F7ABBE4996";
End
......@@ -1132,16 +1251,26 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Lib_Policy_Cli_Cppuhelper_Assembly,
gid_File_Lib_Policy_Cli_Cppuhelper_Config,
gid_File_Dl_Cppu,
gid_Unixlink_File_Dl_Cppu,
gid_File_Dl_Cppuhelper,
gid_Unixlink_File_Dl_Cppuhelper,
gid_File_Dl_PurpEnvHelper,
gid_Unixlink_File_Dl_PurpEnvHelper,
gid_File_Dl_Sal,
gid_Unixlink_File_Dl_Sal,
gid_File_Dl_Salhelper,
gid_Unixlink_File_Dl_Salhelper,
gid_File_Dl_Profile_Uno,
gid_File_Dl_Reg,
gid_Unixlink_File_Dl_Reg
gid_File_Dl_Rmcxt,
gid_Unixlink_File_Dl_Rmcxt
gid_File_Dl_Store,
gid_Unixlink_File_Dl_Store
gid_File_Dl_Jvmaccess,
gid_Unixlink_File_Dl_Jvmaccess
gid_File_Dl_Jvmfwk,
gid_Unixlink_File_Dl_Jvmfwk
gid_File_Dl_Sunjavaplugin,
gid_File_Dl_JrepropertiesClass,
gid_File_Dl_Profile_Jvmfwk3rc,
......@@ -1196,7 +1325,18 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Misc_TypesRdb,
gid_File_Misc_JavavendorsXml,
gid_Starregistry_Services_Rdb_Ure);
Unixlinks = (gid_Unixlink_Ure_Bin_Urelibs);
Unixlinks = (gid_Unixlink_Ure_Bin_Urelibs,
gid_Unixlink_File_Dl_Sal,
gid_Unixlink_File_Dl_Salhelper,
gid_Unixlink_File_Dl_Cppu,
gid_Unixlink_File_Dl_Cppuhelper,
gid_Unixlink_File_Dl_PurpEnvHelper
gid_Unixlink_File_Dl_Reg,
gid_Unixlink_File_Dl_Rmcxt,
gid_Unixlink_File_Dl_Store,
gid_Unixlink_File_Dl_Jvmaccess,
gid_Unixlink_File_Dl_Jvmfwk,
gid_Unixlink_File_Dl_Libxml2);
End
// Profile version.ini
......
scp2/source/python/file_python.scp
Dosyayı görüntüle @ 0fd69181
......@@ -106,6 +106,7 @@ End
// Scripting Framework Python script proxy
#ifndef AIX
File gid_File_Py_Pythonscript
TXT_FILE_BODY;
Dir = gid_Dir_Program;
......@@ -113,6 +114,7 @@ File gid_File_Py_Pythonscript
RegistryID = gid_Starregistry_Services_Rdb;
Styles = (PACKED,UNO_COMPONENT);
End
#endif
//Scripting Framework Python example scripts
......
scp2/source/python/module_python_mailmerge.scp
Dosyayı görüntüle @ 0fd69181
......@@ -27,6 +27,7 @@
#include "macros.inc"
#ifndef AIX
File gid_File_Pymailmerge
TXT_FILE_BODY;
Dir = gid_Dir_Program;
......@@ -34,3 +35,4 @@ File gid_File_Pymailmerge
RegistryID = gid_Starregistry_Services_Rdb;
Styles = (PACKED,UNO_COMPONENT);
End
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment