[Libreoffice-commits] core.git: 2 commits - instsetoo_native/CustomTarget_install.mk odk/examples

[Stephan Bergmann]

 instsetoo_native/CustomTarget_install.mk |   11 +++++++++--
 odk/examples/cpp/counter/countermain.cxx |    6 +++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 1f89a76dcc9ddea65f6e578eec78f008c67622ee
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Apr 12 11:57:28 2013 +0200

    Install SDK in Windows dev-install, too
    
    Change-Id: Ic26237c2ecdc0728be6acb6d15e2d258bf093c74

diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index ca3f2de..bb8af19 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -102,8 +102,15 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony:
 	rm -rf $(instsetoo_OUT)
 ifeq (TRUE,$(LIBO_DEV_INSTALL))
 	$(call instsetoo_native_install_command,openoffice,en-US,,,archive)
-	unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip
-	mv $(DEVINSTALLDIR)/LibreOffice*_archive/* $(DEVINSTALLDIR)/opt
+	unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)/archive/install/en-US/LibreOffice_*_archive.zip
+	mv $(DEVINSTALLDIR)/LibreOffice_*_archive/* $(DEVINSTALLDIR)/opt
+	rmdir $(DEVINSTALLDIR)/LibreOffice_*_archive
+	$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive)
+	unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)_SDK/archive/install/en-US/LibreOffice_*_archive_sdk.zip
+	mv $(DEVINSTALLDIR)/LibreOffice_*_archive_sdk/LibreOffice_*_SDK/sdk \
+        $(DEVINSTALLDIR)/opt/
+	rmdir $(DEVINSTALLDIR)/LibreOffice_*_archive_sdk/LibreOffice_*_SDK
+	rmdir $(DEVINSTALLDIR)/LibreOffice_*_archive_sdk
 else # LIBO_DEV_INSTALL
 	$(call instsetoo_native_install_command,openoffice,$(instsetoo_native_WITH_LANG),,,$(PKGFORMAT))
 ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
commit 78120c41f0c34cd962c5000c0f562692dafb64f7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Apr 12 11:57:03 2013 +0200

    Missing return
    
    Change-Id: I76db8e6e1460141ee4ef1bed10ea46c2b402b249

diff --git a/odk/examples/cpp/counter/countermain.cxx b/odk/examples/cpp/counter/countermain.cxx
index 008af0d..87a4de7 100644
--- a/odk/examples/cpp/counter/countermain.cxx
+++ b/odk/examples/cpp/counter/countermain.cxx
@@ -41,6 +41,9 @@
  *************************************************************************
  *************************************************************************/
 
+#include "sal/config.h"
+
+#include <cstdlib>
 #include <stdio.h>
 
 #include <sal/main.h>
@@ -94,11 +97,12 @@ SAL_IMPLEMENT_MAIN()
         }
 
         Reference< XComponent >::query( xContext )->dispose();
+        return EXIT_SUCCESS;
 
     } catch( Exception& e) {
         printf("Error: caught exception:\n       %s\n",
                OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US).getStr());
-        exit(1);
+        return EXIT_FAILURE;
     }
 }