applied_patches/0337-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.old      2009-04-02 10:58:08.000000000 +0000
  21 +++ unoil/climaker/makefile.mk  2009-04-06 16:41:58.000000000 +0000
  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,16 @@ ALLTAR : \
  32
  33  .ENDIF
  34
  35 +.IF "$(ENABLE_MONO_CLIMAKER)" == "YES"
  36 +
  37 +CLIMAKER=$(SOLARBINDIR)$/climaker
  38 +
  39 +.ELSE
  40 +
  41 +CLIMAKER=$(WRAPCMD) $(SOLARBINDIR)$/climaker.exe
  42 +
  43 +.ENDIF
  44 +
  45
  46  CLIMAKERFLAGS =
  47  .IF "$(debug)" != ""
  48 @@ -68,8 +78,20 @@ CLIMAKERFLAGS += --verbose
  49  RDB = $(SOLARBINDIR)$/offapi.rdb
  50  EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb
  51
  52 +EXTERNAL_DIR=$(PRJ)$/..$/external/cli
  53 +
  54 +.IF "$(ENABLE_MONO)" == "YES" && "$(ENABLE_MONO_CLIMAKER)" != "YES"
  55 +
  56 +$(BIN)$/cli_oootypes.dll : $(EXTERNAL_DIR)$/cli_oootypes.dll $(EXTERNAL_DIR)$/cli_oootypes.config
  57 +       +$(COPY) $? $(BIN)$/
  58 +
  59 +$(POLICY_ASSEMBLY_FILE) : $(EXTERNAL_DIR)$/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
  60 +       +$(COPY) $< $@
  61 +
  62 +.ELSE # .IF "$(ENABLE_MONO)" == "YES" && "$(ENABLE_MONO_CLIMAKER)" != "YES"
  63 +
  64  $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA_RDB) version.txt
  65 -       $(WRAPCMD) $(SOLARBINDIR)$/climaker.exe $(CLIMAKERFLAGS) \
  66 +       $(CLIMAKER) $(CLIMAKERFLAGS) \
  67                 --out $@ \
  68                 --assembly-version $(CLI_OOOTYPES_NEW_VERSION) \
  69                 --assembly-company "OpenOffice.org" \
  70 @@ -86,10 +108,16 @@ $(BIN)$/cli_oootypes.config: cli_oootype
  71         $< $@
  72
  73  $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_oootypes.config $(BIN)$/cli_oootypes.dll
  74 -       $(WRAPCMD) AL.exe -out:$@ \
  75 -                       -version:$(CLI_OOOTYPES_POLICY_VERSION) \
  76 -                       -keyfile:$(SOLARBINDIR)$/cliuno.snk \
  77 -                       -link:$(BIN)$/cli_oootypes.config
  78 +       # al in mono seems broken and doesn't allow -link with filenames containing path
  79 +       $(GNUCOPY) $(BIN)$/cli_oootypes.config .
  80 +       $(WRAPCMD) $(AL) -out:$@ \
  81 +                        -version:$(CLI_OOOTYPES_POLICY_VERSION) \
  82 +                        -keyfile:$(SOLARBINDIR)$/cliuno.snk \
  83 +                        -link:cli_oootypes.config
  84 +       $(RM) cli_oootypes.config
  85 +
  86 +.ENDIF # .IF "$(ENABLE_MONO)" == "YES" && "$(ENABLE_MONO_CLIMAKER)" != "YES"
  87 +
  88
  89  #always deliver a clioootypesversion.mk. It is needed for the packing process even for all other
  90  #platforms. Therefore BUILD_FOR_CLI is not used here