openoffice-scp-handle-no-solar-java.patch

   1 --- scp/source/global/udk_base.scp.orig 2003-08-11 11:22:39.000000000 -0700
   2 +++ scp/source/global/udk_base.scp      2003-08-11 11:38:05.000000000 -0700
   3 @@ -342,6 +342,7 @@
   4         #endif
   5  End
   6
   7 +#ifdef SOLAR_JAVA
   8  File gid_File_Lib_Jvmaccess
   9      TXT_FILE_BODY;
  10      Dir = GCFG_BINARY_DIR;
  11 @@ -368,3 +369,4 @@
  12      Styles = (NETWORK,RELATIVE);
  13  End
  14  #endif
  15 +#endif
  16 --- scp/source/global/setupzip.scp.orig 2003-08-11 11:23:38.000000000 -0700
  17 +++ scp/source/global/setupzip.scp      2003-08-11 11:28:02.000000000 -0700
  18 @@ -393,8 +393,6 @@
  19
  20  #if !defined(IPL_PRODUCT) && !defined(OPL_PRODUCT) || defined(UNX)
  21
  22 -#ifdef SOLAR_JAVA
  23 -
  24  File GID_FILE_LIB_J
  25         TXT_FILE_BODY;
  26         #ifdef UNX
  27 @@ -408,8 +406,6 @@
  28
  29  #endif
  30
  31 -#endif
  32 -
  33  File GID_FILE_LIB_COMPHELPER2
  34         TXT_FILE_BODY;
  35         #ifdef UNX
  36 @@ -527,12 +523,14 @@
  37
  38  #endif
  39
  40 +#ifdef SOLAR_JAVA
  41  File GID_FILE_JAR_UNOIL
  42         TXT_FILE_BODY;
  43         Name            = "unoil.jar";
  44         Dir             = GCFG_CLASSES_DIR;
  45         Styles          = (PACKED,DONT_OVERWRITE,SETUPZIP);
  46  End
  47 +#endif
  48
  49  #ifdef INCLUDE_JAVA_ACCESSBRIDGE
  50
  51 @@ -546,14 +544,14 @@
  52  #endif
  53
  54  #ifdef UNX
  55 -
  56 +#ifdef SOLAR_JAVA
  57  File GID_FILE_BIN_JAVALDX
  58          BIN_FILE_BODY;
  59          Dir             = GCFG_BINARY_DIR;
  60          Styles          = (PACKED, SETUPZIP);
  61          Name            = EXENAME(javaldx);
  62  End
  63 -
  64 +#endif
  65  #endif
  66
  67  #ifdef UNX
  68 --- scp/source/global/udk_complete.scp.orig     2003-08-11 11:28:16.000000000 -0700
  69 +++ scp/source/global/udk_complete.scp  2003-08-11 11:29:30.000000000 -0700
  70 @@ -75,6 +75,7 @@
  71      #endif
  72  End
  73
  74 +#ifdef SOLAR_JAVA
  75  #ifndef MACOSX
  76  File gid_File_Lib_OfficeBean
  77      TXT_FILE_BODY;
  78 @@ -94,6 +95,8 @@
  79       Styles          = (PACKED);
  80  End
  81  #endif
  82 +#endif
  83 +
  84  /*
  85  File gid_File_Lib_Stm
  86      TXT_FILE_BODY;
  87 --- scp/source/office/files.scp.orig    2003-08-11 11:29:45.000000000 -0700
  88 +++ scp/source/office/files.scp 2003-08-11 11:30:15.000000000 -0700
  89 @@ -715,6 +715,7 @@
  90
  91  #endif
  92
  93 +#ifdef SOLAR_JAVA
  94  File GID_FILE_LIB_JDBC_2
  95          TXT_FILE_BODY;
  96          Styles          = (PACKED,UNO_COMPONENT);
  97 @@ -726,6 +727,7 @@
  98          Name            = "jdbc2.dll";
  99          #endif
 100  End
 101 +#endif
 102
 103  File GID_FILE_LIB_ODBC_2
 104          TXT_FILE_BODY;
 105 --- scp/util/makefile.mk.orig   2003-08-11 11:30:57.000000000 -0700
 106 +++ scp/util/makefile.mk        2003-08-11 11:34:00.000000000 -0700
 107 @@ -88,7 +88,6 @@
 108                  module_math.par         \
 109                  module_grafik.par       \
 110                  module_lingu.par        \
 111 -                module_javafilter.par  \
 112                  profile.par             \
 113                  profile_calc.par        \
 114                  profile_impress.par     \
 115 @@ -96,13 +95,10 @@
 116                  profile_math.par        \
 117                  profile_chart.par       \
 118                  profile_grafik.par      \
 119 -                profile_javafilter.par \
 120                  setupzip.par            \
 121                  readme.par                 \
 122                  udk_base.par            \
 123                  udk_bridges.par         \
 124 -                udk_java.par                   \
 125 -                udk_pure_java.par              \
 126                  udk_remote.par                 \
 127                  udk_complete.par               \
 128                  files.par                              \
 129 @@ -113,10 +109,15 @@
 130                  files_chart.par         \
 131                  files_grafik.par        \
 132                  files_lingu.par         \
 133 -                files_javafilter.par   \
 134                  dir.par                                        \
 135                  python.par
 136 -
 137 +.IF "$(SOLAR_JAVA)"!=""
 138 +SCP1FILES +=    module_javafilter.par  \
 139 +                profile_javafilter.par \
 140 +                files_javafilter.par   \
 141 +                udk_java.par                   \
 142 +                udk_pure_java.par
 143 +.ENDIF
 144
 145  #python.par
 146