From b23846d15e5f64ddfc4f198991f51427a822042a Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 26 Apr 2011 17:08:19 +0200 Subject: bump product version to 3.4.0-beta3, release number to 3 --- solenv/inc/minor.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 6d45a96930c9..f3346e78066b 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m103(Build:2) -BUILD=2 +RSCREVISION=300m103(Build:3) +BUILD=3 LAST_MINOR=m103 SOURCEVERSION=DEV300 -- cgit From 7b7214e5a3dca290af69307ec31c15b2d9e7d972 Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Wed, 27 Apr 2011 14:18:56 +0200 Subject: set STAR_RESOURCEPATH before calling gdb --- solenv/gbuild/CppunitTest.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index d7ec6f04ad1f..df8e8a651ff0 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -36,7 +36,7 @@ export DBGSV_ERROR_OUT # gb_CppunitTest_TARGETTYPE # gb_CppunitTest_get_filename gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunit/cppunittester) -gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) $(gb_CppunitTest_GDBTRACE) STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) $(gb_CppunitTest_CPPTESTTARGET) +gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_CPPTESTTARGET) gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1)) .PHONY : $(call gb_CppunitTest_get_clean_target,%) -- cgit From 2c2c275f16ae1d6d9a27f95905548018a745c706 Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Wed, 27 Apr 2011 17:42:07 +0200 Subject: add -DBOOST_NO_EXCEPTIONS to gb_LinkTarget_NOEXCEPTIONFLAGS --- solenv/gbuild/platform/openbsd.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'solenv') diff --git a/solenv/gbuild/platform/openbsd.mk b/solenv/gbuild/platform/openbsd.mk index 92654afa5923..d82a54d812ce 100755 --- a/solenv/gbuild/platform/openbsd.mk +++ b/solenv/gbuild/platform/openbsd.mk @@ -41,6 +41,8 @@ gb_STDLIBS := pthread include $(GBUILDDIR)/platform/unxgcc.mk +gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS + define gb_LinkTarget__command_dynamiclink $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ -- cgit From 2f734f54a6b5e2d4eec75f5515c6069517be673c Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Tue, 26 Apr 2011 10:27:13 +0200 Subject: put L10N_MODULE definition to set_soenv instead of settings.mk and remove alternative l10n locations from settings.mk --- solenv/inc/settings.mk | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 356bda2c9d90..e15a8e0921f3 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -809,23 +809,9 @@ SOLARCOMMONSDFDIR=$(SOLARSDFDIR) .EXPORT : SOLARBINDIR -.IF "$(GUI)" == "WNT" -L10N_MODULE*=$(shell cygpath -m $(SRC_ROOT)/translations) -.ELSE -L10N_MODULE*=$(SRC_ROOT)/translations -.ENDIF -ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so - .IF "$(WITH_LANG)"!="" .INCLUDE .IGNORE: $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk -.INCLUDE .IGNORE: $(ALT_L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk - -# check for localizations not hosted in l10n module. if a file exists there -# it won't in l10n -.IF "$(ALT_LOCALIZATION_FOUND)"!="" -TRYALTSDF:=$(ALT_L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf -LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYALTSDF) $(THEN) echo $(TRYALTSDF) $(FI))) -.ENDIF # "$(ALT_LOCALIZATION_FOUND)"!="" + # if the l10n module exists, use split localize.sdf directly from there .IF "$(LOCALIZATION_FOUND)"!="" && "$(LOCALIZESDF)"=="" # still check for existence as there may be no localization yet -- cgit From e94687599c677e87fcd063452dec818ae89aa50c Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sun, 1 May 2011 17:11:04 +0200 Subject: sync langlist.mk and postset.mk (supported UI languages) langlist.mk was used by gnumake modules postset.mk was used by dmake modules unsupported languages were removed from langlist.mk postset.mk now includes langlist.mk to avoid duplication --- solenv/inc/langlist.mk | 37 +---------------- solenv/inc/postset.mk | 107 +------------------------------------------------ 2 files changed, 4 insertions(+), 140 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk index 18680e77ce38..31b5ba2e8736 100644 --- a/solenv/inc/langlist.mk +++ b/solenv/inc/langlist.mk @@ -25,10 +25,10 @@ # #************************************************************************* +# Complete list of all supported localizations (ISO codes) completelangiso=af \ ar \ as \ -as-IN \ ast \ be \ bo \ @@ -36,10 +36,7 @@ bg \ br \ brx \ bn \ -bn-BD \ -bn-IN \ bs \ -by \ ca \ ca-XV \ cs \ @@ -59,26 +56,18 @@ eu \ fa \ fi \ fr \ -fur \ ga \ -gd \ gl \ gu \ -gu-IN \ he \ hi \ -hi-IN \ hr \ -ht \ hu \ +id \ is \ it \ ja \ -jbo \ -kid \ -ky \ ka \ -kab \ kk \ km \ kn \ @@ -93,11 +82,8 @@ mai \ mk \ mn \ mni \ -ms \ ml \ -ml-IN \ mr \ -mr-IN \ my \ ne \ nb \ @@ -105,56 +91,37 @@ nl \ nn \ nr \ nso \ -ny \ om \ -oms \ oc \ or \ -or-IN \ -pap \ -pa \ pa-IN \ pl \ -ps \ pt \ pt-BR \ -gug \ -pyg \ ro \ ru \ rw \ sat \ -sa \ sa-IN \ si \ -sc \ sd \ sq \ sk \ sl \ sh \ -so \ sr \ ss \ st \ sv \ -sw \ sw-TZ \ te \ -te-IN \ -ti \ -ti-ER \ ta \ -ta-IN \ -tlh \ th \ tn \ tr \ ts \ tg \ ug \ -ur \ -ur-IN \ uk \ uz \ ve \ diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk index 487cc8f2d559..3d4f4158d08f 100644 --- a/solenv/inc/postset.mk +++ b/solenv/inc/postset.mk @@ -29,110 +29,7 @@ # This language will be always included! defaultlangiso=en-US -# Complete list of all supported ISO codes -completelangiso=af \ -ar \ -as \ -ast \ -be \ -bo \ -bg \ -br \ -brx \ -bn \ -bs \ -ca \ -ca-XV \ -cs \ -cy \ -da \ -de \ -dgo \ -dz \ -el \ -en-GB \ -en-US \ -en-ZA \ -eo \ -es \ -et \ -eu \ -fa \ -fi \ -fr \ -ga \ -gl \ -gu \ -he \ -hi \ -hr \ -hu \ -id \ -is \ -it \ -ja \ -ka \ -kk \ -km \ -kn \ -ko \ -kok \ -ks \ -ku \ -lo \ -lt \ -lv \ -mai \ -mk \ -mn \ -mni \ -ml \ -mr \ -my \ -ne \ -nb \ -nl \ -nn \ -nr \ -nso \ -om \ -oc \ -or \ -pa-IN \ -pl \ -pt \ -pt-BR \ -ro \ -ru \ -rw \ -sat \ -sa-IN \ -si \ -sd \ -sq \ -sk \ -sl \ -sh \ -sr \ -ss \ -st \ -sv \ -sw-TZ \ -te \ -ta \ -th \ -tn \ -tr \ -ts \ -tg \ -ug \ -uk \ -uz \ -ve \ -vi \ -xh \ -zh-CN \ -zh-TW \ -zu +# Complete list of all supported localizations (ISO codes) +.INCLUDE : langlist.mk alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG))))) -- cgit From 7e8f9a4db126a7112cc2619777d63461fc87e61b Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Thu, 28 Apr 2011 18:51:12 +0200 Subject: Run all tests in the en_US.UTF-8 locale. The locele affects some tests, eg. sc_ucalc.cxx. --- solenv/gbuild/CppunitTest.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index df8e8a651ff0..5c33719a2edb 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -36,7 +36,7 @@ export DBGSV_ERROR_OUT # gb_CppunitTest_TARGETTYPE # gb_CppunitTest_get_filename gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunit/cppunittester) -gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_CPPTESTTARGET) +gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) LANG=en_US.UTF-8 $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_CPPTESTTARGET) gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1)) .PHONY : $(call gb_CppunitTest_get_clean_target,%) -- cgit From 55fb624ac03cd353a34b593a2d8612eccbedff15 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 3 May 2011 14:27:06 +0200 Subject: ooinstall: respect DESTDIR The problem was that ooinstall just passed -destdir to make_installer.pl, but before that, it tried to create the root directory, where it did not respect DESTDIR. Signed-off-by: Petr Mladek --- solenv/bin/ooinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index 83717fa68e1e..47c06cb6b62e 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -29,7 +29,7 @@ for $arg (@ARGV) { $help = 1; } else { # Cwd::realpath does not work if the path does not exist - mkpath($arg) unless -d $arg; + mkpath($ENV{DESTDIR} . $arg) unless -d $ENV{DESTDIR} . $arg; $path = Cwd::realpath( $arg ); } } -- cgit From d27be9390fb0a5faee4f6bbcd5463c3907734c4a Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 3 May 2011 15:14:26 +0200 Subject: ooinstall: use DESTDIR also for the Cwd::realpath call this solution is not perfect because Cwd::realpath($ENV{DESTDIR}) need not be part of Cwd::realpath($ENV{DESTDIR} . $arg). Let's solve this when it really cause troubles. --- solenv/bin/ooinstall | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index 47c06cb6b62e..4afdb23d0133 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -30,7 +30,9 @@ for $arg (@ARGV) { } else { # Cwd::realpath does not work if the path does not exist mkpath($ENV{DESTDIR} . $arg) unless -d $ENV{DESTDIR} . $arg; - $path = Cwd::realpath( $arg ); + $path = Cwd::realpath( $ENV{DESTDIR} . $arg ); + my $destdir = Cwd::realpath( $ENV{DESTDIR} ); + $path =~ s|$destdir||; } } -- cgit From 643e82382d97f47fc5cea655ef37d55fd7a9572e Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 3 May 2011 20:00:22 +0200 Subject: bump product version to 3.4.0-beta4, release number to 4 --- solenv/inc/minor.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index f3346e78066b..fafb78820522 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m103(Build:3) -BUILD=3 +RSCREVISION=300m103(Build:4) +BUILD=4 LAST_MINOR=m103 SOURCEVERSION=DEV300 -- cgit From 708def7d94bb76ef137572a364d2643402dc590b Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Thu, 5 May 2011 07:50:18 +0200 Subject: Fix ooinstall -l case Removing destdir prefix for dev-install case is not a good idea --- solenv/bin/ooinstall | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'solenv') diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index 4afdb23d0133..89aea81a6741 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -28,11 +28,13 @@ for $arg (@ARGV) { } elsif ($arg eq '-h' || $arg eq '--help') { $help = 1; } else { - # Cwd::realpath does not work if the path does not exist - mkpath($ENV{DESTDIR} . $arg) unless -d $ENV{DESTDIR} . $arg; - $path = Cwd::realpath( $ENV{DESTDIR} . $arg ); - my $destdir = Cwd::realpath( $ENV{DESTDIR} ); - $path =~ s|$destdir||; + # Cwd::realpath does not work if the path does not exist + mkpath($ENV{DESTDIR} . $arg) unless -d $ENV{DESTDIR} . $arg; + $path = Cwd::realpath( $ENV{DESTDIR} . $arg ); + if (!$do_link) { + my $destdir = Cwd::realpath( $ENV{DESTDIR} ); + $path =~ s|$destdir||; + } } } -- cgit From 555cb7a51c5489e65338a32fe0d039fbbb5a4c98 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Thu, 5 May 2011 11:01:46 +0200 Subject: use $realpath() --- solenv/gbuild/AllLangResTarget.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 24123d1af125..2db1d80d2ece 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -47,7 +47,7 @@ gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target,transex3) # gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) $(gb_SrsPartMergeTarget_TRANSEXTARGET) -gb_SrsPartMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/ +gb_SrsPartMergeTarget_SDFLOCATION := $(realpath $(SRCDIR)/translations/$(INPATH)/misc/sdf/) gb_SrsPartMergeTarget_REPOS := $(gb_REPOS) define gb_SrsPartMergeTarget__command -- cgit From 4d7ae8d1436e43b9262fe722f7ea7ad8a395ddb0 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 6 May 2011 10:35:53 +0300 Subject: Use MKDIRHIER to avoid "File exists" errors (which are ignored, but still) --- solenv/inc/rules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index db97eddea355..0ff659c7ec1b 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -715,14 +715,14 @@ $(MISC)/%.sh : %.sh .IF "$(WITH_LANG)"!="" $(COMMONMISC)/$(TARGET)/%.ulf : %.ulf @echo "Making: " $(@:f) - $(COMMAND_ECHO)-$(MKDIR) $(@:d) + $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d) $(COMMAND_ECHO)-$(RM) $@ $(COMMAND_ECHO)$(ULFEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ $(COMMAND_ECHO)-$(RM) $@.$(INPATH) $(COMMONMISC)/$(TARGET)/%.xrb : %.xrb - $(COMMAND_ECHO)-$(MKDIR) $(@:d) + $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d) $(COMMAND_ECHO)-$(RM) $@ $(COMMAND_ECHO)$(XMLEX) -t xrb -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ -- cgit From 4c9275720e7593b020fd8c691ae58aa072a9fa3c Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sun, 8 May 2011 06:35:21 +0200 Subject: Revert "use $realpath()" - fdo#36927 This reverts commit 5fbddf4910999590edcf557efa1a6a4b9cdd5664. --- solenv/gbuild/AllLangResTarget.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 2db1d80d2ece..24123d1af125 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -47,7 +47,7 @@ gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target,transex3) # gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) $(gb_SrsPartMergeTarget_TRANSEXTARGET) -gb_SrsPartMergeTarget_SDFLOCATION := $(realpath $(SRCDIR)/translations/$(INPATH)/misc/sdf/) +gb_SrsPartMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/ gb_SrsPartMergeTarget_REPOS := $(gb_REPOS) define gb_SrsPartMergeTarget__command -- cgit From 87928074058740b003e71111d856ab02138cfa4a Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Mon, 9 May 2011 16:08:45 +0200 Subject: use Cwd::realpath to avoid confusion with symlinked dirs --- solenv/bin/modules/installer/parameter.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm index f17965fa3d7f..8c844d55609c 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -161,7 +161,7 @@ sub getparameter elsif ($param eq "-destdir") # new parameter for simple installer { $installer::globals::rootpath ne "" && die "must set destdir before -i or -simple"; - $installer::globals::destdir = shift @ARGV; + $installer::globals::destdir = Cwd::realpath( shift @ARGV ); } elsif ($param eq "-simple") # new parameter for simple installer { -- cgit From 746504762ea5b5412144d17555e995bac9f08941 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Mon, 9 May 2011 16:18:13 +0200 Subject: Unit test locale now forced by other means This was only working for Linux, anyway. --- solenv/gbuild/CppunitTest.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 5c33719a2edb..df8e8a651ff0 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -36,7 +36,7 @@ export DBGSV_ERROR_OUT # gb_CppunitTest_TARGETTYPE # gb_CppunitTest_get_filename gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunit/cppunittester) -gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) LANG=en_US.UTF-8 $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_CPPTESTTARGET) +gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_CPPTESTTARGET) gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1)) .PHONY : $(call gb_CppunitTest_get_clean_target,%) -- cgit From 949434f57ea1b2c3d9d15fade9c0730ee3b1dd9f Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 10 May 2011 18:03:46 +0200 Subject: bump product version to 3.4.0-beta5, release number to 5 --- solenv/inc/minor.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index fafb78820522..aad4f45bb97f 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m103(Build:4) -BUILD=4 +RSCREVISION=300m103(Build:5) +BUILD=5 LAST_MINOR=m103 SOURCEVERSION=DEV300 -- cgit From 25d454eb598e1110741c78b958d03f75fe22d815 Mon Sep 17 00:00:00 2001 From: Kalman Szalai - KAMI Date: Wed, 4 May 2011 04:45:32 +0200 Subject: Add OxygenOffice related settings * Start download package name with OOOP in case of OxygenOffice * Ability to create oxygenoffice product --- solenv/bin/modules/installer/download.pm | 2 ++ solenv/inc/productversion.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index 147d3358f134..59beee035d62 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -470,6 +470,8 @@ sub get_downloadname_productname if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "LibO-URE"; } + if ( $allvariables->{'PRODUCTNAME'} eq "OxygenOffice" ) { $start = "OOOP"; } + if ( $allvariables->{'PRODUCTNAME'} eq "BrOffice.org" ) { $start = "BrOo"; } if ( $allvariables->{'PRODUCTNAME'} eq "BrOo-dev" ) { $start = "BrOo-Dev"; } diff --git a/solenv/inc/productversion.mk b/solenv/inc/productversion.mk index 002c63ad71d6..948d0c044b00 100644 --- a/solenv/inc/productversion.mk +++ b/solenv/inc/productversion.mk @@ -25,7 +25,7 @@ # #************************************************************************* -PRODUCTLIST = libreoffice broffice +PRODUCTLIST = libreoffice broffice oxygenoffice # default values to minimize maintainance effort PRODUCTVERSION = 3.4 -- cgit From e0cd0ee1ec90d87c1fdda76d9c3576800f9e21ac Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Wed, 11 May 2011 17:48:21 +0200 Subject: change the version info so that we are not identified at runtime as 3.0.x - fixes https://bugs.freedesktop.org/show_bug.cgi?id=37017 Signed-off-by: Petr Mladek --- solenv/inc/minor.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index aad4f45bb97f..e079ebf4b26d 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ -RSCVERSION=300 -RSCREVISION=300m103(Build:5) +RSCVERSION=340 +RSCREVISION=340m1(Build:5) BUILD=5 -LAST_MINOR=m103 -SOURCEVERSION=DEV300 +LAST_MINOR=m1 +SOURCEVERSION=OOO340 -- cgit From 8516a7044a9ba1447d5d8317969eab335374a5da Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Mon, 16 May 2011 08:12:14 +0200 Subject: Reverting one Oxygenoffice change until _KAMI_ makes it work --- solenv/inc/productversion.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/inc/productversion.mk b/solenv/inc/productversion.mk index 948d0c044b00..002c63ad71d6 100644 --- a/solenv/inc/productversion.mk +++ b/solenv/inc/productversion.mk @@ -25,7 +25,7 @@ # #************************************************************************* -PRODUCTLIST = libreoffice broffice oxygenoffice +PRODUCTLIST = libreoffice broffice # default values to minimize maintainance effort PRODUCTVERSION = 3.4 -- cgit From 4ba26e3dd2dbf10ffeaa5151758b3ea82f238ebf Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 17 May 2011 19:38:48 +0200 Subject: bump product version to 3.4.0-rc1, release number to 11 --- solenv/inc/minor.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index e079ebf4b26d..abc4c85de59e 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=340 -RSCREVISION=340m1(Build:5) -BUILD=5 +RSCREVISION=340m1(Build:11) +BUILD=11 LAST_MINOR=m1 SOURCEVERSION=OOO340 -- cgit From d977dace19c84931f1653cab67ef066c7f6cd8a4 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 4 May 2011 01:55:36 +0200 Subject: always request an unversioned lib from gcc in gccinstlib.pl * this otherwise breaks on ubuntu natty as there is (rightfully) no libgcc_s.so.1 file served by gcc -print-file-name --- solenv/bin/gccinstlib.pl | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'solenv') diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl index 90c8f02a3e06..654c95b7290a 100755 --- a/solenv/bin/gccinstlib.pl +++ b/solenv/bin/gccinstlib.pl @@ -38,19 +38,23 @@ if ($Dest =~ /--help/ || @ARGV < 1) { print "Syntax:\n gcc-instlib \n"; exit (0); } + +%SrcAndDest = (); + foreach $File (@ARGV) { my $string; - - open (GCCOut, "LANGUAGE=C LC_ALL=C $cc -print-file-name=$File|") || die "Failed to exec $cc -print-file-name=$File $!"; + my $normalized_file = $File; + $normalized_file =~ s/\.so\.\d+/.so/; + open (GCCOut, "LANGUAGE=C LC_ALL=C $cc -print-file-name=$normalized_file|") || die "Failed to exec $cc -print-file-name=$normalized_file $!"; $string=; chomp ($string); - push (@CopySrc, $string); + $SrcAndDest{$string} = "$Dest/$File"; close (GCCOut); } -foreach $Src (@CopySrc) { - printf "copy $Src to $Dest\n"; - system ("/bin/cp $Src $Dest") && die "copy failed: $!"; +while (($Src, $FullDest) = each %SrcAndDest) { + printf "copy $Src to $FullDest\n"; + system ("/bin/cp $Src $FullDest") && die "copy failed: $!"; } -- cgit From 00a5e20188d9b4e98f6519472245adff86e14740 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 24 May 2011 19:14:13 +0200 Subject: bump product version to 3.4.0-rc2, release number to 12 --- solenv/inc/minor.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index abc4c85de59e..dff20c4927c9 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=340 -RSCREVISION=340m1(Build:11) -BUILD=11 +RSCREVISION=340m1(Build:12) +BUILD=12 LAST_MINOR=m1 SOURCEVERSION=OOO340 -- cgit