Re: Fwd: Re: [PATCH][IN PROGRESS] gbuild conversion: module cpputools
On Wed, 2012-04-11 at 12:51 +0200, Michael Stahl wrote: > (in Writer you can actually find places where optimization has been > disabled in 1995 or so, and apparently nobody ever checked if it's still > necessary...) Yeah, its incredibly annoying to just disable optimization for something without commenting *why* its disabled. i.e. compiler itself just SEGVs and you can't compile without throttling it back vs some subtle runtime problem, hopefully all of our contemporary ones comment why they're different from the norm. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Fwd: Re: [PATCH][IN PROGRESS] gbuild conversion: module cpputools
On 11/04/12 12:02, Matúš Kukan wrote: > On 8 April 2012 10:29, David Tardon wrote: >> >> 4. regsingleton sets an additional compiler flag for MSC. You can use >> gb_Executable_add_cxxflags to do that in gbuild land. > > Hmm, what's this -Ob0 ? Isn't it some kind of optimization flag ? > It seems to be default one [1]. > I don't think we need to set it in modules' makefiles. it's entirely possible that this was some kind of workaround for an optimization bug in some version of the compiler, guess it's best to just leave it out and hope the bug has been fixed in current versions. (in Writer you can actually find places where optimization has been disabled in 1995 or so, and apparently nobody ever checked if it's still necessary...) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Fwd: Re: [PATCH][IN PROGRESS] gbuild conversion: module cpputools
On 8 April 2012 10:29, David Tardon wrote: > > 4. regsingleton sets an additional compiler flag for MSC. You can use > gb_Executable_add_cxxflags to do that in gbuild land. Hmm, what's this -Ob0 ? Isn't it some kind of optimization flag ? It seems to be default one [1]. I don't think we need to set it in modules' makefiles. It could be in gbuild (maybe here - [2]) if we want to explicitly put it to command line. Best, Matus [1] http://msdn.microsoft.com/en-us/library/47238hez.aspx [2] http://cgit.freedesktop.org/libreoffice/core/tree/solenv/gbuild/platform/WNT_INTEL_MSC.mk#n225 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH][IN PROGRESS] gbuild conversion: module cpputools
Hi David, thank you for your comments. Here is another try. See also my comments bellow. If there still any issues, just let me know ... and I will give it another try ;-) David On 08.04.2012 10:29, David Tardon wrote: On Wed, Apr 04, 2012 at 06:33:44AM +0200, David Tardon wrote: On Wed, Apr 04, 2012 at 12:50:47AM +0200, David Ostrovsky wrote: Hi David, thank you for your comments. Here is another try. Hi, I looked at the patch and there are still some problems to correct. I could easily do it myself, but I think that you can learn more this way. So: 1. registercomponent sets APP1RPATH=UREBIN. That means the executable should be registered in UREBIN layer, instead of NONE, in gbuild. (Not knowing that is not your fault--I doubt this is documented anywhere...) done. 2. The executables should not be built for IOS. done. 3. unoexe is actually built on IOS, but as a static library. done. I don't have mac out there to try. But I commented MACOSX condition out and tried to built it on my Linux machine. Then I saw, that Repository.mk should be updated. With staticLibrary I'm using $(eval $(call gb_StaticLibrary_use_api,uno,\ udkapi \ )) and not this: $(eval $(call gb_StaticLibrary_use_internal_comprehensive_api,uno,\ udkapi \ )) 4. regsingleton sets an additional compiler flag for MSC. You can use gb_Executable_add_cxxflags to do that in gbuild land. done, actually there are two conditions: 1. without debug 2. with MSC compiler I hope i cathed the right one, please correct me, if I'm wrong. 5. re gb_Executable_add_api: you should use gb_Executable_use_internal_comprehensive_api for these executables/libraries that have NO_OFFUH=TRUE in makefile.mk . done, only sp2bv and staticLibrary use the old version. Note that Michael pushed a stylistic change (that I really like) to gbuild meanwhile, so some functions changed name. You will know which ones, because you will get an error when trying to use them :-) done, this one was obvious. If you have any doubt, catch me on IRC. D. >From aa6a7f3812a98bc78dd10d72be9fc1a4b14732c1 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sun, 1 Apr 2012 16:07:41 +0200 Subject: [PATCH] gbuild conversion: cpputools module dmake stuff removed --- Makefile |2 +- Repository.mk |7 ++ cpputools/Executable_regcomp.mk| 43 +++ cpputools/Executable_regsingleton.mk | 53 + cpputools/Executable_sp2bv.mk | 43 +++ cpputools/Executable_uno.mk| 43 +++ cpputools/Makefile |7 ++ cpputools/Module_cpputools.mk | 38 + cpputools/StaticLibrary_uno.mk | 38 + cpputools/prj/build.lst|7 +-- cpputools/prj/d.lst| 10 --- cpputools/prj/makefile.mk |1 + cpputools/source/registercomponent/makefile.mk | 82 cpputools/source/regsingleton/makefile.mk | 86 - cpputools/source/sp2bv/makefile.mk | 56 -- cpputools/source/unoexe/makefile.mk| 97 16 files changed, 275 insertions(+), 338 deletions(-) create mode 100644 cpputools/Executable_regcomp.mk create mode 100644 cpputools/Executable_regsingleton.mk create mode 100644 cpputools/Executable_sp2bv.mk create mode 100644 cpputools/Executable_uno.mk create mode 100644 cpputools/Makefile create mode 100644 cpputools/Module_cpputools.mk create mode 100644 cpputools/StaticLibrary_uno.mk create mode 100644 cpputools/prj/makefile.mk delete mode 100644 cpputools/source/registercomponent/makefile.mk delete mode 100644 cpputools/source/regsingleton/makefile.mk delete mode 100644 cpputools/source/sp2bv/makefile.mk delete mode 100644 cpputools/source/unoexe/makefile.mk diff --git a/Makefile b/Makefile index e660c36..709332a 100644 --- a/Makefile +++ b/Makefile @@ -45,6 +45,7 @@ configmgr\ cppcanvas\ cppu\ cppuhelper\ +cpputools\ cui\ dbaccess\ desktop\ @@ -155,7 +156,6 @@ codemaker\ connectivity\ cosv\ cppunit\ -cpputools\ crashrep\ ct2n\ curl\ diff --git a/Repository.mk b/Repository.mk index 1fe0aa3..5c55b09 100644 --- a/Repository.mk +++ b/Repository.mk @@ -41,12 +41,15 @@ $(eval $(call gb_Helper_register_executables,NONE, \ pdf2xml \ pdfunzip \ rdbmaker \ +regsingleton \ rsc \ rscdep \ saxparser \ so_checksum \ +sp2bv \ svidl \ typesconfig \ +uno \ xml2cmp \ xpdfimport \ )) @@ -130,6 +133,7 @@ ifneq ($(OS),MACOSX) $(eval $(call gb_Helper_register_executables,UREBIN,\ javaldx \ + regcomp \ )) endif @@ -550,6 +554,9 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ $(if $(filter $(OS),WNT), \ odma_lib \ ) \ +
Re: [PATCH][IN PROGRESS] gbuild conversion: module cpputools
Hi David, thank you for your comments. Here is another try. See also my comments bellow. If there still any issues, just let me know ... and I will give it another try ;-) David On 08.04.2012 10:29, David Tardon wrote: On Wed, Apr 04, 2012 at 06:33:44AM +0200, David Tardon wrote: On Wed, Apr 04, 2012 at 12:50:47AM +0200, David Ostrovsky wrote: Hi David, thank you for your comments. Here is another try. Hi, I looked at the patch and there are still some problems to correct. I could easily do it myself, but I think that you can learn more this way. So: 1. registercomponent sets APP1RPATH=UREBIN. That means the executable should be registered in UREBIN layer, instead of NONE, in gbuild. (Not knowing that is not your fault--I doubt this is documented anywhere...) done. 2. The executables should not be built for IOS. done. 3. unoexe is actually built on IOS, but as a static library. done. I don't have mac out there to try. But I commented MACOSX condition out and tried to built it on my Linux machine. Then I saw, that Repository.mk should be updated. With staticLibrary I'm using $(eval $(call gb_StaticLibrary_use_api,uno,\ udkapi \ )) and not this: $(eval $(call gb_StaticLibrary_use_internal_comprehensive_api,uno,\ udkapi \ )) 4. regsingleton sets an additional compiler flag for MSC. You can use gb_Executable_add_cxxflags to do that in gbuild land. done, actually there are two conditions: 1. without debug 2. with MSC compiler I hope i cathed the right one, please correct me, if I'm wrong. 5. re gb_Executable_add_api: you should use gb_Executable_use_internal_comprehensive_api for these executables/libraries that have NO_OFFUH=TRUE in makefile.mk . done, only sp2bv and staticLibrary use the old version. Note that Michael pushed a stylistic change (that I really like) to gbuild meanwhile, so some functions changed name. You will know which ones, because you will get an error when trying to use them :-) done, this one was obvious. If you have any doubt, catch me on IRC. D. >From aa6a7f3812a98bc78dd10d72be9fc1a4b14732c1 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sun, 1 Apr 2012 16:07:41 +0200 Subject: [PATCH] gbuild conversion: cpputools module dmake stuff removed --- Makefile |2 +- Repository.mk |7 ++ cpputools/Executable_regcomp.mk| 43 +++ cpputools/Executable_regsingleton.mk | 53 + cpputools/Executable_sp2bv.mk | 43 +++ cpputools/Executable_uno.mk| 43 +++ cpputools/Makefile |7 ++ cpputools/Module_cpputools.mk | 38 + cpputools/StaticLibrary_uno.mk | 38 + cpputools/prj/build.lst|7 +-- cpputools/prj/d.lst| 10 --- cpputools/prj/makefile.mk |1 + cpputools/source/registercomponent/makefile.mk | 82 cpputools/source/regsingleton/makefile.mk | 86 - cpputools/source/sp2bv/makefile.mk | 56 -- cpputools/source/unoexe/makefile.mk| 97 16 files changed, 275 insertions(+), 338 deletions(-) create mode 100644 cpputools/Executable_regcomp.mk create mode 100644 cpputools/Executable_regsingleton.mk create mode 100644 cpputools/Executable_sp2bv.mk create mode 100644 cpputools/Executable_uno.mk create mode 100644 cpputools/Makefile create mode 100644 cpputools/Module_cpputools.mk create mode 100644 cpputools/StaticLibrary_uno.mk create mode 100644 cpputools/prj/makefile.mk delete mode 100644 cpputools/source/registercomponent/makefile.mk delete mode 100644 cpputools/source/regsingleton/makefile.mk delete mode 100644 cpputools/source/sp2bv/makefile.mk delete mode 100644 cpputools/source/unoexe/makefile.mk diff --git a/Makefile b/Makefile index e660c36..709332a 100644 --- a/Makefile +++ b/Makefile @@ -45,6 +45,7 @@ configmgr\ cppcanvas\ cppu\ cppuhelper\ +cpputools\ cui\ dbaccess\ desktop\ @@ -155,7 +156,6 @@ codemaker\ connectivity\ cosv\ cppunit\ -cpputools\ crashrep\ ct2n\ curl\ diff --git a/Repository.mk b/Repository.mk index 1fe0aa3..5c55b09 100644 --- a/Repository.mk +++ b/Repository.mk @@ -41,12 +41,15 @@ $(eval $(call gb_Helper_register_executables,NONE, \ pdf2xml \ pdfunzip \ rdbmaker \ +regsingleton \ rsc \ rscdep \ saxparser \ so_checksum \ +sp2bv \ svidl \ typesconfig \ +uno \ xml2cmp \ xpdfimport \ )) @@ -130,6 +133,7 @@ ifneq ($(OS),MACOSX) $(eval $(call gb_Helper_register_executables,UREBIN,\ javaldx \ + regcomp \ )) endif @@ -550,6 +554,9 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ $(if $(filter $(OS),WNT), \ odma_lib \ ) \ +
Re: Fwd: Re: [PATCH][IN PROGRESS] gbuild conversion: module cpputools
On Wed, Apr 04, 2012 at 06:33:44AM +0200, David Tardon wrote: > On Wed, Apr 04, 2012 at 12:50:47AM +0200, David Ostrovsky wrote: > > Hi David, > > > > thank you for your comments. Here is another try. Hi, I looked at the patch and there are still some problems to correct. I could easily do it myself, but I think that you can learn more this way. So: 1. registercomponent sets APP1RPATH=UREBIN. That means the executable should be registered in UREBIN layer, instead of NONE, in gbuild. (Not knowing that is not your fault--I doubt this is documented anywhere...) 2. The executables should not be built for IOS. 3. unoexe is actually built on IOS, but as a static library. 4. regsingleton sets an additional compiler flag for MSC. You can use gb_Executable_add_cxxflags to do that in gbuild land. 5. re gb_Executable_add_api: you should use gb_Executable_use_internal_comprehensive_api for these executables/libraries that have NO_OFFUH=TRUE in makefile.mk . Note that Michael pushed a stylistic change (that I really like) to gbuild meanwhile, so some functions changed name. You will know which ones, because you will get an error when trying to use them :-) If you have any doubt, catch me on IRC. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Fwd: Re: [PATCH][IN PROGRESS] gbuild conversion: module cpputools
On Wed, Apr 04, 2012 at 12:50:47AM +0200, David Ostrovsky wrote: > Hi David, > > thank you for your comments. Here is another try. > As you haven't merged feature/gbuild_components branch to master > I let "gb_Executable_add_api" in place: Good, I will look at the patch and push it (with appropriate changes) after I have integrated the branch. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
