applied_patches/0621-store-install.diff

   1 --- offapi/util/makefile.mk.old 2009-04-06 16:41:42.000000000 +0000
   2 +++ offapi/util/makefile.mk     2009-04-06 16:42:11.000000000 +0000
   3 @@ -155,6 +155,8 @@ UNOTYPE_STATISTICS=$(MISC)$/unotype_stat
   4
   5  # --- Targets ------------------------------------------------------
   6
   7 +REGMERGEFLAGS=-i
   8 +
   9  ALLTAR : $(UCR)$/types.db \
  10         $(OUT)$/ucrdoc$/types_doc.db \
  11         $(REGISTRYCHECKFLAG) \
  12 @@ -163,7 +165,7 @@ ALLTAR : $(UCR)$/types.db \
  13  $(UCR)$/types.db : $(UCR)$/offapi.db $(SOLARBINDIR)$/udkapi.rdb
  14      -$(RM) $(REGISTRYCHECKFLAG)
  15      $(GNUCOPY) -f $(UCR)$/offapi.db $@
  16 -    $(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi.rdb
  17 +       $(REGMERGE) $(REGMERGEFLAGS) $@ / $(SOLARBINDIR)$/udkapi.rdb
  18
  19  $(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(SOLARBINDIR)$/udkapi_doc.rdb
  20      -$(RM) $(REGISTRYCHECKFLAG)
  21 --- solenv/bin/modules/installer/servicesfile.pm.old    2009-04-02 10:53:08.000000000 +0000
  22 +++ solenv/bin/modules/installer/servicesfile.pm        2009-04-06 16:42:11.000000000 +0000
  23 @@ -948,6 +948,11 @@ sub create_services_rdb
  24                                 $regcompfileref = get_source_path_cygwin_safe($searchname, $includepatharrayref, 1);
  25                                 if ( $$regcompfileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $searchname for registering uno components!", "create_services_rdb"); }
  26
  27 +               if ($installer::globals::isunix) { $searchname = "regmerge"; }
  28 +               else { $searchname = "regmerge.exe"; }
  29 +
  30 +               $regmergefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$searchname, $includepatharrayref, 1);
  31 +               if ( $$regmergefileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $searchname for registering uno components!", "create_services_rdb"); }
  32                                 # For Windows the libraries included into the mozruntime.zip have to be added to the path
  33                                 if ($installer::globals::iswin) { add_path_to_pathvariable_directory($filesarrayref, "mozruntime_zip"); }
  34                                 if ($installer::globals::iswin) { add_path_to_pathvariable($filesarrayref, "msvcr70.dll"); }
  35 @@ -991,6 +996,8 @@ sub create_services_rdb
  36                                 }
  37                                 else
  38                                 {
  39 +                       system ("$installer::globals::wrapcmd $$regmergefileref -i " . fix_cygwin_path ("${servicesfile}.internal") . " / " . fix_cygwin_path (${servicesfile}));
  40 +                       installer::systemactions::rename_one_file ("${servicesfile}.internal", ${servicesfile});
  41                                         $servicesdir = installer::systemactions::rename_directory($servicesdir, $origservicesdir);
  42                                 }
  43
  44 --- solenv/inc/target.mk.old    2009-04-06 16:41:40.000000000 +0000
  45 +++ solenv/inc/target.mk        2009-04-06 16:42:11.000000000 +0000
  46 @@ -1402,31 +1402,31 @@ makedoc:
  47  $(LOCALDBTARGET) : $(URDFILES) $(DEPIDLFILES)
  48         $(QUIET_BUILD) $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $(all_outdated_idl))
  49         @-$(RM) $@
  50 -       $(QUIET_BUILD) $(REGMERGE) $@ UCR @$(mktmp $(URDFILES))
  51 +       $(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $@ UCR @$(mktmp $(URDFILES))
  52  .ENDIF
  53
  54  .IF "$(LOCALDOCDBTARGET)"!=""
  55  $(LOCALDOCDBTARGET) : $(URDDOCFILES) $(DEPIDLFILES)
  56         $(QUIET_BUILD) $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(all_outdated_idl))
  57         @-$(RM) $@
  58 -       $(QUIET_BUILD) $(REGMERGE) $@ UCR @$(mktmp $(URDDOCFILES))
  59 +       $(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $@ UCR @$(mktmp $(URDDOCFILES))
  60  .ENDIF
  61
  62  .IF "$(UNOIDLDBTARGET)"!=""
  63  $(UNOIDLDBTARGET) : $(UNOIDLDBFILES) $(UNOIDLDBREGS)
  64         @-$(RM) $@
  65 -       $(QUIET_BUILD) $(REGMERGE) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
  66 +       $(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
  67  .IF "$(LOCALREGDB)"!=""
  68 -       $(QUIET_BUILD) $(REGMERGE) $(LOCALREGDB) / $@
  69 +       $(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $(LOCALREGDB) / $@
  70  .ENDIF
  71  .ENDIF                 # "$(UNOIDLDBTARGET)"!=""
  72
  73  .IF "$(UNOIDLDBDOCTARGET)"!=""
  74  $(UNOIDLDBDOCTARGET) : $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS)
  75         @-$(RM) $@
  76 -       $(QUIET_BUILD) $(REGMERGE) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
  77 +       $(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
  78  .IF "$(LOCALREGDB)"!=""
  79 -       $(QUIET_BUILD) $(REGMERGE) $(LOCALREGDB) / $@
  80 +       $(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $(LOCALREGDB) / $@
  81  .ENDIF
  82  .ENDIF                 # "$(UNOIDLDBDOCTARGET)"!=""
  83
  84 --- oovbaapi/util/makefile.mk.old       2009-04-06 16:42:01.000000000 +0000
  85 +++ oovbaapi/util/makefile.mk   2009-04-06 16:42:11.000000000 +0000
  86 @@ -49,5 +49,5 @@ UNOIDLDBFILES= \
  87         $(UCR)$/constants.db
  88
  89  # --- Targets ------------------------------------------------------
  90 -
  91 +REGMERGEFLAGS=-i
  92  .INCLUDE :  target.mk
  93 --- udkapi/util/makefile.mk.old 2009-04-02 11:06:56.000000000 +0000
  94 +++ udkapi/util/makefile.mk     2009-04-06 16:42:11.000000000 +0000
  95 @@ -72,6 +72,8 @@ UNOIDLDBFILES= \
  96         $(UCR)$/csstask.db \
  97      $(UCR)$/cssuri.db
  98
  99 +REGMERGEFLAGS=-i
 100 +
 101  # --- Targets ------------------------------------------------------
 102
 103  .INCLUDE :  target.mk