[Libreoffice-commits] core.git: 3 commits - odk/examples

[Stephan Bergmann]

 odk/examples/DevelopersGuide/OfficeBean/Makefile                   |    5 +++++
 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile |    5 +++++
 odk/examples/DevelopersGuide/ProfUNO/Lifetime/object_lifetime.cxx  |    2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 6f2fbc381de2c12f4ca9c2fc515c4f6860d07095
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 21 12:24:54 2014 +0100

    DesktopEnvironment example does not work on OS X
    
    ...as nativelib/unix/nativeview.c uses X11.
    
    Change-Id: Ifdc0206b77085db909155fb61c4a345f2813849d

diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile
index b4e69cf..4227108 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile
@@ -81,8 +81,13 @@ endif
 
 # Targets
 .PHONY: ALL
+ifeq "$(OS)" "MACOSX"
+ALL :
+	@printf 'This example does not work on Mac OS X\n'
+else
 ALL : $(SUBDIR) \
 	$(EXAMPLE_NAME)
+endif
 
 include $(SETTINGS)/stdtarget.mk
 
commit 3034b144d0062e9c4394b901aded43fec117ed11
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 21 12:22:35 2014 +0100

    OfficeBean example does not work on OS X (where officebean.jar is not built)
    
    Change-Id: I18c9d0fa0a74cbbdad43bd99d87dc6414a0264d2

diff --git a/odk/examples/DevelopersGuide/OfficeBean/Makefile b/odk/examples/DevelopersGuide/OfficeBean/Makefile
index 3326244..2dfc678 100644
--- a/odk/examples/DevelopersGuide/OfficeBean/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeBean/Makefile
@@ -59,8 +59,13 @@ SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(URE
 
 # Targets
 .PHONY: ALL
+ifeq "$(OS)" "MACOSX"
+ALL :
+	@printf 'This example does not work on Mac OS X\n'
+else
 ALL : \
     OOoBeanViewer
+endif
 
 include $(SETTINGS)/stdtarget.mk
 
commit fd95c8950c674ad0935f2583f8fb209d873a73b7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 21 12:21:51 2014 +0100

    Fix signature of main function
    
    Change-Id: Id6a4968b15445f04e788eaa6ca950707d5311e66

diff --git a/odk/examples/DevelopersGuide/ProfUNO/Lifetime/object_lifetime.cxx b/odk/examples/DevelopersGuide/ProfUNO/Lifetime/object_lifetime.cxx
index c24e4e3..f92731d 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/Lifetime/object_lifetime.cxx
+++ b/odk/examples/DevelopersGuide/ProfUNO/Lifetime/object_lifetime.cxx
@@ -62,7 +62,7 @@ void simple_object_creation_and_destruction()
 }
 
 
-int main( char * argv[] )
+int main()
 {
     simple_object_creation_and_destruction();
     return 0;