[ooo-build-commit] .: patches/dev300
Petr Mladek
pmladek at kemper.freedesktop.org
Wed Jul 14 02:33:26 PDT 2010
patches/dev300/piece-binary-path.diff | 14 +++----
patches/dev300/piece-build.diff | 59 +++++++++++++++------------------
patches/dev300/piece-deliver.diff | 11 +++---
patches/dev300/piece-helpcontent2.diff | 2 -
patches/dev300/piece-l10n.diff | 10 ++---
patches/dev300/piece-odk.diff | 59 +++++++++++++++------------------
patches/dev300/piece-packimages.diff | 13 ++-----
patches/dev300/piece-postprocess.diff | 5 +-
patches/dev300/piece-scp2.diff | 2 -
patches/dev300/piece-services.diff | 4 +-
patches/dev300/piece-setup_native.diff | 2 -
patches/dev300/piece-startup.diff | 2 -
patches/dev300/piece-svx.diff | 14 ++++---
patches/dev300/piece-target.diff | 28 +++++++--------
patches/dev300/piece-transex3.diff | 12 +++---
patches/dev300/piece-writerfilter.diff | 11 ------
patches/dev300/piece-xmerge.diff | 4 --
17 files changed, 116 insertions(+), 136 deletions(-)
New commits:
commit 30d83da28848b409602c1ad7ee1419e66b33aed9
Author: Petr Mladek <pmladek at walk.suse.cz>
Date: Wed Jul 14 11:32:11 2010 +0200
Update piece-*.diff for dev300-m83
* patches/dev300/piece-binary-path.diff:
* patches/dev300/piece-build.diff:
* patches/dev300/piece-deliver.diff:
* patches/dev300/piece-helpcontent2.diff:
* patches/dev300/piece-l10n.diff:
* patches/dev300/piece-odk.diff:
* patches/dev300/piece-packimages.diff:
* patches/dev300/piece-postprocess.diff:
* patches/dev300/piece-scp2.diff:
* patches/dev300/piece-services.diff:
* patches/dev300/piece-setup_native.diff:
* patches/dev300/piece-startup.diff:
* patches/dev300/piece-svx.diff:
* patches/dev300/piece-target.diff:
* patches/dev300/piece-transex3.diff:
* patches/dev300/piece-writerfilter.diff:
* patches/dev300/piece-xmerge.diff: update for dev300-m83
diff --git a/patches/dev300/piece-binary-path.diff b/patches/dev300/piece-binary-path.diff
index c2acc45..cc32272 100644
--- a/patches/dev300/piece-binary-path.diff
+++ b/patches/dev300/piece-binary-path.diff
@@ -10,7 +10,7 @@
CLASSPATH!:=$(CLASSPATH:s/sj2/no/)
.ENDIF
@@ -958,7 +960,7 @@ MKDEPFLAGS+=$(MKDEPLOCAL)
- BISON=bison
+ BISON*=bison
YACCFLAGS*=-d
-SVIDL=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/svidl
@@ -43,7 +43,7 @@
-RDBMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rdbmaker
-CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/climaker
-
--TESTSHL2=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/testshl2
+-CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(SOLARBINDIR)/cppunittester
-HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/helpex
-LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/lngconvex
-HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/HelpLinker
@@ -56,7 +56,7 @@
+RDBMAKER*=$(AUGMENT_LIBRARY_PATH) rdbmaker
+CLIMAKER*=$(AUGMENT_LIBRARY_PATH) climaker
+
-+TESTSHL2=$(AUGMENT_LIBRARY_PATH) testshl2
++CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) cppunittester
+HELPEX=$(AUGMENT_LIBRARY_PATH) helpex
+LNGCONVEX=$(AUGMENT_LIBRARY_PATH) lngconvex
+HELPLINKER=$(AUGMENT_LIBRARY_PATH) HelpLinker
@@ -135,11 +135,11 @@
$(CPPLCC) -+ -P -I..\..\inc -I..\..\os2gcci.pro\inc $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
.ENDIF
.IF "$(GUI)"=="UNX"
-- $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
-+ $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
+- $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
++ $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
.ENDIF
.IF "$(common_build_srs)"!=""
- $(SCPCOMP) -l {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(TARGET)/$(@:b).$(LANGFILEEXT)} -s $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre -o $@
+ $(COMMAND_ECHO)$(SCPCOMP) -l {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(TARGET)/$(@:b).$(LANGFILEEXT)} -s $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre -o $@
--- solenv/inc/unitools.mk.old 2009-10-19 17:42:41.000000000 +0200
+++ solenv/inc/unitools.mk 2009-10-19 19:35:46.000000000 +0200
@@ -30,24 +30,24 @@
@@ -179,7 +179,7 @@
SCP_CHECK_TOOL:=checkscp$E
@@ -191,7 +191,7 @@ GNUTAR*:=tar
- TAR*:=tar
+ GNUTAR*:=tar
RM+=$(RMFLAGS)
-ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/adjustvisibility
diff --git a/patches/dev300/piece-build.diff b/patches/dev300/piece-build.diff
index 5ac3599..8a66f0d 100644
--- a/patches/dev300/piece-build.diff
+++ b/patches/dev300/piece-build.diff
@@ -1,32 +1,31 @@
---- solenv/bin/build.pl
-+++ solenv/bin/build.pl
-@@ -134,6 +134,7 @@
- $only_dependent = 0;
- $build_from = '';
+--- solenv/bin/build.pl.old 2010-05-19 19:57:28.000000000 +0200
++++ solenv/bin/build.pl 2010-06-22 16:03:40.000000000 +0200
+@@ -129,6 +129,7 @@
+ $all_dependent = 1; # a flag indicating if the hash has independent keys
+ $build_from_with_branches = '';
$build_all_cont = '';
+ $build_all_dirs = '';
$build_since = '';
$dlv_switch = '';
$child = 0;
-@@ -399,7 +405,14 @@
- sub BuildAll {
- if ($BuildAllParents) {
+@@ -628,7 +629,14 @@ sub reverse_dependensies {
+ sub build_all {
+ if ($build_all_parents) {
my ($Prj, $PrjDir, $orig_prj);
-- GetParentDeps( $CurrentPrj, \%global_deps_hash);
+ if ($build_all_dirs) {
+ print "Using crazy new --subdirs build for '$build_all_dirs'\n";
+ for my $d (split ':', $build_all_dirs) {
-+ GetParentDeps( $d, \%global_deps_hash);
++ get_parent_deps( $d, \%global_deps_hash);
+ }
+ } else {
-+ GetParentDeps( $CurrentPrj, \%global_deps_hash);
+ get_parent_deps( $initial_module, \%global_deps_hash);
+ }
if (scalar keys %active_modules) {
- $active_modules{$CurrentPrj}++;
- $modules_types{$CurrentPrj} = 'mod';
-@@ -893,6 +928,9 @@
- } else {
- $StandDir = cwd();
+ $active_modules{$initial_module}++;
+ $modules_types{$initial_module} = 'mod';
+@@ -1118,6 +1126,9 @@ sub get_stand_dir {
+ } else {
+ $StandDir = cwd();
};
+ if ($build_all_dirs) {
+ return "$StandDir/";
@@ -34,16 +33,16 @@
my $previous_dir = '';
do {
foreach (@possible_build_lists) {# ('build.lst', 'build.xlist');
-@@ -1236,6 +1275,8 @@
+@@ -1472,6 +1483,8 @@ sub get_options {
and $build_all_cont = $1 and next;
- $arg =~ /^-a:(\S+)$/ and $BuildAllParents = 1
+ $arg =~ /^-a:(\S+)$/ and $build_all_parents = 1
and $build_all_cont = $1 and next;
+ $arg =~ /^--subdirs:(.+)$/ and $BuildAllParents = 1
+ and $build_all_dirs = $1 and next;
if ($arg =~ /^--from$/ || $arg =~ /^-f$/) {
- $BuildAllParents = 1;
+ $build_all_parents = 1;
get_incomp_projects();
-@@ -2158,23 +2204,30 @@
+@@ -2226,24 +2239,31 @@ sub get_tmp_dir {
sub retrieve_build_list {
my $module = shift;
my $old_fh = select(STDOUT);
@@ -59,13 +58,6 @@
- $solver_inc_dir = CorrectPath($solver_inc_dir);
$dead_parents{$module}++;
- print "Fetching dependencies for module $module from solver...";
-- foreach (@possible_build_lists) {
-- my $possible_build_lst = "$solver_inc_dir/$_";
-- if (-e $possible_build_lst) {
-- print " ok\n";
-- select($old_fh);
-- return $possible_build_lst;
-- };
+ push @search_dirs, CorrectPath($solver_inc_dir);
+ if (defined $ENV{SOLARPIECEVERSION}) {
+ push (@search_dirs, CorrectPath($ENV{SOLARPIECEVERSION}."/inc/$module"));
@@ -73,14 +65,19 @@
+
+ print "Fetching dependencies for module $module from solvers @search_dirs...\n";
+ foreach my $dir (@search_dirs) {
-+ foreach (@possible_build_lists) {
+ foreach (@possible_build_lists) {
+- my $possible_build_lst = "$solver_inc_dir/$_";
+ my $possible_build_lst = "$dir/$_";
-+ if (-e $possible_build_lst) {
+ if (-e $possible_build_lst) {
+- print " ok\n";
+- select($old_fh);
+- return $possible_build_lst;
+ print " ok\n";
+ select($old_fh);
+ return $possible_build_lst;
-+ };
-+ }
+ };
}
++ }
print " failed\n";
+ if (!defined $dead_parents{$module}) {
diff --git a/patches/dev300/piece-deliver.diff b/patches/dev300/piece-deliver.diff
index ed8c532..f3f2338 100644
--- a/patches/dev300/piece-deliver.diff
+++ b/patches/dev300/piece-deliver.diff
@@ -1,6 +1,6 @@
---- solenv/bin/deliver.pl
-+++ solenv/bin/deliver.pl
-@@ -440,6 +440,13 @@
+--- solenv/bin/deliver.pl.old 2010-05-19 19:57:28.000000000 +0200
++++ solenv/bin/deliver.pl 2010-06-22 16:09:23.000000000 +0200
+@@ -443,6 +443,13 @@ sub parse_options
$opt_force = 1 if $opt_delete;
}
@@ -14,19 +14,20 @@
sub init_globals
{
my $ext;
-@@ -458,10 +465,10 @@
+@@ -461,11 +468,11 @@ sub init_globals
my $build_sosl = $ENV{'BUILD_SOSL'};
my $common_outdir = $ENV{'COMMON_OUTDIR'};
my $inpath = $ENV{'INPATH'};
- my $solarversion = $ENV{'SOLARVERSION'};
my $updater = $ENV{'UPDATER'};
my $updminor = $ENV{'UPDMINOR'};
+ my $updminorext = $ENV{'UPDMINOREXT'};
my $work_stamp = $ENV{'WORK_STAMP'};
+ my $solarversion = get_dest_base();
# special security check for release engineers
if ( defined($updater) && !defined($build_sosl) && !$opt_force) {
-@@ -1144,8 +1151,8 @@
+@@ -1165,8 +1172,8 @@ sub push_on_loglist
warn "Neither common nor platform tree?";
return;
}
diff --git a/patches/dev300/piece-helpcontent2.diff b/patches/dev300/piece-helpcontent2.diff
index 7297fc6..c3bd611 100644
--- a/patches/dev300/piece-helpcontent2.diff
+++ b/patches/dev300/piece-helpcontent2.diff
@@ -12,7 +12,7 @@
--- helpcontent2/settings.pmk.old 2010-02-02 12:49:41.000000000 +0100
+++ helpcontent2/settings.pmk 2010-03-09 11:27:48.000000000 +0100
@@ -1,11 +1,11 @@
- .INCLUDE : $(INCCOM)$/aux_langs.mk
+ .INCLUDE : $(LOCAL_COMMON_OUT)/inc$/aux_langs.mk
-my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/HelpIndexerTool.jar$
+my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SPLITUREDIR)$/share$/java$/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/unoil.jar$(PATH_SEPERATOR)$(SPLITUREDIR)$/share$/java$/ridl.jar$(PATH_SEPERATOR)$(SPLITUREDIR)$/share$/java$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/HelpIndexerTool.jar$
diff --git a/patches/dev300/piece-l10n.diff b/patches/dev300/piece-l10n.diff
index 5ef3c57..5764c4b 100644
--- a/patches/dev300/piece-l10n.diff
+++ b/patches/dev300/piece-l10n.diff
@@ -1,10 +1,10 @@
--- l10n/source/makefile.mk.old 2009-12-01 17:12:34.000000000 +0100
+++ l10n/source/makefile.mk 2009-12-01 17:12:01.000000000 +0100
@@ -107,6 +107,6 @@ $(COMMONMISC)$/merge.done : $(all_sdfs)
- -rm -rf $(COMMONMISC)$/sdf$(INPATH)_begone
- -$(MKDIRHIER) $(COMMONMISC)$/sdf
+ -rm -rf $(COMMONMISC)/sdf$(INPATH)_begone
+ -$(MKDIRHIER) $(COMMONMISC)/sdf
.ENDIF # "$(L10n_LOCK)" != "YES"
-- $(PERL) $(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/fast_merge.pl -sdf_files $(mktmp $<) -merge_dir $(COMMONMISC)$/sdf && echo $< >$@
-+ $(PERL) $(SOLARPIECE)$/$(INPATH)$/bin$(UPDMINOREXT)$/fast_merge.pl -sdf_files $(mktmp $<) -merge_dir $(COMMONMISC)$/sdf && echo $< >$@
-
+- $(PERL) $(SOLARVER)/$(INPATH)/bin$(UPDMINOREXT)/fast_merge.pl -sdf_files $(mktmp $<) -merge_dir $(COMMONMISC)/sdf && $(TOUCH) $@
++ $(PERL) $(SOLARPIECE)/$(INPATH)/bin$(UPDMINOREXT)/fast_merge.pl -sdf_files $(mktmp $<) -merge_dir $(COMMONMISC)/sdf && $(TOUCH) $@
+ $(COPY) $(PRJ)/localization_present.mk $(PRJ)/$(COMMON_OUTDIR)$(PROEXT)/inc
.ENDIF
diff --git a/patches/dev300/piece-odk.diff b/patches/dev300/piece-odk.diff
index be0607f..0986bfa 100644
--- a/patches/dev300/piece-odk.diff
+++ b/patches/dev300/piece-odk.diff
@@ -22,46 +22,43 @@
--- odk/util/makefile.pmk.old 2009-04-02 12:54:49.000000000 +0200
+++ odk/util/makefile.pmk 2009-04-14 17:35:01.000000000 +0200
-@@ -72,7 +72,7 @@ CONVERTTAGSCRIPT=$(SOLARENV)$/bin$/conve
+@@ -68,7 +68,7 @@ CONVERTTAGSCRIPT=$(SOLARENV)/bin/convert
CONVERTTAGFLAGNAME=converttags_html_files.flag
- CONVERTTAGFLAG = $(MISC)$/$(CONVERTTAGFLAGNAME)
+ CONVERTTAGFLAG = $(MISC)/$(CONVERTTAGFLAGNAME)
--MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)$/autodoc
-+MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARPIECE)$/$(INPATH)$/bin$/autodoc
+-MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/autodoc
++MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARPIECE)/$(INPATH)/bin/autodoc
.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
MY_COPY=$(GNUCOPY)
--- odk/util/odk_rules.pmk.old 2009-04-02 12:54:49.000000000 +0200
+++ odk/util/odk_rules.pmk 2009-04-15 16:52:42.000000000 +0200
-@@ -64,16 +64,16 @@ $(DESTDIR)$/configure.pl : $(PRJ)$/confi
- -chmod 755 $@
- .ENDIF
+@@ -54,13 +54,13 @@ $(DESTDIR)/configure.pl : $(PRJ)/configu
+ @@-rm -f $@
+ $(MY_TEXTCOPY) $(PRJ)/configure.pl $@
--$(DESTDIR)$/config.guess : $(SRC_ROOT)$/config.guess
-+$(DESTDIR)$/config.guess : $(SOLARVER)$/bin$/config.guess
- @@-rm -f $@
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SRC_ROOT)$/config.guess $(MY_TEXTCOPY_TARGETPRE) $@
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SOLARVER)$/bin$/config.guess $(MY_TEXTCOPY_TARGETPRE) $@
- .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
- -chmod 755 $@
- .ENDIF
+-$(DESTDIR)/config.guess : $(SRC_ROOT)/config.guess
++$(DESTDIR)/config.guess : $(SOLARVER)/bin/config.guess
+ @@-rm -f $@
+- $(MY_TEXTCOPY) $(SRC_ROOT)/config.guess $@
++ $(MY_TEXTCOPY) $(SOLARVER)/bin/config.guess $@
--$(DESTDIR)$/config.sub : $(SRC_ROOT)$/config.sub
-+$(DESTDIR)$/config.sub : $(SOLARVER)$/bin$/config.sub
- @@-rm -f $@
-- $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SRC_ROOT)$/config.sub $(MY_TEXTCOPY_TARGETPRE) $@
-+ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SOLARVER)$/bin$/config.sub $(MY_TEXTCOPY_TARGETPRE) $@
- .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
- -chmod 755 $@
- .ENDIF
-@@ -137,6 +137,10 @@ $(DESTDIRBIN)$/%$(EXEPOSTFIX) : $(BINOUT
- @@-rm -f $@
- $(GNUCOPY) $(BINOUT)$/$(@:f) $@
+-$(DESTDIR)/config.sub : $(SRC_ROOT)/config.sub
++$(DESTDIR)/config.sub : $(SOLARVER)/bin/config.sub
+ @@-rm -f $@
+- $(MY_TEXTCOPY) $(SRC_ROOT)/config.sub $@
++ $(MY_TEXTCOPY) $(SOLARVER)/bin/config.sub $@
-+$(DESTDIRBIN)$/%$(EXEPOSTFIX) : $(SOLARPIECE)$/$(INPATH)$/bin$/%$(EXEPOSTFIX)
+ $(DESTDIR)/setsdkenv_unix : $(PRJ)/setsdkenv_unix
+ @@-rm -f $@
+@@ -105,6 +105,10 @@ $(DESTDIRBIN)/%$(EXEPOSTFIX) : $(BINOUT)
+ @@-rm -f $@
+ $(GNUCOPY) $(BINOUT)/$(@:f) $@
+
++$(DESTDIRBIN)/%$(EXEPOSTFIX) : $(SOLARPIECE)/$(INPATH)/bin/%$(EXEPOSTFIX)
+ @@-rm -f $@
-+ $(GNUCOPY) $(SOLARPIECE)$/$(INPATH)$/bin$/$(@:f) $@
++ $(GNUCOPY) $(SOLARPIECE)/$(INPATH)/bin/$(@:f) $@
+
- $(DESTDIRBIN)$/%.bin : $(BINOUT)$/%.bin
- @@-rm -f $@
- $(GNUCOPY) $(BINOUT)$/$(@:f) $@
+ $(DESTDIRBIN)/%.bin : $(BINOUT)/%.bin
+ @@-rm -f $@
+ $(GNUCOPY) $(BINOUT)/$(@:f) $@
diff --git a/patches/dev300/piece-packimages.diff b/patches/dev300/piece-packimages.diff
index e2cb2a5..459474e 100644
--- a/patches/dev300/piece-packimages.diff
+++ b/patches/dev300/piece-packimages.diff
@@ -8,7 +8,7 @@
IMAGES := $(COMMONBIN)$/images.zip
SORTED_LIST=$(RES)$/img$/sorted.lst
# Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially
- CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango classic oxygen
+ CUSTOM_IMAGE_SETS=hicontrast industrial crystal oxygen tango classic
CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
-CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango
-CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
@@ -16,24 +16,19 @@
+CUSTOM_PREFERRED_FALLBACK_2*=-c $(IMGSRC)$/ooo_custom_images$/industrial
-CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz
+-OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz
-CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
--OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images.tar.gz
+CRYSTAL_TARBALL=$(IMGSRC)$/external_images$/ooo_crystal_images-1.tar.gz
++OXYGEN_TARBALL=$(IMGSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz
+CLASSIC_TARBALL=$(IMGSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
-+OXYGEN_TARBALL=$(IMGSRC)$/external_images$/ooo_oxygen_images.tar.gz
ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip
-@@ -62,17 +63,17 @@
+@@ -62,13 +63,13 @@
@@-$(MKDIR) $(RES)$/img
#+-$(RM) $@ $@.$(INPATH)
- .IF "$(use_shell)"!="4nt"
- $(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(SOLARSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH)
+ $(FIND) $(IMGSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(IMGSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH)
- .ELSE # "$(use_shell)"!="4nt"
-- $(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s/$(SOLARSRC:s/\/./).$(RSCDEFIMG)\/res/%%GLOBALRES%%/" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH)
-+ $(FIND) $(IMGSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s/$(IMGSRC:s/\/./).$(RSCDEFIMG)\/res/%%GLOBALRES%%/" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH)
- .ENDIF # "$(use_shell)"!="4nt"
$(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@
$(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst
diff --git a/patches/dev300/piece-postprocess.diff b/patches/dev300/piece-postprocess.diff
index 62c7bfe..acf6e98 100644
--- a/patches/dev300/piece-postprocess.diff
+++ b/patches/dev300/piece-postprocess.diff
@@ -1,10 +1,11 @@
--- postprocess/checkdeliver/makefile.mk.old 2010-04-15 08:57:00.000000000 +0200
+++ postprocess/checkdeliver/makefile.mk 2010-04-21 16:43:14.000000000 +0200
-@@ -38,5 +38,7 @@ TARGET=checkdeliver
+@@ -38,6 +38,7 @@ TARGET=checkdeliver
ALLTAR : $(MISC)$/checkdeliver.done
$(MISC)$/checkdeliver.done .PHONY:
-- $(PERL) checkdeliver.pl && $(TOUCH) $@
+- @-$(RM) $(MISC)$/checkdeliver_log.txt
+- $(PERL) checkdeliver.pl -l $(MISC)$/checkdeliver_log.txt && $(TOUCH) $@
+ # FIXME: the output was always ignored until ooo320-m15; it would be nice to check it though
+ # $(PERL) checkdeliver.pl && $(TOUCH) $@
+ $(TOUCH) $@
diff --git a/patches/dev300/piece-scp2.diff b/patches/dev300/piece-scp2.diff
index 60c2c36..7f8b542 100644
--- a/patches/dev300/piece-scp2.diff
+++ b/patches/dev300/piece-scp2.diff
@@ -1,7 +1,7 @@
--- scp2/prj/build.lst.old 2010-03-05 19:59:27.000000000 +0100
+++ scp2/prj/build.lst 2010-03-05 20:25:14.000000000 +0100
@@ -1,4 +1,4 @@
--cp scp2 : l10n setup_native transex3 PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
+-cp scp2 : l10n i18npool setup_native l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
+cp scp2 : soltools PYTHON:python ICU:icu NULL
cp scp2 usr1 - all cp_mkout NULL
cp scp2\macros nmake - all cp_langmacros NULL
diff --git a/patches/dev300/piece-services.diff b/patches/dev300/piece-services.diff
index d5ff8fa..3f217d6 100644
--- a/patches/dev300/piece-services.diff
+++ b/patches/dev300/piece-services.diff
@@ -123,8 +123,8 @@ diff -u -r solenv.pristine/bin/modules/installer/servicesfile.pm solenv/bin/modu
--- solenv.pristine/bin/modules/installer/servicesfile.pm 2008-08-13 14:01:56.000000000 +0100
+++ solenv/bin/modules/installer/servicesfile.pm 2008-08-14 16:30:39.000000000 +0100
@@ -138,6 +138,7 @@
- for ( my $i = 0; $i <= $#{$unocomponents}; ++$i )
- {
+ my $local_error2_occured = 0;
+
my $sourcepath = make_file_url(${$unocomponents}[$i]->{'sourcepath'});
+ defined $ENV{OO_BUILD_SERVICES} && $sourcepath eq "" && next;
my $urlprefix = ${$unocomponents}[$i]->{'NativeServicesURLPrefix'};
diff --git a/patches/dev300/piece-setup_native.diff b/patches/dev300/piece-setup_native.diff
index f9b4be8..049b6a9 100644
--- a/patches/dev300/piece-setup_native.diff
+++ b/patches/dev300/piece-setup_native.diff
@@ -1,7 +1,7 @@
--- setup_native/prj/build.lst.old 2009-04-02 13:05:47.000000000 +0200
+++ setup_native/prj/build.lst 2009-04-08 12:34:02.000000000 +0200
@@ -1,7 +1,5 @@
- pk setup_native : transex3 soltools sal xml2cmp NULL
+ pk setup_native : l10n l10ntools soltools sal xml2cmp NULL
pk setup_native usr1 - all sn_mkout NULL
-pk setup_native\scripts\source nmake - u sn_source NULL
-pk setup_native\scripts nmake - u sn_scripts sn_source.u NULL
diff --git a/patches/dev300/piece-startup.diff b/patches/dev300/piece-startup.diff
index 27d285f..d0cdb98 100644
--- a/patches/dev300/piece-startup.diff
+++ b/patches/dev300/piece-startup.diff
@@ -8,4 +8,4 @@
+.INCLUDEDIRS : $(DMAKE_INC) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) $(SOLARPIECE)$/$(INPATH)$/inc$(UPDMINOREXT) $(SOLARENV)$/inc
# Grab key definitions from the environment
- # .IMPORT .IGNORE : OS TMPDIR SHELL UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME CVER GVER COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT VCL SO3 ENVCFLAGS
+ # .IMPORT .IGNORE : OS TMPDIR UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME CVER GVER COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT VCL SO3 ENVCFLAGS
diff --git a/patches/dev300/piece-svx.diff b/patches/dev300/piece-svx.diff
index f3ebbda..02d34ac 100644
--- a/patches/dev300/piece-svx.diff
+++ b/patches/dev300/piece-svx.diff
@@ -1,14 +1,16 @@
--- svx/sdi/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
+++ svx/sdi/makefile.mk 2010-03-05 20:09:17.000000000 +0100
-@@ -50,7 +50,7 @@ SVSDI1DEPEND= \
+@@ -50,8 +50,8 @@ SVSDI1DEPEND= \
+ # --- Files --------------------------------------------------------
+
+ SVSDI1DEPEND= \
+- $(SOLARINCXDIR)$/sfx2/sfx.sdi \
+- $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
++ $(SOLARPIECE)$/$(INPATH)$/inc$/sfx2/sfx.sdi \
++ $(SOLARPIECE)$/$(INPATH)$/inc$/sfx2/sfxitems.sdi \
svxitems.sdi \
fmslots.sdi \
svx.sdi \
-- $(SOLARINCXDIR)$/sfxslots.ilb \
-+ $(SOLARPIECE)$/$(INPATH)$/inc$/sfxslots.ilb \
- xoitems.sdi \
- svxitems.sdi
-
--- svx/util/makefile.mk.old 2010-03-05 19:59:26.000000000 +0100
+++ svx/util/makefile.mk 2010-03-05 20:09:17.000000000 +0100
@@ -307,7 +307,7 @@ SRSFILELIST=\
diff --git a/patches/dev300/piece-target.diff b/patches/dev300/piece-target.diff
index f1de2fe..3c51569 100644
--- a/patches/dev300/piece-target.diff
+++ b/patches/dev300/piece-target.diff
@@ -6,8 +6,8 @@ diff -u -p -r1.209 target.mk
--- solenv/inc/target.mk 6 Jun 2008 12:00:28 -0000 1.209
+++ solenv/inc/target.mk 4 Jul 2008 15:25:03 -0000
@@ -48,16 +48,16 @@
- ENVINCPRE+=-I$(PRE)/inc
- .ENDIF # "$(PRE)"!=""
+ INCPRE*=.
+ INCPOST*=.
.IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
-UNOINCLUDES=$(SOLARINCDIR)/offuh
+UNOINCLUDES*=-I$(SOLARINCDIR)/offuh
@@ -17,11 +17,11 @@ diff -u -p -r1.209 target.mk
INCLUDE:=
.EXPORT : INCLUDE
.IF "$(PRJINC)"!=""
--INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
-+INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) $(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
+-INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
++INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) $(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
.ELSE # "$(PRJINC)"!=""
--INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
-+INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) $(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
+-INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
++INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) $(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
.ENDIF # "$(PRJINC)"!=""
INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
.EXPORT : LIB
@@ -33,8 +33,8 @@ diff -u -p -r1.209 target.mk
+NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SPLITINSTALLDIR)/classes/$i $(NULL)))
+NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SPLITUREDIR)/share/java/$i $(NULL)))
.ENDIF # "$(JARFILES)"!=""
- .IF "$(EXTRAJARFILES)"!=""
- NEWCLASS+=$(foreach,i,$(EXTRAJARFILES) $(COMMON_BUILD_TOOLS)/$i)
+ NEWCLASS+=$(EXTRAJARFILES)
+ .IF "$(GENJAVACLASSFILES)"!=""
Index: unxlng.mk
@@ -54,16 +54,16 @@ Index: unxlng.mk
+++ solenv/inc/settings.mk
@@ -764,6 +764,7 @@
.ELSE
- SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl$(EXT_UPDMINOR)
+ SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl$(UPDMINOREXT)
.ENDIF
+SOLARIDLINC*=-I$(SOLARIDLDIR)
- .IF "$(UPDMINOR)" != ""
- EXT_UPDMINOR=.$(UPDMINOR)
+ #.IF "$(UPDMINOR)" != ""
+ #UPDMINOREXT=.$(UPDMINOR)
@@ -861,7 +861,7 @@
- .IF "$(PRE)"!=""
- UNOIDLINC!:=-I$(PRE)/idl $(UNOIDLINC)
- .ENDIF
+
+ UNOIDLDEPFLAGS=-Mdepend=$(SOLARVER)
+
-UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR)
+UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc $(SOLARIDLINC) -I$(SOLARINCDIR)
diff --git a/patches/dev300/piece-transex3.diff b/patches/dev300/piece-transex3.diff
index ea9165c..f4a998a 100644
--- a/patches/dev300/piece-transex3.diff
+++ b/patches/dev300/piece-transex3.diff
@@ -3,12 +3,12 @@
@@ -13,8 +13,13 @@ if [ x${SOLARENV}x = xx ]; then
fi
- if [ x${SOLARVER}x = xx -o x${UPDMINOR}x = xx ]; then
+ if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx ]; then
- exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@"
+ bindir=bin
else
-- exec perl -w $SOLARVERSION/$INPATH/bin.$UPDMINOR/localize.pl "$@"
-+ bindir=bin.$UPDMINOR
+- exec perl -w $SOLARVERSION/$INPATH/bin$UPDMINOREXT/localize.pl "$@"
++ bindir=bin$UPDMINOREXT
fi
+if test -f $SOLARVERSION/$INPATH/$bindir/localize.pl ; then
@@ -16,13 +16,13 @@
+else
+ exec perl -w $SOLARPIECE/$INPATH/$bindir/localize.pl "$@"
+fi
---- transex3/scripts/localize.pl.old1 2010-02-17 18:05:32.000000000 +0100
-+++ transex3/scripts/localize.pl 2010-02-17 18:06:53.000000000 +0100
+--- l10ntools/scripts/localize.pl.old1 2010-02-17 18:05:32.000000000 +0100
++++ l10ntools/scripts/localize.pl 2010-02-17 18:06:53.000000000 +0100
@@ -403,7 +403,7 @@ sub merge_gsicheck{
close ( $TMPHANDLE );
$command = "$ENV{WRAPCMD} " if( $ENV{WRAPCMD} );
-- $command .= fix_cygwin_path("$ENV{SOLARVER}/$ENV{INPATH}/bin/gsicheck");
+- $command .= "$ENV{SOLARVER}/$ENV{INPATH}/bin/gsicheck";
+ $command .= "gsicheck";
my $errfile = $sdffile.".err";
diff --git a/patches/dev300/piece-writerfilter.diff b/patches/dev300/piece-writerfilter.diff
index 7c6d839..89f9746 100644
--- a/patches/dev300/piece-writerfilter.diff
+++ b/patches/dev300/piece-writerfilter.diff
@@ -11,14 +11,3 @@
$(TOKENXML): tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter
@$(TYPE) tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter > $@
-@@ -192,8 +192,8 @@ $(TOKENXML): tokenxmlheader $(TOKENXMLTM
- $(MISC)$/$(OOXMLPREPROCESSXSL): $(OOXMLPREPROCESSXSL)
- @$(COPY) $(PWD)$/$(OOXMLPREPROCESSXSL) $(MISC)
-
--$(NSXSL) : $(OOXMLMODEL) $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/namespaces.txt $(NSPROCESS)
-- $(COMMAND_ECHO)$(PERL) $(NSPROCESS) $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/namespaces.txt > $@
-+$(NSXSL) : $(OOXMLMODEL) $(SOLARPIECE)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/namespaces.txt $(NSPROCESS)
-+ $(COMMAND_ECHO)$(PERL) $(NSPROCESS) $(SOLARPIECE)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/namespaces.txt > $@
-
-
- $(MODELPROCESSED): $(NSXSL) $(MISC)$/$(OOXMLPREPROCESSXSL) $(OOXMLMODEL)
diff --git a/patches/dev300/piece-xmerge.diff b/patches/dev300/piece-xmerge.diff
index ce1528b..4844e4e 100644
--- a/patches/dev300/piece-xmerge.diff
+++ b/patches/dev300/piece-xmerge.diff
@@ -1,19 +1,17 @@
diff -u -r xmerge/java/build.xml xmerge/java/build.xml
--- xmerge/java/build.xml 2008-04-10 18:13:36.000000000 +0100
+++ xmerge/java/build.xml 2008-08-11 20:49:44.000000000 +0100
-@@ -60,11 +60,11 @@
+@@ -60,10 +60,10 @@
<pathelement location="${solar.jar}/xalan.jar"/>
<pathelement location="${solar.jar}/xml-apis.jar"/>
<pathelement location="${solar.jar}/xerces.jar"/>
- <pathelement location="${solar.jar}/jurt.jar"/>
- <pathelement location="${solar.jar}/unoil.jar"/>
- <pathelement location="${solar.jar}/ridl.jar"/>
-- <pathelement location="${solar.jar}/sandbox.jar"/>
- <pathelement location="${solar.jar}/juh.jar"/>
+ <pathelement location="${split.ure}/share/java/jurt.jar"/>
+ <pathelement location="${split.install}/classes/unoil.jar"/>
+ <pathelement location="${split.ure}/share/java/ridl.jar"/>
-+ <pathelement location="${split.install}/classes/sandbox.jar"/>
+ <pathelement location="${split.ure}/share/java/juh.jar"/>
<pathelement location="${solar.jar}/jmc.jar"/>
</path>
More information about the ooo-build-commit
mailing list