svn commit: r1702898 - /openoffice/trunk/main/set_soenv.in
Author: ydario Date: Mon Sep 14 10:26:32 2015 New Revision: 1702898 URL: http://svn.apache.org/r1702898 Log: #i118923# OS/2, use the legacy config.site script. Modified: openoffice/trunk/main/set_soenv.in Modified: openoffice/trunk/main/set_soenv.in URL: http://svn.apache.org/viewvc/openoffice/trunk/main/set_soenv.in?rev=1702898=1702897=1702898=diff == --- openoffice/trunk/main/set_soenv.in (original) +++ openoffice/trunk/main/set_soenv.in Mon Sep 14 10:26:32 2015 @@ -2039,7 +2039,7 @@ if ( $platform =~ m/os2/ ) ToFile( "LS","ls.exe", "e" ); ToFile( "GNUCOPY", "cp.exe", "e" ); ToFile( "TOUCH", "touch","e" ); - ToFile( "CONFIG_SITE", "/@unixroot/usr/share/config.site", "e" ); + ToFile( "CONFIG_SITE", "/@unixroot/usr/share/config.legacy", "e" ); } # $perlpre is only used for the following three variables
buildbot success in ASF Buildbot on openoffice-linux64-rat
The Buildbot has detected a passing build on builder openoffice-linux64-rat while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-rat/builds/69 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-rat' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
svn commit: r1702902 - in /openoffice/branches/AOO410: ./ main/ main/boost/ main/dbaccess/ main/drawinglayer/ main/filter/ main/jurt/ main/sc/ main/sd/ main/svgio/ main/svtools/source/graphic/ main/sw
Author: ydario Date: Mon Sep 14 10:44:30 2015 New Revision: 1702902 URL: http://svn.apache.org/r1702902 Log: #i118923# merge OS/2 trunk changesets from #i125592# #i118932# into AOO410 branch. Modified: openoffice/branches/AOO410/ (props changed) openoffice/branches/AOO410/main/ (props changed) openoffice/branches/AOO410/main/boost/boost-os2.patch (props changed) openoffice/branches/AOO410/main/dbaccess/ (props changed) openoffice/branches/AOO410/main/drawinglayer/ (props changed) openoffice/branches/AOO410/main/filter/ (props changed) openoffice/branches/AOO410/main/jurt/ (props changed) openoffice/branches/AOO410/main/sc/ (props changed) openoffice/branches/AOO410/main/sd/ (props changed) openoffice/branches/AOO410/main/set_soenv.in openoffice/branches/AOO410/main/svgio/ (props changed) openoffice/branches/AOO410/main/svtools/source/graphic/grfmgr2.cxx (props changed) openoffice/branches/AOO410/main/sw/ (props changed) openoffice/branches/AOO410/main/xmlsecurity/util/makefile.mk openoffice/branches/AOO410/test/ (props changed) openoffice/branches/AOO410/test/testcommon/source/org/openoffice/test/vcl/ (props changed) Propchange: openoffice/branches/AOO410/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 14 10:44:30 2015 @@ -2,4 +2,4 @@ /openoffice/branches/ia2:1417739-1541842 /openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283 /openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617 -/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302 +/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898 Propchange: openoffice/branches/AOO410/main/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 14 10:44:30 2015 @@ -2,4 +2,4 @@ /openoffice/branches/ia2/main:1417739-1541842 /openoffice/branches/ooxml-osba/main:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283 /openoffice/branches/rejuvenate01/main:1480411,1534063,1534098,1536312,1549902,1560617 -/openoffice/trunk/main:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1642300-1642302,1677190,1687177,1692551,1700135
svn commit: r1702988 - in /openoffice/trunk/main/solenv/inc: _tg_def.mk tg_def.mk
Author: ydario Date: Mon Sep 14 16:16:55 2015 New Revision: 1702988 URL: http://svn.apache.org/r1702988 Log: #i118923# OS/2, the emxexpr tool is no longer used. Modified: openoffice/trunk/main/solenv/inc/_tg_def.mk openoffice/trunk/main/solenv/inc/tg_def.mk Modified: openoffice/trunk/main/solenv/inc/_tg_def.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/_tg_def.mk?rev=1702988=1702987=1702988=diff == --- openoffice/trunk/main/solenv/inc/_tg_def.mk (original) +++ openoffice/trunk/main/solenv/inc/_tg_def.mk Mon Sep 14 16:16:55 2015 @@ -211,7 +211,7 @@ $(DEF1TARGETN) .PHONY : .IF "$(DEFLIB1NAME)"!="" @+echo $(SLB)/$(DEFLIB1NAME).lib - @+emxexpr $(DEF1NAMELIST) | fix_exp_file >> $@.tmp_ord + @+emxexp $(DEF1NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB1NAME)"!="" .IF "$(DEF1EXPORT1)"!="" @@ -495,7 +495,7 @@ $(DEF2TARGETN) .PHONY : .IF "$(DEFLIB2NAME)"!="" @+echo $(SLB)/$(DEFLIB2NAME).lib - @+emxexpr $(DEF2NAMELIST) | fix_exp_file >> $@.tmp_ord + @+emxexp $(DEF2NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB2NAME)"!="" .IF "$(DEF2EXPORT1)"!="" @@ -779,7 +779,7 @@ $(DEF3TARGETN) .PHONY : .IF "$(DEFLIB3NAME)"!="" @+echo $(SLB)/$(DEFLIB3NAME).lib - @+emxexpr $(DEF3NAMELIST) | fix_exp_file >> $@.tmp_ord + @+emxexp $(DEF3NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB3NAME)"!="" .IF "$(DEF3EXPORT1)"!="" @@ -1063,7 +1063,7 @@ $(DEF4TARGETN) .PHONY : .IF "$(DEFLIB4NAME)"!="" @+echo $(SLB)/$(DEFLIB4NAME).lib - @+emxexpr $(DEF4NAMELIST) | fix_exp_file >> $@.tmp_ord + @+emxexp $(DEF4NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB4NAME)"!="" .IF "$(DEF4EXPORT1)"!="" @@ -1347,7 +1347,7 @@ $(DEF5TARGETN) .PHONY : .IF "$(DEFLIB5NAME)"!="" @+echo $(SLB)/$(DEFLIB5NAME).lib - @+emxexpr $(DEF5NAMELIST) | fix_exp_file >> $@.tmp_ord + @+emxexp $(DEF5NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB5NAME)"!="" .IF "$(DEF5EXPORT1)"!="" @@ -1631,7 +1631,7 @@ $(DEF6TARGETN) .PHONY : .IF "$(DEFLIB6NAME)"!="" @+echo $(SLB)/$(DEFLIB6NAME).lib - @+emxexpr $(DEF6NAMELIST) | fix_exp_file >> $@.tmp_ord + @+emxexp $(DEF6NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB6NAME)"!="" .IF "$(DEF6EXPORT1)"!="" @@ -1915,7 +1915,7 @@ $(DEF7TARGETN) .PHONY : .IF "$(DEFLIB7NAME)"!="" @+echo $(SLB)/$(DEFLIB7NAME).lib - @+emxexpr $(DEF7NAMELIST) | fix_exp_file >> $@.tmp_ord + @+emxexp $(DEF7NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB7NAME)"!="" .IF "$(DEF7EXPORT1)"!="" @@ -2199,7 +2199,7 @@ $(DEF8TARGETN) .PHONY : .IF "$(DEFLIB8NAME)"!="" @+echo $(SLB)/$(DEFLIB8NAME).lib - @+emxexpr $(DEF8NAMELIST) | fix_exp_file >> $@.tmp_ord + @+emxexp $(DEF8NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB8NAME)"!="" .IF "$(DEF8EXPORT1)"!="" @@ -2483,7 +2483,7 @@ $(DEF9TARGETN) .PHONY : .IF "$(DEFLIB9NAME)"!="" @+echo $(SLB)/$(DEFLIB9NAME).lib - @+emxexpr $(DEF9NAMELIST) | fix_exp_file >> $@.tmp_ord + @+emxexp $(DEF9NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB9NAME)"!="" .IF "$(DEF9EXPORT1)"!="" @@ -2767,7 +2767,7 @@ $(DEF10TARGETN) .PHONY : .IF "$(DEFLIB10NAME)"!="" @+echo $(SLB)/$(DEFLIB10NAME).lib - @+emxexpr $(DEF10NAMELIST) | fix_exp_file >> $@.tmp_ord + @+emxexp $(DEF10NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB10NAME)"!="" .IF "$(DEF10EXPORT1)"!="" Modified: openoffice/trunk/main/solenv/inc/tg_def.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/tg_def.mk?rev=1702988=1702987=1702988=diff == --- openoffice/trunk/main/solenv/inc/tg_def.mk (original) +++ openoffice/trunk/main/solenv/inc/tg_def.mk Mon Sep 14 16:16:55 2015 @@ -216,7 +216,7 @@ $(DEF$(TNR)TARGETN) .PHONY : .IF "$(DEFLIB$(TNR)NAME)"!="" @+echo $(SLB)/$(DEFLIB$(TNR)NAME).lib - @+emxexpr $(DEF$(TNR)NAMELIST) | fix_exp_file >> $@.tmp_ord + @+emxexp $(DEF$(TNR)NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB$(TNR)NAME)"!="" .IF "$(DEF$(TNR)EXPORT1)"!=""
svn commit: r1702986 - in /openoffice/trunk/main: solenv/inc/svpm.h vcl/Library_vcl.mk vcl/inc/os2/salframe.h vcl/os2/source/window/salframe.cxx
Author: ydario Date: Mon Sep 14 16:10:03 2015 New Revision: 1702986 URL: http://svn.apache.org/r1702986 Log: #i118923# OS/2, use pmbidi header from dev toolkit. Modified: openoffice/trunk/main/solenv/inc/svpm.h openoffice/trunk/main/vcl/Library_vcl.mk openoffice/trunk/main/vcl/inc/os2/salframe.h openoffice/trunk/main/vcl/os2/source/window/salframe.cxx Modified: openoffice/trunk/main/solenv/inc/svpm.h URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/svpm.h?rev=1702986=1702985=1702986=diff == --- openoffice/trunk/main/solenv/inc/svpm.h (original) +++ openoffice/trunk/main/solenv/inc/svpm.h Mon Sep 14 16:10:03 2015 @@ -61,6 +61,9 @@ extern "C" { #include #include +#ifdef VCL_OS2 +#include +#endif #undef BOOL #undef BYTE Modified: openoffice/trunk/main/vcl/Library_vcl.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vcl.mk?rev=1702986=1702985=1702986=diff == --- openoffice/trunk/main/vcl/Library_vcl.mk (original) +++ openoffice/trunk/main/vcl/Library_vcl.mk Mon Sep 14 16:10:03 2015 @@ -45,6 +45,12 @@ $(eval $(call gb_Library_set_include,vcl -I$(OUTDIR)/inc \ $$(FREETYPE_CFLAGS) \ )) +ifeq ($(GUIBASE),os2) +$(eval $(call gb_Library_set_include,vcl,\ + $$(INCLUDE) \ + -idirafter /@unixroot/usr/dev/toolkit452/h \ +)) +endif ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_set_cxxflags,vcl,\ $$(CXXFLAGS) \ Modified: openoffice/trunk/main/vcl/inc/os2/salframe.h URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/os2/salframe.h?rev=1702986=1702985=1702986=diff == --- openoffice/trunk/main/vcl/inc/os2/salframe.h (original) +++ openoffice/trunk/main/vcl/inc/os2/salframe.h Mon Sep 14 16:10:03 2015 @@ -27,10 +27,6 @@ #include #include -#ifndef PM_BIDI_INCLUDED -#include -#endif - #ifndef __UCONV_H__ #include #endif Modified: openoffice/trunk/main/vcl/os2/source/window/salframe.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/os2/source/window/salframe.cxx?rev=1702986=1702985=1702986=diff == --- openoffice/trunk/main/vcl/os2/source/window/salframe.cxx (original) +++ openoffice/trunk/main/vcl/os2/source/window/salframe.cxx Mon Sep 14 16:10:03 2015 @@ -24,6 +24,7 @@ #define INCL_DOS #define INCL_PM #define INCL_WIN +#define VCL_OS2 #include #include
svn commit: r1702992 - /openoffice/trunk/main/scaddins/source/analysis/analysis.cxx
Author: pfg Date: Mon Sep 14 16:41:03 2015 New Revision: 1702992 URL: http://svn.apache.org/r1702992 Log: Replace the random generator in RANDBETWEEN() For consistency with RAND(), replace the old Wichman-Hill with an even older version of George Marsaglia's KISS algorithm. For the intended use this is more than enough and still should pass all statistics tests. Modified: openoffice/trunk/main/scaddins/source/analysis/analysis.cxx Modified: openoffice/trunk/main/scaddins/source/analysis/analysis.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scaddins/source/analysis/analysis.cxx?rev=1702992=1702991=1702992=diff == --- openoffice/trunk/main/scaddins/source/analysis/analysis.cxx (original) +++ openoffice/trunk/main/scaddins/source/analysis/analysis.cxx Mon Sep 14 16:41:03 2015 @@ -805,11 +805,14 @@ double SAL_CALL AnalysisAddIn::getSqrtpi RETURN_FINITE( fRet ); } +#defineSCRANDOMQ_SIZE 4 double SAL_CALL AnalysisAddIn::getRandbetween( double fMin, double fMax ) THROWDEF_RTE_IAE { -static sal_Int32 nScRandomIx = 0, nScRandomIy = 0, nScRandomIz = 0, nScRandomIt = 0; +static sal_uInt32 nScRandomSeed[SCRANDOMQ_SIZE]; +static sal_Bool SqSeeded = sal_False; static rtlRandomPool aPool = rtl_random_createPool(); +sal_uInt64 nScRandomt, nScRandoma = 698769069LL; double fScRandomW; fMin = ::rtl::math::round( fMin, 0, rtl_math_RoundingMode_Up ); @@ -817,43 +820,25 @@ double SAL_CALL AnalysisAddIn::getRandbe if( fMin > fMax ) THROW_IAE; -// Seeding for the PRNG: should be good enough but we -// monitor the values to keep things under control. -if (nScRandomIx <= 0) - rtl_random_getBytes(aPool, , sizeof(nScRandomIx)); -if (nScRandomIy <= 0) - rtl_random_getBytes(aPool, , sizeof(nScRandomIy)); -if (nScRandomIz <= 0) - rtl_random_getBytes(aPool, , sizeof(nScRandomIz)); -if (nScRandomIt <= 0) - rtl_random_getBytes(aPool, , sizeof(nScRandomIt)); +// Seeding for the PRNG: should be pretty good. +if (SqSeeded == sal_False) { + rtl_random_getBytes(aPool, , SCRANDOMQ_SIZE * sizeof(nScRandomSeed[0])); + SqSeeded = sal_True; +} -// Basically unmodified algorithm from -// Wichman and Hill, "Generating good pseudo-random numbers", -// December 5, 2005. - -nScRandomIx = 11600L * (nScRandomIx % 185127L) - 10379L * (nScRandomIx / 185127L); -nScRandomIy = 47003L * (nScRandomIy % 45688L) - 10479L * (nScRandomIy / 45688L); -nScRandomIz = 23000L * (nScRandomIz % 93368L) - 19423L * (nScRandomIz / 93368L); -nScRandomIt = 33000L * (nScRandomIt % 65075L) - 8123L * (nScRandomIt / 65075L); -if (nScRandomIx < 0) - nScRandomIx += 2147483579L; -if (nScRandomIy < 0) - nScRandomIy += 2147483543L; -if (nScRandomIz < 0) - nScRandomIz += 2147483123L; -if (nScRandomIt < 0) - nScRandomIt += 2147483123L; - -fScRandomW = (double)nScRandomIx*0.04656613022670 + - (double)nScRandomIy*0.04656613100760 + - (double)nScRandomIz*0.04656613360968 + - (double)nScRandomIt*0.04656614011490; +// Use George Marsaglia's 1998 KISS PRNG algorithm. +nScRandomSeed[0] = 69069 * nScRandomSeed[0] + 12345; +nScRandomSeed[1] ^= (nScRandomSeed[1] << 13); +nScRandomSeed[1] ^= (nScRandomSeed[1] >> 17); +nScRandomSeed[1] ^= (nScRandomSeed[1] << 5); +nScRandomt = nScRandoma * nScRandomSeed[2] + nScRandomSeed[3]; +nScRandomSeed[1] = (nScRandomt >> 32); +fScRandomW = (nScRandomSeed[0] + nScRandomSeed[1] + (nScRandomSeed[3] = nScRandomt)); // fMax -> range double fRet = fMax - fMin + 1.0; -fRet *= fScRandomW - (sal_Int32)fScRandomW ; +fRet *= fScRandomW / SAL_MAX_UINT32 ; fRet += fMin; fRet = floor( fRet ); // simple floor is sufficient here RETURN_FINITE( fRet );
svn commit: r1702993 - in /openoffice/branches/AOO410: ./ main/ main/boost/ main/dbaccess/ main/drawinglayer/ main/filter/ main/jurt/ main/sc/ main/sd/ main/solenv/inc/ main/svgio/ main/svtools/source
Author: ydario Date: Mon Sep 14 16:46:56 2015 New Revision: 1702993 URL: http://svn.apache.org/r1702993 Log: #i118923# merge OS/2 trunk changesets into AOO410 branch. Modified: openoffice/branches/AOO410/ (props changed) openoffice/branches/AOO410/main/ (props changed) openoffice/branches/AOO410/main/boost/boost-os2.patch (props changed) openoffice/branches/AOO410/main/dbaccess/ (props changed) openoffice/branches/AOO410/main/drawinglayer/ (props changed) openoffice/branches/AOO410/main/filter/ (props changed) openoffice/branches/AOO410/main/jurt/ (props changed) openoffice/branches/AOO410/main/sc/ (props changed) openoffice/branches/AOO410/main/sd/ (props changed) openoffice/branches/AOO410/main/solenv/inc/_tg_def.mk openoffice/branches/AOO410/main/solenv/inc/svpm.h openoffice/branches/AOO410/main/solenv/inc/tg_def.mk openoffice/branches/AOO410/main/svgio/ (props changed) openoffice/branches/AOO410/main/svtools/source/graphic/grfmgr2.cxx (props changed) openoffice/branches/AOO410/main/sw/ (props changed) openoffice/branches/AOO410/main/vcl/Library_vcl.mk openoffice/branches/AOO410/main/vcl/inc/os2/salframe.h openoffice/branches/AOO410/main/vcl/os2/source/window/salframe.cxx openoffice/branches/AOO410/test/ (props changed) openoffice/branches/AOO410/test/testcommon/source/org/openoffice/test/vcl/ (props changed) Propchange: openoffice/branches/AOO410/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 14 16:46:56 2015 @@ -2,4 +2,4 @@ /openoffice/branches/ia2:1417739-1541842 /openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283 /openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617 -/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898 +/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898,1702986,1702988 Propchange: openoffice/branches/AOO410/main/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 14 16:46:56 2015 @@ -2,4 +2,4 @@ /openoffice/branches/ia2/main:1417739-1541842 /openoffice/branches/ooxml-osba/main:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283 /openoffice/branches/rejuvenate01/main:1480411,1534063,1534098,1536312,1549902,1560617 -/openoffice/trunk/main:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1642300-1642302,1677190,1687177,1692551,1700135,1702894,1702898
buildbot failure in ASF Buildbot on openoffice-linux64-rat-aoo410
The Buildbot has detected a failed build on builder openoffice-linux64-rat-aoo410 while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-rat-aoo410/builds/65 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-rat-aoo410' triggered this build Build Source Stamp: [branch openoffice/branches/AOO410] HEAD Blamelist: BUILD FAILED: failed Sincerely, -The Buildbot
buildbot failure in ASF Buildbot on aoo-win7
The Buildbot has detected a failed build on builder aoo-win7 while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/aoo-win7/builds/83 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-win7 Build Reason: The Nightly scheduler named 'aoo-win7-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: BUILD FAILED: failed svn info configure bootstrap build.pl --all copy log index Sincerely, -The Buildbot
svn commit: r1703087 - in /openoffice/trunk/main/cppuhelper/qa: ifcontainer/cppu_ifcontainer.cxx ifcontainer/main.cxx unourl/cppu_unourl.cxx
Author: damjan Date: Tue Sep 15 03:16:33 2015 New Revision: 1703087 URL: http://svn.apache.org/r1703087 Log: Add missing precompiled header includes in cppuhelper. Modified: openoffice/trunk/main/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx openoffice/trunk/main/cppuhelper/qa/ifcontainer/main.cxx openoffice/trunk/main/cppuhelper/qa/unourl/cppu_unourl.cxx Modified: openoffice/trunk/main/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx?rev=1703087=1703086=1703087=diff == --- openoffice/trunk/main/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx (original) +++ openoffice/trunk/main/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx Tue Sep 15 03:16:33 2015 @@ -19,7 +19,7 @@ * */ - +#include "precompiled_cppuhelper.hxx" #include "com/sun/star/lang/XEventListener.hpp" #include "cppuhelper/interfacecontainer.hxx" Modified: openoffice/trunk/main/cppuhelper/qa/ifcontainer/main.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/qa/ifcontainer/main.cxx?rev=1703087=1703086=1703087=diff == --- openoffice/trunk/main/cppuhelper/qa/ifcontainer/main.cxx (original) +++ openoffice/trunk/main/cppuhelper/qa/ifcontainer/main.cxx Tue Sep 15 03:16:33 2015 @@ -19,6 +19,8 @@ * */ +#include "precompiled_cppuhelper.hxx" + #include "gtest/gtest.h" int main(int argc, char **argv) Modified: openoffice/trunk/main/cppuhelper/qa/unourl/cppu_unourl.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/qa/unourl/cppu_unourl.cxx?rev=1703087=1703086=1703087=diff == --- openoffice/trunk/main/cppuhelper/qa/unourl/cppu_unourl.cxx (original) +++ openoffice/trunk/main/cppuhelper/qa/unourl/cppu_unourl.cxx Tue Sep 15 03:16:33 2015 @@ -19,7 +19,7 @@ * */ - +#include "precompiled_cppuhelper.hxx" #include "cppuhelper/unourl.hxx" #include "rtl/malformeduriexception.hxx"
buildbot success in ASF Buildbot on openoffice-linux32-nightly
The Buildbot has detected a passing build on builder openoffice-linux32-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux32-nightly/builds/85 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm2_ubuntu_32bit Build Reason: The Nightly scheduler named 'openoffice-linux32-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
svn commit: r1703100 - /openoffice/trunk/main/basegfx/test/main.cxx
Author: damjan Date: Tue Sep 15 05:36:43 2015 New Revision: 1703100 URL: http://svn.apache.org/r1703100 Log: Add missing precompiled header include to basegfx. Modified: openoffice/trunk/main/basegfx/test/main.cxx Modified: openoffice/trunk/main/basegfx/test/main.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/test/main.cxx?rev=1703100=1703099=1703100=diff == --- openoffice/trunk/main/basegfx/test/main.cxx (original) +++ openoffice/trunk/main/basegfx/test/main.cxx Tue Sep 15 05:36:43 2015 @@ -19,6 +19,8 @@ * */ +#include "precompiled_basegfx.hxx" + #include "gtest/gtest.h" int main(int argc, char **argv)
buildbot success in ASF Buildbot on openoffice-linux32-snapshot
The Buildbot has detected a passing build on builder openoffice-linux32-snapshot while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux32-snapshot/builds/16 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm3_ubuntu_32bit Build Reason: The Nightly scheduler named 'openoffice-linux32-snapshot' triggered this build Build Source Stamp: [branch openoffice/tags/SNAPSHOT] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
svn commit: r1703086 - /openoffice/trunk/main/cppu/qa/main.cxx
Author: damjan Date: Tue Sep 15 03:10:54 2015 New Revision: 1703086 URL: http://svn.apache.org/r1703086 Log: Fix a build regression caused by 1700093's lack of a precompiled header include. Modified: openoffice/trunk/main/cppu/qa/main.cxx Modified: openoffice/trunk/main/cppu/qa/main.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppu/qa/main.cxx?rev=1703086=1703085=1703086=diff == --- openoffice/trunk/main/cppu/qa/main.cxx (original) +++ openoffice/trunk/main/cppu/qa/main.cxx Tue Sep 15 03:10:54 2015 @@ -19,6 +19,8 @@ * */ +#include "precompiled_cppu.hxx" + #include "gtest/gtest.h" int main(int argc, char **argv)
svn commit: r1702880 - in /openoffice/branches/AOO410: ./ ext_libraries/coinmp/ ext_libraries/hunspell/ main/ main/boost/ main/dbaccess/ main/drawinglayer/ main/filter/ main/jurt/ main/libxmlsec/ main
Author: ydario Date: Mon Sep 14 09:26:26 2015 New Revision: 1702880 URL: http://svn.apache.org/r1702880 Log: #i118923# merge OS/2 trunk changesets from #i125501# #i125592# #i118932# into AOO410 branch. Added: openoffice/branches/AOO410/ext_libraries/coinmp/coinmp-1.6.0-os2.patch - copied unchanged from r1621121, openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0-os2.patch openoffice/branches/AOO410/main/libxmlsec/xmlsec1-os2.patch Modified: openoffice/branches/AOO410/ (props changed) openoffice/branches/AOO410/ext_libraries/coinmp/makefile.mk openoffice/branches/AOO410/ext_libraries/hunspell/makefile.mk openoffice/branches/AOO410/main/ (props changed) openoffice/branches/AOO410/main/boost/boost-os2.patch (props changed) openoffice/branches/AOO410/main/configure.cmd openoffice/branches/AOO410/main/dbaccess/ (props changed) openoffice/branches/AOO410/main/drawinglayer/ (props changed) openoffice/branches/AOO410/main/filter/ (props changed) openoffice/branches/AOO410/main/jurt/ (props changed) openoffice/branches/AOO410/main/libxmlsec/makefile.mk openoffice/branches/AOO410/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk openoffice/branches/AOO410/main/lingucomponent/source/spellcheck/spell/makefile.mk openoffice/branches/AOO410/main/sc/ (props changed) openoffice/branches/AOO410/main/scp2/source/calc/makefile.mk openoffice/branches/AOO410/main/scp2/source/ooo/file_library_ooo.scp openoffice/branches/AOO410/main/sd/ (props changed) openoffice/branches/AOO410/main/solenv/bin/modules/installer/globals.pm openoffice/branches/AOO410/main/solenv/bin/modules/installer/parameter.pm openoffice/branches/AOO410/main/solenv/bin/modules/pre2par/parameter.pm openoffice/branches/AOO410/main/solenv/inc/libs.mk openoffice/branches/AOO410/main/svgio/ (props changed) openoffice/branches/AOO410/main/svtools/source/graphic/grfmgr2.cxx (props changed) openoffice/branches/AOO410/main/sw/ (props changed) openoffice/branches/AOO410/main/xmlsecurity/prj/d.lst openoffice/branches/AOO410/main/xmlsecurity/source/xmlsec/nss/makefile.mk openoffice/branches/AOO410/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx openoffice/branches/AOO410/main/xmlsecurity/util/makefile.mk openoffice/branches/AOO410/test/ (props changed) openoffice/branches/AOO410/test/testcommon/source/org/openoffice/test/vcl/ (props changed) Propchange: openoffice/branches/AOO410/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 14 09:26:26 2015 @@ -2,4 +2,4 @@ /openoffice/branches/ia2:1417739-1541842 /openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283 /openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617 -/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801 +/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302 Modified: openoffice/branches/AOO410/ext_libraries/coinmp/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/ext_libraries/coinmp/makefile.mk?rev=1702880=1702879=1702880=diff == --- openoffice/branches/AOO410/ext_libraries/coinmp/makefile.mk (original) +++ openoffice/branches/AOO410/ext_libraries/coinmp/makefile.mk Mon Sep 14 09:26:26 2015 @@ -46,6 +46,9 @@ TARFILE_NAME=CoinMP-1.6.0 TARFILE_MD5=2b5f1ca58d6ef30f18f1415b65bed81c PATCH_FILES=coinmp-1.6.0.patch coinmp-1.6.0-clang.patch +.IF "$(OS)"=="OS2"
buildbot failure in ASF Buildbot on aoo-w7snap
The Buildbot has detected a failed build on builder aoo-w7snap while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/aoo-w7snap/builds/14 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-win7 Build Reason: The Nightly scheduler named 'aoo-win7-snapshot' triggered this build Build Source Stamp: [branch openoffice/tags/SNAPSHOT] HEAD Blamelist: BUILD FAILED: failed svn info build.pl --all move the split install bits back Sincerely, -The Buildbot
buildbot success in ASF Buildbot on openoffice-fbsd-nightly
The Buildbot has detected a passing build on builder openoffice-fbsd-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-fbsd-nightly/builds/70 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-fbsd2_64bit Build Reason: The Nightly scheduler named 'openoffice-fbsd-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot success in ASF Buildbot on openoffice-linux64-nightly
The Buildbot has detected a passing build on builder openoffice-linux64-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-nightly/builds/79 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
svn commit: r1702894 - /openoffice/trunk/main/xmlsecurity/util/makefile.mk
Author: ydario Date: Mon Sep 14 10:05:40 2015 New Revision: 1702894 URL: http://svn.apache.org/r1702894 Log: #i125592# use a short name for xmlsecurity library. Modified: openoffice/trunk/main/xmlsecurity/util/makefile.mk Modified: openoffice/trunk/main/xmlsecurity/util/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmlsecurity/util/makefile.mk?rev=1702894=1702893=1702894=diff == --- openoffice/trunk/main/xmlsecurity/util/makefile.mk (original) +++ openoffice/trunk/main/xmlsecurity/util/makefile.mk Mon Sep 14 10:05:40 2015 @@ -141,6 +141,9 @@ RESLIB1IMAGES=$(PRJ)$/res RESLIB1SRSFILES= $(SRSFILELIST) SHL4TARGET=$(TARGET) +.IF "$(GUI)"=="OS2" +SHL4TARGET=xmlsecur +.ENDIF SHL4LIBS=\ $(SLB)$/helper.lib \ $(SLB)$/dialogs.lib \