[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - accessibility/Module_accessibility.mk config_host.mk.in configure.ac Makefile.in Repository.mk scp2/source

[Michael Stahl]

 Makefile.in                           |    2 +-
 Repository.mk                         |    7 +++----
 accessibility/Module_accessibility.mk |    2 --
 configure.ac                          |    1 -
 scp2/source/ooo/file_ooo.scp          |    2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit af0909f1b88a47db1ea0ea53cdac59daee42db0b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 21 14:53:57 2013 +0100

    --enable-ia2 no longer disables Java access bridge
    
    Just install both; 448727e598ca0c35ee9cd6f2c25a847c8147943b already made
    IA2 an experimental feature with fallback to Java access bridge if
    experimental mode is disabled.
    
    Change-Id: I4ca64adbc586bd87b4d28087709f5c2e02bf7990
    (cherry picked from commit 31b91f6f8a7cacb062005d6ca2a7b5b2645a9799)

diff --git a/Repository.mk b/Repository.mk
index b31a809..eb02ae3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -557,11 +557,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 		$(if $(DISABLE_ATL),,\
 			inprocserv \
 		) \
+		$(if $(ENABLE_JAVA),java_uno_accessbridge) \
 		$(if $(ENABLE_IA2), \
-				UAccCOM \
-				winaccessibility \
-			, \
-				$(if $(ENABLE_JAVA),java_uno_accessbridge) \
+			UAccCOM \
+			winaccessibility \
 		) \
 	) \
 ))
diff --git a/accessibility/Module_accessibility.mk b/accessibility/Module_accessibility.mk
old mode 100755
new mode 100644
index 5f2aa17..e5e090c
--- a/accessibility/Module_accessibility.mk
+++ b/accessibility/Module_accessibility.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_Module_add_l10n_targets,accessibility,\
     AllLangResTarget_acc \
 ))
 
-ifneq ($(ENABLE_IA2),TRUE)
 ifneq ($(ENABLE_JAVA),)
 ifeq ($(OS),WNT)
 $(eval $(call gb_Module_add_targets,accessibility,\
@@ -28,6 +27,5 @@ $(eval $(call gb_Module_add_targets,accessibility,\
 ))
 endif
 endif
-endif
 
 # vim:set noet sw=4 ts=4:
diff --git a/config_host.mk.in b/config_host.mk.in
old mode 100755
new mode 100644
diff --git a/configure.ac b/configure.ac
index b7c56fd..e510bc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11613,7 +11613,6 @@ if test "$enable_ia2" = "yes"; then
     if test "$_os" = "WINNT"; then
         AC_MSG_RESULT([yes])
         ENABLE_IA2="TRUE"
-        SCPDEFS="$SCPDEFS -DENABLE_IA2"
     else
         AC_MSG_RESULT([no])
     fi
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 68eae2e..e8be228 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -315,7 +315,7 @@ STD_JAR_FILE( gid_File_Jar_Xmerge, xmerge )
 STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge )
 #endif
 
-#if defined ENABLE_JAVA && defined WNT && !defined(ENABLE_IA2)
+#if defined ENABLE_JAVA && defined WNT
 STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge )
 #endif
 
commit b8156a37a62722ba7ef97d511150ac2ec55523bd
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 21 13:12:33 2013 +0100

    Makefile.in: "make check" should build "all" too
    
    Change-Id: I6b72c3deb1a056149e965b78d12d3c37c6bfd5b9
    (cherry picked from commit deb249e1b3a3095e0d04c47f57044fe5b0ddf095)

diff --git a/Makefile.in b/Makefile.in
index d018333..6918e22 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -217,7 +217,7 @@ ifneq ($(filter-out WNT MACOSX IOS ANDROID,$(OS)),)
 	mkdir -p $(INSTDIR) && install-gdb-printers -a $(INSTDIR) -c
 endif
 	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild \
-		$(if $(filter build,$(MAKECMDGOALS)),all) \
+		$(if $(filter build check,$(MAKECMDGOALS)),all) \
 		$(if $(filter build-nocheck,$(MAKECMDGOALS)),build) \
 		$(if $(filter check,$(MAKECMDGOALS)),subsequentcheck) \
 		$(filter all build-l10n-only build-non-l10n-only debugrun help slowcheck translations unitcheck subsequentcheck check,$(MAKECMDGOALS))