applied_patches/0307-mono-scp2.diff

   1 Index: scp2/source/ooo/makefile.mk
   2 ===================================================================
   3 RCS file: /cvs/installation/scp2/source/ooo/makefile.mk,v
   4 retrieving revision 1.28
   5 diff -u -r1.28 makefile.mk
   6 --- scp2/source/ooo/makefile.mk 30 Mar 2005 11:40:55 -0000      1.28
   7 +++ scp2/source/ooo/makefile.mk 7 Apr 2005 17:06:30 -0000
   8 @@ -142,6 +142,10 @@
   9  SCPDEFS+=-DSYSTEM_STDLIBS
  10  .ENDIF
  11
  12 +.IF "$(ENABLE_MONO)" == "YES"
  13 +SCPDEFS+=-DENABLE_MONO
  14 +.ENDIF
  15 +
  16  .IF "$(SYSTEM_SNDFILE)" == "YES"
  17  SCPDEFS+=-DSYSTEM_SNDFILE
  18  .ENDIF
  19
  20 Index: file_library_ooo.scp
  21 ===================================================================
  22 RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
  23 retrieving revision 1.299
  24 diff -u -r1.299 file_library_ooo.scp
  25 --- scp2/source/ooo/file_library_ooo.scp        11 Jul 2008 10:32:04 -0000      1.299
  26 +++ scp2/source/ooo/file_library_ooo.scp        20 Jul 2008 01:13:29 -0000
  27 @@ -137,7 +137,7 @@
  28  STD_UNO_LIB_FILE(gid_File_Lib_Chartview, chartview)
  29
  30
  31 -#if defined WNT && defined _MSC
  32 +#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  33
  34  File gid_File_Lib_Cli_Oootypes_Assembly
  35      TXT_FILE_BODY;
  36 @@ -156,7 +156,7 @@
  37
  38  #endif
  39
  40 -#if defined WNT && defined _MSC
  41 +#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  42  File gid_File_Lib_Policy_Cli_Oootypes_Assembly
  43      TXT_FILE_BODY;
  44      Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
  45 @@ -173,7 +173,7 @@
  46
  47  #endif
  48
  49 -#if defined WNT && defined _MSC
  50 +#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  51
  52  File gid_File_Lib_Policy_Cli_Oootypes_Config
  53      TXT_FILE_BODY;
  54 Index: ure.scp
  55 ===================================================================
  56 RCS file: /cvs/installation/scp2/source/ooo/ure.scp,v
  57 retrieving revision 1.10
  58 diff -u -r1.10 ure.scp
  59 --- scp2/source/ooo/ure.scp     30 Jun 2008 15:25:02 -0000      1.10
  60 +++ scp2/source/ooo/ure.scp     20 Jul 2008 01:13:40 -0000
  61 @@ -410,7 +410,7 @@
  62      // CompID = "CF542EC3-7A51-4EAA-8480-65D5E8906D05";
  63  End
  64
  65 -#if defined WNT && defined _MSC
  66 +#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  67  File gid_File_Dl_Cli_Uno
  68      TXT_FILE_BODY;
  69      Dir = SCP2_URE_DL_DIR;
  70 @@ -420,7 +420,7 @@
  71  End
  72  #endif
  73
  74 -#if defined WNT && defined _MSC
  75 +#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  76
  77  File gid_File_Dl_Cli_Ure_Assembly
  78      TXT_FILE_BODY;
  79 @@ -439,7 +439,7 @@
  80
  81  #endif
  82
  83 -#if defined WNT && defined _MSC
  84 +#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  85
  86  File gid_File_Dl_Policy_Cli_Ure_Assembly
  87      TXT_FILE_BODY;
  88 @@ -458,7 +458,7 @@
  89
  90  #endif
  91
  92 -#if defined WNT && defined _MSC
  93 +#if (defined WNT && defined _MSC) || defined ENABLE_MONO
  94
  95  File gid_File_Dl_Policy_Cli_Ure_Config
  96      TXT_FILE_BODY;
  97 @@ -470,7 +470,7 @@
  98
  99  #endif
 100
 101 -#if defined WNT && defined _MSC
 102 +#if (defined WNT && defined _MSC) || defined ENABLE_MONO
 103
 104  File gid_File_Dl_Cli_Basetypes_Assembly
 105      TXT_FILE_BODY;
 106 @@ -489,7 +489,7 @@
 107
 108  #endif
 109
 110 -#if defined WNT && defined _MSC
 111 +#if (defined WNT && defined _MSC) || defined ENABLE_MONO
 112
 113  File gid_File_Dl_Policy_Cli_Basetypes_Assembly
 114      TXT_FILE_BODY;
 115 @@ -507,7 +507,7 @@
 116  End
 117
 118  #endif
 119 -#if defined WNT && defined _MSC
 120 +#if (defined WNT && defined _MSC) || defined ENABLE_MONO
 121
 122  File gid_File_Dl_Policy_Cli_Basetypes_Config
 123      TXT_FILE_BODY;
 124 @@ -520,7 +520,7 @@
 125  #endif
 126
 127
 128 -#if defined WNT && defined _MSC
 129 +#if (defined WNT && defined _MSC) || defined ENABLE_MONO
 130
 131  File gid_File_Dl_Cli_Uretypes_Assembly
 132      TXT_FILE_BODY;
 133 @@ -539,7 +539,7 @@
 134
 135  #endif
 136
 137 -#if defined WNT && defined _MSC
 138 +#if (defined WNT || defined _MSC) || defined ENABLE_MONO
 139
 140  File gid_File_Dl_Policy_Cli_Uretypes_Assembly
 141      TXT_FILE_BODY;
 142 @@ -558,7 +558,7 @@
 143
 144  #endif
 145
 146 -#if defined WNT && defined _MSC
 147 +#if (defined WNT && defined _MSC) || defined ENABLE_MONO
 148
 149  File gid_File_Dl_Policy_Cli_Uretypes_Config
 150      TXT_FILE_BODY;
 151 @@ -570,7 +570,7 @@
 152
 153  #endif
 154
 155 -#if defined WNT && defined _MSC
 156 +#if (defined WNT && defined _MSC) || defined ENABLE_MONO
 157
 158  File gid_File_Lib_Cli_Cppuhelper_Assembly
 159      TXT_FILE_BODY;
 160 @@ -589,7 +589,7 @@
 161
 162  #endif
 163
 164 -#if defined WNT && defined _MSC
 165 +#if (defined WNT && defined _MSC) || defined ENABLE_MONO
 166
 167  File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly
 168      TXT_FILE_BODY;
 169 @@ -607,7 +607,7 @@
 170
 171  #endif
 172
 173 -#if defined WNT && defined _MSC
 174 +#if (defined WNT && defined _MSC) || defined ENABLE_MONO
 175
 176  File gid_File_Lib_Policy_Cli_Cppuhelper_Config
 177      TXT_FILE_BODY;
 178 @@ -619,6 +619,33 @@ End
 179
 180  #endif
 181
 182 +#ifdef ENABLE_MONO
 183 +
 184 +File gid_File_Lib_Cli_Uno_Glue
 185 +    TXT_FILE_BODY;
 186 +    Styles = (PACKED);
 187 +    Dir = SCP2_URE_DL_DIR;
 188 +  #ifdef UNX
 189 +    Name = STRING(CONCAT2(libcli_uno_glue,UNXSUFFIX));
 190 +  #else
 191 +    Name = "cli_uno_glue.dll";
 192 +  #endif
 193 +End
 194 +
 195 +File gid_File_Lib_Cli_Uno_Bridge_Assembly
 196 +    TXT_FILE_BODY;
 197 +    Styles = (PACKED, ASSEMBLY);
 198 +    Name = "cli_uno_bridge.dll";
 199 +    Dir = SCP2_URE_DL_DIR;
 200 +    Assemblyname = "cli_uno_bridge";
 201 +    PublicKeyToken = "ce2cb7e279207b9e";
 202 +    Version = "1.0.0.0";
 203 +    Culture = "neutral";
 204 +    Attributes = "0";
 205 +End
 206 +
 207 +#endif
 208 +
 209  #if defined SOLAR_JAVA
 210  File gid_File_Dl_Jpipe
 211      TXT_FILE_BODY;
 212 @@ -1124,6 +1124,7 @@
 213                 gid_File_Lib_Cli_Cppuhelper_Assembly,
 214              gid_File_Lib_Policy_Cli_Cppuhelper_Assembly,
 215                 gid_File_Lib_Policy_Cli_Cppuhelper_Config,
 216 +           gid_File_Lib_Cli_Uno_Glue,
 217              gid_File_Dl_Cppu,
 218              gid_File_Dl_Cppuhelper,
 219              gid_File_Dl_PurpEnvHelper,