applied_patches/0321-buildfix-use-climaker-in-unoil.diff

   1 --- cli_ure/prj/d.lst.old       2009-04-06 16:41:58.000000000 +0000
   2 +++ cli_ure/prj/d.lst   2009-04-06 16:41:58.000000000 +0000
   3 @@ -1,4 +1,5 @@
   4  ..\%__SRC%\bin\climaker.exe %_DEST%\bin%_EXT%\climaker.exe
   5 +..\%__SRC%\bin\climaker %_DEST%\bin%_EXT%\climaker
   6  ..\%__SRC%\bin\climaker.pdb %_DEST%\bin%_EXT%\climaker.pdb
   7  ..\%__SRC%\bin\climaker.exe.config %_DEST%\bin%_EXT%\climaker.exe.config
   8
   9 --- cli_ure/source/climaker/makefile.mk.old     2009-04-06 16:41:58.000000000 +0000
  10 +++ cli_ure/source/climaker/makefile.mk 2009-04-06 16:41:58.000000000 +0000
  11 @@ -62,7 +62,7 @@ ALLTAR : $(BIN)$/climaker
  12
  13  $(BIN)$/climaker : climaker_csharp.cs
  14         gmcs -debug -unsafe climaker_csharp.cs -reference:$(BIN)/cli_basetypes.dll -out:$(BIN)$/climaker.exe
  15 -       mkbundle2 --static -o $(BIN)$/climaker $(BIN)$/climaker.exe -L $(OUT)/lib
  16 +       mkbundle2 --static -L $(OUT)/lib --deps -o $(BIN)$/climaker $(BIN)$/climaker.exe $(BIN)/cli_basetypes.dll
  17
  18  .INCLUDE :  target.mk
  19  .ENDIF # "$(ENABLE_MONO_CLIMAKER)" != "YES"
  20 --- unoil/climaker/makefile.mk
  21 +++ unoil/climaker/makefile.mk
  22 @@ -45,7 +45,7 @@ TARGET = unotypes
  23
  24  POLICY_ASSEMBLY_FILE=$(BIN)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
  25
  26 -.IF "$(BUILD_FOR_CLI)" != ""
  27 +.IF "$(BUILD_FOR_CLI)" != "" || "$(ENABLE_MONO)" == "YES"
  28
  29  ALLTAR : \
  30         $(BIN)$/clioootypesversion.mk \
  31 @@ -59,6 +59,17 @@ ALLTAR : \
  32
  33  .ENDIF
  34
  35 +.IF "$(ENABLE_MONO_CLIMAKER)" == "YES"
  36 +
  37 +WRAPCMD=LD_LIBRARY_PATH=$(SOLARLIBDIR)
  38 +CLIMAKER=$(WRAPCMD) $(SOLARBINDIR)$/climaker
  39 +
  40 +.ELSE
  41 +
  42 +CLIMAKER=$(WRAPCMD) $(SOLARBINDIR)$/climaker.exe
  43 +
  44 +.ENDIF
  45 +
  46
  47  CLIMAKERFLAGS =
  48  .IF "$(debug)" != ""
  49 @@ -68,6 +78,18 @@ CLIMAKERFLAGS += --verbose
  50  RDB = $(SOLARBINDIR)$/offapi.rdb
  51  EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb
  52
  53 +EXTERNAL_DIR=$(PRJ)$/..$/external/cli
  54 +
  55 +.IF "$(ENABLE_MONO)" == "YES" && "$(ENABLE_MONO_CLIMAKER)" != "YES"
  56 +
  57 +$(BIN)$/cli_oootypes.dll : $(EXTERNAL_DIR)$/cli_oootypes.dll $(EXTERNAL_DIR)$/cli_oootypes.config
  58 +       +$(COPY) $? $(BIN)$/
  59 +
  60 +$(POLICY_ASSEMBLY_FILE) : $(EXTERNAL_DIR)$/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
  61 +       +$(COPY) $< $@
  62 +
  63 +.ELSE # .IF "$(ENABLE_MONO)" == "YES" && "$(ENABLE_MONO_CLIMAKER)" != "YES"
  64 +
  65  $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA_RDB) version.txt
  66                 $(CLIMAKER) $(CLIMAKERFLAGS) \
  67                 --out $@ \
  68 @@ -86,10 +108,16 @@ $(BIN)$/cli_oootypes.config: cli_oootype
  69         $< $@
  70
  71  $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_oootypes.config $(BIN)$/cli_oootypes.dll
  72 -       $(WRAPCMD) AL.exe -out:$@ \
  73 -                       -version:$(CLI_OOOTYPES_POLICY_VERSION) \
  74 -                       -keyfile:$(SOLARBINDIR)$/cliuno.snk \
  75 -                       -link:$(BIN)$/cli_oootypes.config
  76 +       # al in mono seems broken and doesn't allow -link with filenames containing path
  77 +       $(GNUCOPY) $(BIN)$/cli_oootypes.config .
  78 +       $(WRAPCMD) $(AL) -out:$@ \
  79 +                        -version:$(CLI_OOOTYPES_POLICY_VERSION) \
  80 +                        -keyfile:$(SOLARBINDIR)$/cliuno.snk \
  81 +                        -link:cli_oootypes.config
  82 +       $(RM) cli_oootypes.config
  83 +
  84 +.ENDIF # .IF "$(ENABLE_MONO)" == "YES" && "$(ENABLE_MONO_CLIMAKER)" != "YES"
  85 +
  86
  87  #always deliver a clioootypesversion.mk. It is needed for the packing process even for all other
  88  #platforms. Therefore BUILD_FOR_CLI is not used here